From caedcdc6cc4134abedcdfa0e62c22e2ca511c6ef Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 12 Jan 2010 15:53:28 -0800 Subject: [PATCH] Ran ./scripts/admin-update.sh refresh Thanks Haukes, its working now :D Signed-off-by: Luis R. Rodriguez --- patches/08-rename-iwl4965-config.patch | 6 +++--- patches/15-symbol-export-conflicts.patch | 6 +++--- patches/17-netdev-queue.patch | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch index ceaa34d94166..97ff50bbb059 100644 --- a/patches/08-rename-iwl4965-config.patch +++ b/patches/08-rename-iwl4965-config.patch @@ -14,9 +14,9 @@ CONFIG_IWL4965 has to be set to y, to build correctly. iwlagn-$(CONFIG_IWL5000) += iwl-5000.o iwlagn-$(CONFIG_IWL5000) += iwl-6000.o iwlagn-$(CONFIG_IWL5000) += iwl-1000.o ---- a/drivers/net/wireless/iwlwifi/iwl-agn.c 2010-01-11 08:47:03.000000000 -0800 -+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c 2010-01-11 08:54:05.000000000 -0800 -@@ -3767,10 +3767,10 @@ +--- a/drivers/net/wireless/iwlwifi/iwl-agn.c ++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c +@@ -3767,10 +3767,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 f8407856625f..fac1f0d0a856 100644 --- a/patches/15-symbol-export-conflicts.patch +++ b/patches/15-symbol-export-conflicts.patch @@ -1,9 +1,9 @@ In kernel < 2.6.32 libipw also exports ieee80211_rx. To avoid conflicts with the other export we rename our. ---- a/net/mac80211/rx.c 2010-01-11 09:32:05.000000000 -0800 -+++ b/net/mac80211/rx.c 2010-01-11 09:32:05.000000000 -0800 -@@ -2476,7 +2476,12 @@ +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -2476,7 +2476,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch index f4b26a4edb4d..8f711e48400d 100644 --- a/patches/17-netdev-queue.patch +++ b/patches/17-netdev-queue.patch @@ -12,9 +12,9 @@ The patch that introduced this on mac80211 was: Reviewed-by: Johannes Berg Signed-off-by: John W. Linville ---- a/net/mac80211/iface.c 2010-01-11 09:21:58.000000000 -0800 -+++ b/net/mac80211/iface.c 2010-01-11 09:21:58.000000000 -0800 -@@ -938,6 +938,7 @@ +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -943,6 +943,7 @@ void ieee80211_if_remove(struct ieee8021 * Remove all interfaces, may only be called at hardware unregistration * time because it doesn't do RCU-safe list removals. */ @@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was: void ieee80211_remove_interfaces(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata, *tmp; -@@ -954,6 +955,22 @@ +@@ -959,6 +960,22 @@ void ieee80211_remove_interfaces(struct mutex_unlock(&local->iflist_mtx); unregister_netdevice_many(&unreg_list); } -- 2.30.2