diff options
| author | avos <avos@FreeBSD.org> | 2016-03-26 08:59:56 +0000 |
|---|---|---|
| committer | avos <avos@FreeBSD.org> | 2016-03-26 08:59:56 +0000 |
| commit | 9143e02ee2ce1954c6252fa9c63151442553748a (patch) | |
| tree | 57d6b0682a6b248c5ad4ec584cb9b3921046d50e /sys/net80211 | |
| parent | e044a7dda4aa7b634e1107f42963a8d26fd2a61b (diff) | |
| download | FreeBSD-src-9143e02ee2ce1954c6252fa9c63151442553748a.zip FreeBSD-src-9143e02ee2ce1954c6252fa9c63151442553748a.tar.gz | |
net80211: fix panic for DWDS vaps
Since r248069, TX IC lock must obtained before calling ieee80211_encap()
and/or ieee80211_parent_xmitpkt().
Tested with: Intel 3945BG.
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_wds.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c index 03d9c60..7fe91cc 100644 --- a/sys/net80211/ieee80211_wds.c +++ b/sys/net80211/ieee80211_wds.c @@ -288,9 +288,11 @@ ieee80211_dwds_mcast(struct ieee80211vap *vap0, struct mbuf *m) /* * Encapsulate the packet in prep for transmission. */ + IEEE80211_TX_LOCK(ic); mcopy = ieee80211_encap(vap, ni, mcopy); if (mcopy == NULL) { /* NB: stat+msg handled in ieee80211_encap */ + IEEE80211_TX_UNLOCK(ic); ieee80211_free_node(ni); continue; } @@ -298,6 +300,7 @@ ieee80211_dwds_mcast(struct ieee80211vap *vap0, struct mbuf *m) mcopy->m_pkthdr.rcvif = (void *) ni; err = ieee80211_parent_xmitpkt(ic, mcopy); + IEEE80211_TX_UNLOCK(ic); if (!err) { if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1); |
