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

cxgb_stop is only called from cxgb_ioctl so:

Browse Source 
- don't acquire port lock, already held in ioctl
- rename to cxgb_stop_locked
- switch callout_drain to callout_stop to avoid a hang from having the port lock held
This commit is contained in:
Kip Macy 2007-03-20 06:21:47 +00:00
parent c9f0c8fd74
commit 77f07749f3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/cxgb/cxgb_main.c
View File

@ -93,7 +93,7 @@ __FBSDID("$FreeBSD$");
static int cxgb_setup_msix(adapter_t *, int);
static void cxgb_init(void *);
static void cxgb_init_locked(struct port_info *);
static void cxgb_stop(struct port_info *);
static void cxgb_stop_locked(struct port_info *);
static void cxgb_set_rxmode(struct port_info *);
static int cxgb_ioctl(struct ifnet *, unsigned long, caddr_t);
static void cxgb_start(struct ifnet *);
@ -1131,14 +1131,16 @@ cxgb_set_rxmode(struct port_info *p)
}
static void
cxgb_stop(struct port_info *p)
cxgb_stop_locked(struct port_info *p)
{
struct ifnet *ifp;
callout_drain(&p->adapter->cxgb_tick_ch);
mtx_assert(&p->lock, MA_OWNED);
mtx_assert(&p->adapter->lock, MA_NOTOWNED);
callout_stop(&p->adapter->cxgb_tick_ch);
ifp = p->ifp;
PORT_LOCK(p);
ADAPTER_LOCK(p->adapter);
ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
p->adapter->open_device_map &= ~(1 << p->port);
@ -1147,7 +1149,6 @@ cxgb_stop(struct port_info *p)
ADAPTER_UNLOCK(p->adapter);
t3_port_intr_disable(p->adapter, p->port);
t3_mac_disable(&p->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
PORT_UNLOCK(p);
}
@ -1196,7 +1197,7 @@ cxgb_ioctl(struct ifnet *ifp, unsigned long command, caddr_t data)
cxgb_init_locked(p);
} else {
if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
cxgb_stop(p);
cxgb_stop_locked(p);
}
}
p->if_flags = ifp->if_flags;