merge
authorJohannes Hofmann <johannes.hofmann@gmx.de>
Sat, 12 Jan 2013 10:31:39 +0000 (11:31 +0100)
committerJohannes Hofmann <johannes.hofmann@gmx.de>
Sat, 12 Jan 2013 10:31:39 +0000 (11:31 +0100)
1  2 
sys/dev/netif/ath/ath/if_ath.c
sys/dev/netif/iwn/if_iwn.c
sys/netproto/802_11/wlan/ieee80211_ioctl.c
sys/netproto/802_11/wlan/ieee80211_output.c
sys/netproto/802_11/wlan/ieee80211_proto.c

Simple merge
@@@ -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);