mac80211: update to compat-wireless 2010-01-07 (unoffical snapshot, official ones...
[openwrt-10.03/.git] / package / mac80211 / patches / 530-mac80211_queue_fix.patch
1 --- a/net/mac80211/iface.c
2 +++ b/net/mac80211/iface.c
3 @@ -329,7 +329,7 @@ static int ieee80211_open(struct net_dev
4         if (sdata->vif.type == NL80211_IFTYPE_STATION)
5                 ieee80211_queue_work(&local->hw, &sdata->u.mgd.work);
6  
7 -       netif_start_queue(dev);
8 +       netif_tx_start_all_queues(dev);
9  
10         return 0;
11   err_del_interface:
12 @@ -357,7 +357,7 @@ static int ieee80211_stop(struct net_dev
13         /*
14          * Stop TX on this interface first.
15          */
16 -       netif_stop_queue(dev);
17 +       netif_tx_stop_all_queues(dev);
18  
19         /*
20          * Purge work for this interface.
21 --- a/net/mac80211/mlme.c
22 +++ b/net/mac80211/mlme.c
23 @@ -723,7 +723,7 @@ static void ieee80211_set_associated(str
24         ieee80211_recalc_smps(local, sdata);
25         mutex_unlock(&local->iflist_mtx);
26  
27 -       netif_start_queue(sdata->dev);
28 +       netif_tx_start_all_queues(sdata->dev);
29         netif_carrier_on(sdata->dev);
30  }
31  
32 @@ -759,7 +759,7 @@ static void ieee80211_set_disassoc(struc
33          * time -- we don't want the scan code to enable queues.
34          */
35  
36 -       netif_stop_queue(sdata->dev);
37 +       netif_tx_stop_all_queues(sdata->dev);
38         netif_carrier_off(sdata->dev);
39  
40         rcu_read_lock();
41 --- a/net/mac80211/offchannel.c
42 +++ b/net/mac80211/offchannel.c
43 @@ -113,7 +113,7 @@ void ieee80211_offchannel_stop_beaconing
44                  */
45                 if (sdata->vif.type != NL80211_IFTYPE_STATION &&
46                     sdata->vif.type != NL80211_IFTYPE_MONITOR)
47 -                       netif_stop_queue(sdata->dev);
48 +                       netif_tx_stop_all_queues(sdata->dev);
49         }
50         mutex_unlock(&local->iflist_mtx);
51  }
52 @@ -131,7 +131,7 @@ void ieee80211_offchannel_stop_station(s
53                         continue;
54  
55                 if (sdata->vif.type == NL80211_IFTYPE_STATION) {
56 -                       netif_stop_queue(sdata->dev);
57 +                       netif_tx_stop_all_queues(sdata->dev);
58                         if (sdata->u.mgd.associated)
59                                 ieee80211_offchannel_ps_enable(sdata);
60                 }
61 @@ -153,7 +153,7 @@ void ieee80211_offchannel_return(struct 
62                 if (sdata->vif.type == NL80211_IFTYPE_STATION) {
63                         if (sdata->u.mgd.associated)
64                                 ieee80211_offchannel_ps_disable(sdata);
65 -                       netif_wake_queue(sdata->dev);
66 +                       netif_tx_wake_all_queues(sdata->dev);
67                 }
68  
69                 /* re-enable beaconing */