w35und: Fix ->configure_filter breakage
PATCH 2/2 w35und: Fix ->configure_filter breakage
From: Pekka Enberg <[email protected]>
Commit 3ac64beecd27400d12cc7afb4108eef26c499f6a ("mac80211: allow configure_filter callback to sleep") ->configure_filter function signature. Fix driver breakage by introducing a ->prepare_multicast operation that returns "mc_count". I'm not sure if the "mc_count > 32" check is actually needed but lets keep the driver functionally equivalent for now.
--- drivers/staging/winbond/wbusb.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
drivers/staging/winbond/wbusb.c +9 -2
@@ -99,10 +99,16 @@ static int wbsoft_get_tx_stats(struct ieee80211_hw *hw,return 0 ; } +static u64 wbsoft_prepare_multicast (struct ieee80211_hw *hw,int mc_count, +struct dev_addr_list *mclist) +{ +return mc_count; +} +static void wbsoft_configure_filter (struct ieee80211_hw *dev,unsigned int changed_flags,unsigned int *total_flags, -int mc_count,struct dev_mc_list *mclist) +u64 multicast) {unsigned int new_flags;
@@ -110,7 +116,7 @@ static void wbsoft_configure_filter(struct ieee80211_hw *dev,if (*total_flags &FIF_PROMISC_IN_BSS ) new_flags |=FIF_PROMISC_IN_BSS ; -else if ((*total_flags &FIF_ALLMULTI ) || (mc_count >32 )) +else if ((*total_flags &FIF_ALLMULTI ) || (multicast >32 )) new_flags |=FIF_ALLMULTI ; dev->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS ;
@@ -278,6 +284,7 @@ static const struct ieee80211_ops wbsoft_ops = { .add_interface = wbsoft_add_interface, .remove_interface = wbsoft_remove_interface, .config = wbsoft_config, + .prepare_multicast = wbsoft_prepare_multicast, .configure_filter = wbsoft_configure_filter, .get_stats = wbsoft_get_stats, .get_tx_stats = wbsoft_get_tx_stats,
Signature · 1 line
1.5.6.3
Hi!
Quoted 7 lines
Commit
3ac64beecd27400d12cc7afb4108eef26c499f6a("mac80211: allowconfigure_filtercallback to sleep") ->configure_filter function signature. Fix driver breakage by introducing a ->prepare_multicast operation that returns "mc_count". I'm not sure if the "mc_count> 32" check is actually needed but lets keep the driver functionally equivalent for now.
Quoted 5 lines
Cc Greg KH <[email protected]>Cc Jiri Benc <[email protected]>Cc Jiri Kosina <[email protected]>Cc Johannes Berg <[email protected]>Cc Pavel Machek <[email protected]>
Ack.. And thanks!
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html