d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure to stop controller first before changing MTU. And if

Browse Source 
interface is not running don't initialize controller.
While here remove unnecessary update of error variable.

Reviewed by:	davidch
This commit is contained in:
Pyun YongHyeon 2010-02-26 20:26:17 +00:00
parent e89abed364
commit 03c28f4ef5
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/bce/if_bce.c
View File

@ -6989,7 +6989,7 @@ bce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
struct bce_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
struct mii_data *mii;
int mask, error = 0;
int mask, error = 0, reinit;
DBENTER(BCE_VERBOSE_MISC);
@ -7010,7 +7010,16 @@ bce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
BCE_LOCK(sc);
ifp->if_mtu = ifr->ifr_mtu;
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
reinit = 0;
if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
/*
* Because allocation size is used in RX
* buffer allocation, stop controller if
* it is already running.
*/
bce_stop(sc);
reinit = 1;
}
#ifdef BCE_JUMBO_HDRSPLIT
/* No buffer allocation size changes are necessary. */
#else
@ -7028,7 +7037,8 @@ bce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
}
#endif
bce_init_locked(sc);
if (reinit != 0)
bce_init_locked(sc);
BCE_UNLOCK(sc);
break;
@ -7062,7 +7072,6 @@ bce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
}
BCE_UNLOCK(sc);
error = 0;
break;
@ -7072,10 +7081,8 @@ bce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
DBPRINT(sc, BCE_VERBOSE_MISC, "Received SIOCADDMULTI/SIOCDELMULTI\n");
BCE_LOCK(sc);
if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
bce_set_rx_mode(sc);
error = 0;
}
BCE_UNLOCK(sc);
break;