patches: refresh patches on v4.14-rc1
[openwrt/staging/blogic.git] / patches / 0028-select_queue / mac80211.patch
1 --- a/net/mac80211/iface.c
2 +++ b/net/mac80211/iface.c
3 @@ -1145,10 +1145,20 @@ static void ieee80211_uninit(struct net_
4 ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
5 }
6
7 +#if LINUX_VERSION_IS_GEQ(3,14,0) || \
8 + (LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30)
9 static u16 ieee80211_netdev_select_queue(struct net_device *dev,
10 struct sk_buff *skb,
11 void *accel_priv,
12 select_queue_fallback_t fallback)
13 +#elif LINUX_VERSION_IS_GEQ(3,13,0)
14 +static u16 ieee80211_netdev_select_queue(struct net_device *dev,
15 + struct sk_buff *skb,
16 + void *accel_priv)
17 +#else
18 +static u16 ieee80211_netdev_select_queue(struct net_device *dev,
19 + struct sk_buff *skb)
20 +#endif
21 {
22 return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
23 }
24 @@ -1191,10 +1201,20 @@ static const struct net_device_ops ieee8
25 .ndo_get_stats64 = ieee80211_get_stats64,
26 };
27
28 +#if LINUX_VERSION_IS_GEQ(3,14,0) || \
29 + (LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30)
30 static u16 ieee80211_monitor_select_queue(struct net_device *dev,
31 struct sk_buff *skb,
32 void *accel_priv,
33 select_queue_fallback_t fallback)
34 +#elif LINUX_VERSION_IS_GEQ(3,13,0)
35 +static u16 ieee80211_monitor_select_queue(struct net_device *dev,
36 + struct sk_buff *skb,
37 + void *accel_priv)
38 +#else
39 +static u16 ieee80211_monitor_select_queue(struct net_device *dev,
40 + struct sk_buff *skb)
41 +#endif
42 {
43 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
44 struct ieee80211_local *local = sdata->local;