From 8815d31f45871ea4789d06112c1340947cf75fea Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 16 Jun 2010 22:32:36 -0700 Subject: [PATCH] compat-wireless: refresh patches for next-20100617 Signed-off-by: Luis R. Rodriguez --- patches/05-usb.patch | 2 +- patches/15-symbol-export-conflicts.patch | 2 +- patches/25-multicast-list_head.patch | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/05-usb.patch b/patches/05-usb.patch index 0065739c78b3..929e072fe119 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 -@@ -1055,7 +1055,9 @@ static struct usb_driver p54u_driver = { +@@ -1056,7 +1056,9 @@ static struct usb_driver p54u_driver = { .resume = p54u_resume, .reset_resume = p54u_resume, #endif /* CONFIG_PM */ diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 49d9b187a4de..a25981786d5d 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 -@@ -2661,7 +2661,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -2666,7 +2666,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index aed1ccb731a7..d90e4b17c135 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -174,7 +174,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, unsigned int *new_flags, -@@ -3104,20 +3108,42 @@ unlock: +@@ -3139,20 +3143,42 @@ unlock: } static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw, @@ -217,7 +217,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val; pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); -@@ -3126,6 +3152,9 @@ static u64 ath5k_prepare_multicast(struc +@@ -3161,6 +3187,9 @@ static u64 ath5k_prepare_multicast(struc * neet to inform below to not reset the mcast */ /* ath5k_hw_set_mcast_filterindex(ah, * ha->addr[5]); */ @@ -539,7 +539,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return (u64)(unsigned long)fp; --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c -@@ -948,17 +948,34 @@ static void set_rx_filter_handler(struct +@@ -949,17 +949,34 @@ static void set_rx_filter_handler(struct } static u64 zd_op_prepare_multicast(struct ieee80211_hw *hw, @@ -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 -@@ -1689,7 +1689,11 @@ struct ieee80211_ops { +@@ -1686,7 +1686,11 @@ struct ieee80211_ops { struct ieee80211_bss_conf *info, u32 changed); u64 (*prepare_multicast)(struct ieee80211_hw *hw, -- 2.30.2