mac80211: update to wireless-testing 2014-01-23
[openwrt.git] / package / kernel / mac80211 / patches / 160-backport_select_queue.patch
1 --- a/net/mac80211/iface.c
2 +++ b/net/mac80211/iface.c
3 @@ -1044,9 +1044,14 @@ static void ieee80211_uninit(struct net_
4         ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
5  }
6  
7 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
8  static u16 ieee80211_netdev_select_queue(struct net_device *dev,
9                                          struct sk_buff *skb,
10                                          void *accel_priv)
11 +#else
12 +static u16 ieee80211_netdev_select_queue(struct net_device *dev,
13 +                                        struct sk_buff *skb)
14 +#endif
15  {
16         return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
17  }
18 @@ -1062,9 +1067,14 @@ static const struct net_device_ops ieee8
19         .ndo_select_queue       = ieee80211_netdev_select_queue,
20  };
21  
22 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
23  static u16 ieee80211_monitor_select_queue(struct net_device *dev,
24                                           struct sk_buff *skb,
25                                           void *accel_priv)
26 +#else
27 +static u16 ieee80211_monitor_select_queue(struct net_device *dev,
28 +                                         struct sk_buff *skb)
29 +#endif
30  {
31         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
32         struct ieee80211_local *local = sdata->local;
33 --- a/drivers/net/wireless/mwifiex/main.c
34 +++ b/drivers/net/wireless/mwifiex/main.c
35 @@ -746,9 +746,14 @@ static struct net_device_stats *mwifiex_
36         return &priv->stats;
37  }
38  
39 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
40  static u16
41  mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb,
42                                 void *accel_priv)
43 +#else
44 +static u16
45 +mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb)
46 +#endif
47  {
48         skb->priority = cfg80211_classify8021d(skb, NULL);
49         return mwifiex_1d_to_wmm_queue[skb->priority];