diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-11 01:45:20 +0000 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-17 16:23:08 -0700 |
| commit | be4a0f9ad7e17670d7a30c9e94d5dd918425f90a (patch) | |
| tree | e357fbef6a8bd452136a59c59a0b654d666d38a8 /patches/collateral-evolutions/network/0028-select_queue | |
| parent | 0429914b5f1cb02830dbc4200d615abd9b3f2f7c (diff) | |
backports: nuke support for kernels < 3.0
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean
/home/mcgrof/linux-next /home/mcgrof/build/next-20140409
Copy original source files ...
Apply patches ...
Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Done!
real 1m30.186s
user 9m25.180s
sys 0m24.428s
mcgrof@drvbp1 ~/build/next-20140409 $ time ckmake --allyesconfig
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.54 [ OK ]
4 3.3.8 [ OK ]
5 3.4.79 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.29 [ OK ]
12 3.11.10 [ OK ]
13 3.12.10 [ OK ]
14 3.13.2 [ OK ]
15 3.14-rc1 [ OK ]
real 26m54.859s
user 744m15.764s
sys 83m47.440s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/0028-select_queue')
3 files changed, 79 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/0028-select_queue/INFO b/patches/collateral-evolutions/network/0028-select_queue/INFO new file mode 100644 index 00000000..519e4fcf --- /dev/null +++ b/patches/collateral-evolutions/network/0028-select_queue/INFO @@ -0,0 +1,12 @@ +backports: adapt to changes in netdev select_queue call + +This patch reverts the changes done in the following commit for older +kernel versions: +commit f663dd9aaf9ed124f25f0f8452edf238f087ad50 +Author: Jason Wang <jasowang@redhat.com> +Date: Fri Jan 10 16:18:26 2014 +0800 + + net: core: explicitly select a txq before doing l2 forwarding + +mcgrof@ergon ~/linux (git::master)$ git describe --contains f663dd9aaf9ed124f25f0f8452edf238f087ad50 +v3.13-rc8~4^2~2 diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch new file mode 100644 index 00000000..b4b81512 --- /dev/null +++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch @@ -0,0 +1,44 @@ +diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c +index 088111a..dcf149a 100644 +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1062,10 +1062,19 @@ static void ieee80211_uninit(struct net_ + ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev)); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) + static u16 ieee80211_netdev_select_queue(struct net_device *dev, + struct sk_buff *skb, + void *accel_priv, + select_queue_fallback_t fallback) ++#elif 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); + } +@@ -1081,10 +1090,19 @@ static const struct net_device_ops ieee8 + .ndo_select_queue = ieee80211_netdev_select_queue, + }; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) + static u16 ieee80211_monitor_select_queue(struct net_device *dev, + struct sk_buff *skb, + void *accel_priv, + select_queue_fallback_t fallback) ++#elif 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; diff --git a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch new file mode 100644 index 00000000..db9ed6e5 --- /dev/null +++ b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch @@ -0,0 +1,23 @@ +diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c +index 9d3d275..f8b16f4 100644 +--- a/drivers/net/wireless/mwifiex/main.c ++++ b/drivers/net/wireless/mwifiex/main.c +@@ -746,9 +746,18 @@ static struct net_device_stats *mwifiex_ + return &priv->stats; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) + static u16 + mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb, + void *accel_priv, select_queue_fallback_t fallback) ++#elif 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]; |