diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2004-12-22 23:40:29 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2004-12-22 23:40:29 +0000 |
| commit | e6b89cb63157a2c265f1408e9a8c7bbeb61eb624 (patch) | |
| tree | e20337745540d7e04f2320a7a77b41a1f457071c /sys/dev/pci/if_sk.c | |
| parent | 1e6d78d526cece3a8682174e808734280c15dafd (diff) | |
- add missing braces for SIOCSIFMTU switch case.
- allow reception of Jumbo frames all the time on GEnesis based cards,
same as Yukon based cards.
ok krw@ mcbride@
Diffstat (limited to 'sys/dev/pci/if_sk.c')
| -rw-r--r-- | sys/dev/pci/if_sk.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 8dbd2fb2efb..ef59322c496 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.54 2004/12/14 20:58:15 krw Exp $ */ +/* $OpenBSD: if_sk.c,v 1.55 2004/12/22 23:40:28 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -990,9 +990,10 @@ sk_ioctl(struct ifnet *ifp, u_long command, caddr_t data) case SIOCSIFMTU: if (ifr->ifr_mtu > ETHERMTU_JUMBO) error = EINVAL; - else + else { ifp->if_mtu = ifr->ifr_mtu; - sk_init(sc_if); + sk_init(sc_if); + } break; case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { @@ -2287,10 +2288,7 @@ sk_init_xmac(struct sk_if_softc *sc_if) XM_MODE_RX_GIANTS|XM_MODE_RX_RUNTS|XM_MODE_RX_CRCERRS| XM_MODE_RX_INRANGELEN); - if (ifp->if_mtu > ETHER_MAX_LEN) - SK_XM_SETBIT_2(sc_if, XM_RXCMD, XM_RXCMD_BIGPKTOK); - else - SK_XM_CLRBIT_2(sc_if, XM_RXCMD, XM_RXCMD_BIGPKTOK); + SK_XM_SETBIT_2(sc_if, XM_RXCMD, XM_RXCMD_BIGPKTOK); /* * Bump up the transmit threshold. This helps hold off transmit @@ -2344,7 +2342,7 @@ sk_init_xmac(struct sk_if_softc *sc_if) void sk_init_yukon(sc_if) struct sk_if_softc *sc_if; { - u_int32_t /*mac, */phy; + u_int32_t phy; u_int16_t reg; int i; |