From 58a9cce892fa4499a79b597728e2047ac0a8b380 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 19 Apr 2010 17:22:04 -0700 Subject: [PATCH] admin-update refresh Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 2 +- patches/03-rfkill.patch | 2 +- patches/05-usb.patch | 2 +- patches/08-rename-iwl4965-config.patch | 2 +- patches/15-symbol-export-conflicts.patch | 2 +- patches/22-multiqueue.patch | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 4d8cc1310ba2..924376b0fd2d 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -550,7 +550,7 @@ without creating a headache on maintenance of the pathes. #define LBS_DEB_LEAVE 0x00000002 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1016,16 +1016,22 @@ static struct device_driver mac80211_hws +@@ -1049,16 +1049,22 @@ static struct device_driver mac80211_hws .name = "mac80211_hwsim" }; diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch index b79b6efe7698..e17ab0925fcc 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 -@@ -3235,7 +3235,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -3183,7 +3183,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 13979d7548be..823097e51eee 100644 --- a/patches/05-usb.patch +++ b/patches/05-usb.patch @@ -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 -@@ -951,7 +951,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -970,7 +970,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 b542c037968d..6c73a539b60a 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 -@@ -3766,10 +3766,10 @@ static void __devexit iwl_pci_remove(str +@@ -3761,10 +3761,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/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 8f6284d073d4..817facfcdc45 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 -@@ -2605,7 +2605,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -2607,7 +2607,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index 2be945705413..f6bd3e043b8b 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch @@ -65,7 +65,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue, enum queue_stop_reason reason) { -@@ -282,7 +294,14 @@ static void __ieee80211_wake_queue(struc +@@ -284,7 +296,14 @@ static void __ieee80211_wake_queue(struc if (skb_queue_empty(&local->pending[queue])) { rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) @@ -80,7 +80,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() rcu_read_unlock(); } else tasklet_schedule(&local->tx_pending_tasklet); -@@ -319,7 +338,13 @@ static void __ieee80211_stop_queue(struc +@@ -323,7 +342,13 @@ static void __ieee80211_stop_queue(struc rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) -- 2.30.2