summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-08-02 00:23:19 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-08-02 00:23:19 +0000
commit346bec85081a6d46963fce8e4edc44057c233bb0 (patch)
treedf1e807bcfd1e184344e15ff01f10c8b1010eb66
parent934e414de794df263fa7dd9bf1d68f0d8f430bb4 (diff)
disable Jumbos until reception of Jumbo frames can be fixed.
-rw-r--r--sys/dev/pci/if_xge.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index 82cbb003254..d716fb0f2f2 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xge.c,v 1.27 2006/07/21 01:57:15 brad Exp $ */
+/* $OpenBSD: if_xge.c,v 1.28 2006/08/02 00:23:18 brad Exp $ */
/* $NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $ */
/*
@@ -577,7 +577,9 @@ xge_attach(struct device *parent, struct device *self, void *aux)
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = xge_ioctl;
ifp->if_start = xge_start;
+#ifdef XGE_JUMBO
ifp->if_hardmtu = XGE_MAX_MTU;
+#endif
IFQ_SET_MAXLEN(&ifp->if_snd, NTXDESCS - 1);
IFQ_SET_READY(&ifp->if_snd);
@@ -676,7 +678,11 @@ xge_init(struct ifnet *ifp)
}
/* set MRU */
+#ifdef XGE_JUMBO
PIF_WCSR(RMAC_MAX_PYLD_LEN, RMAC_PYLD_LEN(XGE_MAX_FRAMELEN));
+#else
+ PIF_WCSR(RMAC_MAX_PYLD_LEN, RMAC_PYLD_LEN(ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN));
+#endif
/* 56, enable the transmit laser */
val = PIF_RCSR(ADAPTER_CONTROL);