From a2e9e9f1e6278ecb605da657b704de9e6be6f12a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 6 Jun 2013 13:45:10 +0200 Subject: backports: refersh patches on next-20130606 There was a manual adjustment needed in patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- .../25-multicast-list_head/drivers_net_wireless_mwifiex_debugfs.patch | 2 +- .../network/25-multicast-list_head/net_mac80211_driver-ops.patch | 4 ++-- .../network/25-multicast-list_head/net_mac80211_iface.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'patches/collateral-evolutions/network/25-multicast-list_head') diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_debugfs.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_debugfs.patch index 0dca0d21..6add1859 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_debugfs.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_debugfs.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/debugfs.c +++ b/drivers/net/wireless/mwifiex/debugfs.c -@@ -215,7 +215,11 @@ mwifiex_info_read(struct file *file, cha +@@ -227,7 +227,11 @@ mwifiex_info_read(struct file *file, cha netdev_for_each_mc_addr(ha, netdev) p += sprintf(p, "multicast_address[%d]=\"%pM\"\n", diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch index 97dff3f7..042cca7f 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h -@@ -227,20 +227,35 @@ static inline void drv_bss_info_changed( +@@ -228,20 +228,35 @@ static inline void drv_bss_info_changed( } static inline u64 drv_prepare_multicast(struct ieee80211_local *local, @@ -36,7 +36,7 @@ static inline void drv_set_multicast_list(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, struct netdev_hw_addr_list *mc_list) -@@ -256,6 +271,23 @@ static inline void drv_set_multicast_lis +@@ -257,6 +272,23 @@ static inline void drv_set_multicast_lis allmulti, mc_list); trace_drv_return_void(local); } diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch index 3fc956a2..dc3d97ae 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -781,8 +781,13 @@ static void ieee80211_do_stop(struct iee +@@ -794,8 +794,13 @@ static void ieee80211_do_stop(struct iee if (sdata->dev) { netif_addr_lock_bh(sdata->dev); spin_lock_bh(&local->filter_lock); @@ -14,7 +14,7 @@ spin_unlock_bh(&local->filter_lock); netif_addr_unlock_bh(sdata->dev); } -@@ -990,10 +995,20 @@ static void ieee80211_set_multicast_list +@@ -1007,10 +1012,20 @@ static void ieee80211_set_multicast_list if (sdata->vif.type != NL80211_IFTYPE_MONITOR && sdata->vif.type != NL80211_IFTYPE_AP_VLAN && sdata->vif.type != NL80211_IFTYPE_AP) -- cgit v1.2.3