50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
|
--- a/net/mac80211/iface.c
|
||
|
|
+++ b/net/mac80211/iface.c
|
||
|
|
@@ -1044,9 +1044,14 @@ static void ieee80211_uninit(struct net_
|
||
|
|
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
|
||
|
|
static u16 ieee80211_netdev_select_queue(struct net_device *dev,
|
||
|
|
struct sk_buff *skb,
|
||
|
|
void *accel_priv)
|
||
|
|
+#else
|
||
|
|
+static u16 ieee80211_netdev_select_queue(struct net_device *dev,
|
||
|
|
+ struct sk_buff *skb)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
|
||
|
|
}
|
||
|
|
@@ -1062,9 +1067,14 @@ static const struct net_device_ops ieee8
|
||
|
|
.ndo_select_queue = ieee80211_netdev_select_queue,
|
||
|
|
};
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
|
||
|
|
static u16 ieee80211_monitor_select_queue(struct net_device *dev,
|
||
|
|
struct sk_buff *skb,
|
||
|
|
void *accel_priv)
|
||
|
|
+#else
|
||
|
|
+static u16 ieee80211_monitor_select_queue(struct net_device *dev,
|
||
|
|
+ struct sk_buff *skb)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
||
|
|
struct ieee80211_local *local = sdata->local;
|
||
|
|
--- a/drivers/net/wireless/mwifiex/main.c
|
||
|
|
+++ b/drivers/net/wireless/mwifiex/main.c
|
||
|
|
@@ -746,9 +746,14 @@ static struct net_device_stats *mwifiex_
|
||
|
|
return &priv->stats;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
|
||
|
|
static u16
|
||
|
|
mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb,
|
||
|
|
void *accel_priv)
|
||
|
|
+#else
|
||
|
|
+static u16
|
||
|
|
+mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
skb->priority = cfg80211_classify8021d(skb, NULL);
|
||
|
|
return mwifiex_1d_to_wmm_queue[skb->priority];
|