From: Johannes Hofmann <johannes.hofmann@gmx.de>
Date: Sat, 12 Jan 2013 10:31:39 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.4.0rc~8^2~4
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/7078f92bf00cafccd0c0191c7aa92b0bb784f70e

merge
---

7078f92bf00cafccd0c0191c7aa92b0bb784f70e
diff --cc sys/dev/netif/iwn/if_iwn.c
index 68cc02269a,37d5c520c4..d2b438985e
--- a/sys/dev/netif/iwn/if_iwn.c
+++ b/sys/dev/netif/iwn/if_iwn.c
@@@ -3374,11 -3375,9 +3373,11 @@@ iwn_start_locked(struct ifnet *ifp
  	struct mbuf *m;
  	int pri;
  
 +	wlan_assert_serialized();
 +
  	for (;;) {
  		if (sc->qfullmsk != 0) {
- 			ifp->if_flags |= IFF_OACTIVE;
+ 			ifq_set_oactive(&ifp->if_snd);
  			break;
  		}
  		m = ifq_dequeue(&ifp->if_snd, NULL);