From 9094509a09f4172f817ba6c072e8ad71d96c2135 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 10 Jun 2010 18:14:18 -0700 Subject: [PATCH] compat-wireless: refresh of patches for June 10 2010 Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 2 +- patches/03-rfkill.patch | 2 +- patches/05-usb.patch | 4 ++-- patches/08-rename-iwl4965-config.patch | 2 +- patches/11-dev-pm-ops.patch | 2 +- patches/15-symbol-export-conflicts.patch | 2 +- patches/24-pcmcia.patch | 2 +- patches/25-multicast-list_head.patch | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index d56c30ffd9b3..daa75b7b9fa9 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -111,7 +111,7 @@ without creating a headache on maintenance of the pathes. ieee80211_sdata_set_mesh_id(sdata, --- a/drivers/net/b44.c +++ b/drivers/net/b44.c -@@ -2162,7 +2162,7 @@ static int __devinit b44_init_one(struct +@@ -2156,7 +2156,7 @@ static int __devinit b44_init_one(struct bp->rx_pending = B44_DEF_RX_RING_PENDING; bp->tx_pending = B44_DEF_TX_RING_PENDING; diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch index 3c92b005423f..fed03825bdb6 100644 --- a/patches/03-rfkill.patch +++ b/patches/03-rfkill.patch @@ -208,7 +208,7 @@ This would do the policing from within mac80211. #include --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -2164,7 +2164,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -2168,7 +2168,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; diff --git a/patches/05-usb.patch b/patches/05-usb.patch index c61109644d15..0065739c78b3 100644 --- a/patches/05-usb.patch +++ b/patches/05-usb.patch @@ -2,7 +2,7 @@ USB opt soft_unbid was added as of 2.6.27. --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c -@@ -1054,7 +1054,9 @@ static struct usb_driver p54u_driver = { +@@ -1055,7 +1055,9 @@ static struct usb_driver p54u_driver = { .resume = p54u_resume, .reset_resume = p54u_resume, #endif /* CONFIG_PM */ @@ -14,7 +14,7 @@ USB opt soft_unbid was added as of 2.6.27. static int __init p54u_init(void) --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -998,7 +998,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1024,7 +1024,9 @@ static struct usb_driver ath9k_hif_usb_d .reset_resume = ath9k_hif_usb_resume, #endif .id_table = ath9k_hif_usb_ids, diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch index 76a5cd90cea3..969227ba1016 100644 --- a/patches/08-rename-iwl4965-config.patch +++ b/patches/08-rename-iwl4965-config.patch @@ -16,7 +16,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly. iwlagn-$(CONFIG_IWL5000) += iwl-1000.o --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c -@@ -3975,10 +3975,10 @@ static void __devexit iwl_pci_remove(str +@@ -4072,10 +4072,10 @@ static void __devexit iwl_pci_remove(str /* Hardware specific file defines the PCI IDs table for that hardware module */ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index f086c5fd519c..3e97ed975805 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -10,7 +10,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -198,6 +198,33 @@ static void __devexit ath5k_pci_remove(s - #ifdef CONFIG_PM + #ifdef CONFIG_PM_SLEEP static int ath5k_pci_suspend(struct device *dev); static int ath5k_pci_resume(struct device *dev); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index a8ef7c36c804..10eb4f086401 100644 --- a/patches/15-symbol-export-conflicts.patch +++ b/patches/15-symbol-export-conflicts.patch @@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our. --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -2626,7 +2626,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -2629,7 +2629,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch index 3bc395d0e94f..5b1926c481d7 100644 --- a/patches/24-pcmcia.patch +++ b/patches/24-pcmcia.patch @@ -299,7 +299,7 @@ } --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -490,7 +490,11 @@ static int ssb_devices_register(struct s +@@ -491,7 +491,11 @@ static int ssb_devices_register(struct s break; case SSB_BUSTYPE_PCMCIA: #ifdef CONFIG_SSB_PCMCIAHOST diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 4d0accbdaa01..5fbc1eb2092f 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -69,7 +69,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/drivers/net/b44.c +++ b/drivers/net/b44.c -@@ -1687,7 +1687,11 @@ static int __b44_load_mcast(struct b44 * +@@ -1681,7 +1681,11 @@ static int __b44_load_mcast(struct b44 * netdev_for_each_mc_addr(ha, dev) { if (i == num_ents) break; @@ -576,7 +576,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return hash.low | ((u64)hash.high << 32); --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1686,7 +1686,11 @@ struct ieee80211_ops { +@@ -1682,7 +1682,11 @@ struct ieee80211_ops { struct ieee80211_vif *vif, struct in_ifaddr *ifa_list); u64 (*prepare_multicast)(struct ieee80211_hw *hw, @@ -692,7 +692,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); /* be a bit nasty */ -@@ -442,9 +446,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -447,9 +451,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN; INIT_LIST_HEAD(&local->interfaces); -- 2.30.2