Changeset 31862


Ignore:
Timestamp:
2012-05-26T22:15:28+02:00 (6 years ago)
Author:
nbd
Message:

mac80211: backport a fix for single-queue drivers (fixes #11534)

Location:
trunk/package/mac80211/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/300-pending_work.patch

    r31540 r31862  
    608608--- a/net/mac80211/iface.c 
    609609+++ b/net/mac80211/iface.c 
    610 @@ -282,7 +282,6 @@ static int ieee80211_do_open(struct net_ 
     610@@ -206,8 +206,10 @@ static void ieee80211_set_default_queues 
     611        for (i = 0; i < IEEE80211_NUM_ACS; i++) { 
     612                if (local->hw.flags & IEEE80211_HW_QUEUE_CONTROL) 
     613                        sdata->vif.hw_queue[i] = IEEE80211_INVAL_HW_QUEUE; 
     614-               else 
     615+               else if (local->hw.queues >= IEEE80211_NUM_ACS) 
     616                        sdata->vif.hw_queue[i] = i; 
     617+               else 
     618+                       sdata->vif.hw_queue[i] = 0; 
     619        } 
     620        sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE; 
     621 } 
     622@@ -282,7 +284,6 @@ static int ieee80211_do_open(struct net_ 
    611623 { 
    612624        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); 
     
    616628        int res; 
    617629        u32 hw_reconf_flags = 0; 
    618 @@ -428,28 +427,6 @@ static int ieee80211_do_open(struct net_ 
     630@@ -428,28 +429,6 @@ static int ieee80211_do_open(struct net_ 
    619631  
    620632        set_bit(SDATA_STATE_RUNNING, &sdata->state); 
     
    645657         * set_multicast_list will be invoked by the networking core 
    646658         * which will check whether any increments here were done in 
    647 @@ -846,6 +823,72 @@ static void ieee80211_if_setup(struct ne 
     659@@ -846,6 +825,72 @@ static void ieee80211_if_setup(struct ne 
    648660        dev->destructor = free_netdev; 
    649661 } 
     
    718730 { 
    719731        struct ieee80211_sub_if_data *sdata = 
    720 @@ -950,6 +993,9 @@ static void ieee80211_iface_work(struct  
     732@@ -950,6 +995,9 @@ static void ieee80211_iface_work(struct  
    721733                                break; 
    722734                        ieee80211_mesh_rx_queued_mgmt(sdata, skb); 
  • trunk/package/mac80211/patches/513-mac80211_reduce_txqueuelen.patch

    r31322 r31862  
    11--- a/net/mac80211/iface.c 
    22+++ b/net/mac80211/iface.c 
    3 @@ -813,6 +813,7 @@ static const struct net_device_ops ieee8 
     3@@ -815,6 +815,7 @@ static const struct net_device_ops ieee8 
    44 static void ieee80211_if_setup(struct net_device *dev) 
    55 { 
Note: See TracChangeset for help on using the changeset viewer.