From a1a2cc72ae17ce42d7cef0f66ca7ce07f2abf0a4 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 5 Dec 2011 11:59:13 -0800 Subject: [PATCH] compat-wireless: refresh patches Synchs with linux-next tag 20111205 Signed-off-by: Luis R. Rodriguez --- patches/08-rename-config-options.patch | 4 ++-- patches/09-cfg80211-wext-padding.patch | 2 +- patches/14-device-type.patch | 2 +- patches/25-multicast-list_head.patch | 2 +- patches/29-sdio_no_suspend.patch | 4 ++-- patches/31-backport-sk_add_backlog.patch | 2 +- patches/36-workqueue.patch | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch index fdd39ec32cf0..569886a1d6e5 100644 --- a/patches/08-rename-config-options.patch +++ b/patches/08-rename-config-options.patch @@ -63,7 +63,7 @@ CONFIG_BT_HIDP does not build with older kernel versions. zd_rf_al2230.o zd_rf_rf2959.o \ --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h -@@ -245,7 +245,7 @@ extern void bt_sysfs_cleanup(void); +@@ -250,7 +250,7 @@ extern void bt_sysfs_cleanup(void); extern struct dentry *bt_debugfs; @@ -72,7 +72,7 @@ CONFIG_BT_HIDP does not build with older kernel versions. int l2cap_init(void); void l2cap_exit(void); #else -@@ -259,7 +259,7 @@ static inline void l2cap_exit(void) +@@ -264,7 +264,7 @@ static inline void l2cap_exit(void) } #endif diff --git a/patches/09-cfg80211-wext-padding.patch b/patches/09-cfg80211-wext-padding.patch index f4d57e5404ac..8340fb4f1274 100644 --- a/patches/09-cfg80211-wext-padding.patch +++ b/patches/09-cfg80211-wext-padding.patch @@ -30,7 +30,7 @@ moved due to struct enlargements. --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -1976,6 +1976,9 @@ struct wiphy_wowlan_support { +@@ -1977,6 +1977,9 @@ struct wiphy_wowlan_support { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch index d5212ddbdb81..ac7935dd7577 100644 --- a/patches/14-device-type.patch +++ b/patches/14-device-type.patch @@ -22,7 +22,7 @@ compile warning. unsigned long state, --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c -@@ -549,9 +549,11 @@ static struct device *bnep_get_device(st +@@ -545,9 +545,11 @@ static struct device *bnep_get_device(st return conn ? &conn->dev : NULL; } diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index d0de336d3e73..adec4482860f 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -768,7 +768,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); /* be a bit nasty */ -@@ -647,9 +651,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -606,9 +610,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask; INIT_LIST_HEAD(&local->interfaces); diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index 1fb68ffe5642..1684bc59afae 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -188,7 +188,7 @@ suspend and resume that are not backported. int retry = 0; while (atomic_read(&sdiodev->suspend) && retry++ != 30) wait_event_timeout(*wq, false, HZ/100); -@@ -528,7 +528,7 @@ static void brcmf_ops_sdio_remove(struct +@@ -530,7 +530,7 @@ static void brcmf_ops_sdio_remove(struct } } @@ -197,7 +197,7 @@ suspend and resume that are not backported. static int brcmf_sdio_suspend(struct device *dev) { mmc_pm_flag_t sdio_flags; -@@ -583,7 +583,7 @@ static struct sdio_driver brcmf_sdmmc_dr +@@ -585,7 +585,7 @@ static struct sdio_driver brcmf_sdmmc_dr .remove = brcmf_ops_sdio_remove, .name = "brcmfmac", .id_table = brcmf_sdmmc_ids, diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch index 7cee5d4ed521..eb2be159ed71 100644 --- a/patches/31-backport-sk_add_backlog.patch +++ b/patches/31-backport-sk_add_backlog.patch @@ -9,7 +9,7 @@ backlog. --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c -@@ -4211,8 +4211,12 @@ static inline int l2cap_data_channel(str +@@ -4240,8 +4240,12 @@ static inline int l2cap_data_channel(str if (!sock_owned_by_user(sk)) { l2cap_ertm_data_rcv(sk, skb); } else { diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch index 89f1db193865..ef6350ea51ec 100644 --- a/patches/36-workqueue.patch +++ b/patches/36-workqueue.patch @@ -3,7 +3,7 @@ The rest is backported in include/linux/compat-2.6.37.h --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -1140,6 +1140,10 @@ static void __exit ieee80211_exit(void) +@@ -1105,6 +1105,10 @@ static void __exit ieee80211_exit(void) rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); -- 2.30.2