diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-19 11:43:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-19 11:43:42 -0800 |
| commit | 6373464288cab09bc641be301d8d30fc9f64ba71 (patch) | |
| tree | c1bc92dc630aa15da2e12bc0d09c92169817a702 /drivers/net/wireless/zd1211rw | |
| parent | 6d955180b2f9ccff444df06265160868cabb289a (diff) | |
| parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) | |
| download | op-kernel-dev-6373464288cab09bc641be301d8d30fc9f64ba71.zip op-kernel-dev-6373464288cab09bc641be301d8d30fc9f64ba71.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 709fe5e..2d555cc 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -987,12 +987,13 @@ static void zd_op_configure_filter(struct ieee80211_hw *hw, changed_flags &= SUPPORTED_FIF_FLAGS; *new_flags &= SUPPORTED_FIF_FLAGS; - /* changed_flags is always populated but this driver - * doesn't support all FIF flags so its possible we don't - * need to do anything */ - if (!changed_flags) - return; - + /* + * If multicast parameter (as returned by zd_op_prepare_multicast) + * has changed, no bit in changed_flags is set. To handle this + * situation, we do not return if changed_flags is 0. If we do so, + * we will have some issue with IPv6 which uses multicast for link + * layer address resolution. + */ if (*new_flags & (FIF_PROMISC_IN_BSS | FIF_ALLMULTI)) zd_mc_add_all(&hash); |
