From 7b2ea39403330716007af37b9b02b6e8d0944eec Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 31 May 2014 17:23:22 +0200 Subject: backports: refresh patches on next-20140501 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.59 [ OK ] 4 3.3.8 [ OK ] 5 3.4.91 [ 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.40 [ OK ] 12 3.11.10 [ OK ] 13 3.12.20 [ OK ] 14 3.13.11 [ OK ] 15 3.14.4 [ OK ] 16 3.15-rc7 [ OK ] Signed-off-by: Hauke Mehrtens --- .../collateral-evolutions/network/0028-select_queue/mac80211.patch | 4 ++-- patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'patches/collateral-evolutions/network/0028-select_queue') diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch index d21a56b7..77d3e2fa 100644 --- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch +++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch @@ -2,7 +2,7 @@ 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 -@@ -1052,10 +1052,19 @@ static void ieee80211_uninit(struct net_ +@@ -1063,10 +1063,19 @@ static void ieee80211_uninit(struct net_ ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev)); } @@ -22,7 +22,7 @@ index 088111a..dcf149a 100644 { return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb); } -@@ -1071,10 +1080,19 @@ static const struct net_device_ops ieee8 +@@ -1082,10 +1091,19 @@ static const struct net_device_ops ieee8 .ndo_select_queue = ieee80211_netdev_select_queue, }; diff --git a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch index e53683ea..7391bddb 100644 --- a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch +++ b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch @@ -2,7 +2,7 @@ diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/ index 9d3d275..f8b16f4 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -747,9 +747,18 @@ static struct net_device_stats *mwifiex_ +@@ -745,9 +745,18 @@ static struct net_device_stats *mwifiex_ return &priv->stats; } -- cgit v1.2.3