lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mwl8k: implement FIF_ALLMULTI

Browse Source 
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lennert Buytenhek
2009-10-22 20:19:50 +02:00
committed by John W. Linville
parent 3779752d76
commit 447ced07d0
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/wireless/mwl8k.c
View File

@@ -1543,16 +1543,14 @@ struct mwl8k_cmd_mac_multicast_adr {
#define MWL8K_ENABLE_RX_BROADCAST 0x0008 #define MWL8K_ENABLE_RX_BROADCAST 0x0008
static struct mwl8k_cmd_pkt * static struct mwl8k_cmd_pkt *
__mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,
int mc_count, struct dev_addr_list *mclist) int mc_count, struct dev_addr_list *mclist)
{ {
struct mwl8k_priv *priv = hw->priv; struct mwl8k_priv *priv = hw->priv;
struct mwl8k_cmd_mac_multicast_adr *cmd; struct mwl8k_cmd_mac_multicast_adr *cmd;
int allmulti;
int size; int size;
allmulti = 0; if (allmulti || mc_count > priv->num_mcaddrs) {
if (mc_count > priv->num_mcaddrs) {
allmulti = 1; allmulti = 1;
mc_count = 0; mc_count = 0;
} }
@@ -2680,7 +2678,14 @@ static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw,
{ {
struct mwl8k_cmd_pkt *cmd; struct mwl8k_cmd_pkt *cmd;
cmd = __mwl8k_cmd_mac_multicast_adr(hw, mc_count, mclist); /*
* Synthesize and return a command packet that programs the
* hardware multicast address filter. At this point we don't
* know whether FIF_ALLMULTI is being requested, but if it is,
* we'll end up throwing this packet away and creating a new
* one in mwl8k_configure_filter().
*/
cmd = __mwl8k_cmd_mac_multicast_adr(hw, 0, mc_count, mclist);
return (unsigned long)cmd; return (unsigned long)cmd;
} }
@@ -2691,10 +2696,10 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw,
u64 multicast) u64 multicast)
{ {
struct mwl8k_priv *priv = hw->priv; struct mwl8k_priv *priv = hw->priv;
struct mwl8k_cmd_pkt *multicast_adr_cmd; struct mwl8k_cmd_pkt *cmd;
/* Clear unsupported feature flags */ /* Clear unsupported feature flags */
*total_flags &= FIF_BCN_PRBRESP_PROMISC; *total_flags &= FIF_ALLMULTI | FIF_BCN_PRBRESP_PROMISC;
if (mwl8k_fw_lock(hw)) if (mwl8k_fw_lock(hw))
return; return;
@@ -2713,10 +2718,22 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw,
} }
} }
multicast_adr_cmd = (void *)(unsigned long)multicast; cmd = (void *)(unsigned long)multicast;
if (multicast_adr_cmd != NULL) {
mwl8k_post_cmd(hw, multicast_adr_cmd); /*
kfree(multicast_adr_cmd); * If FIF_ALLMULTI is being requested, throw away the command
* packet that ->prepare_multicast() built and replace it with
* a command packet that enables reception of all multicast
* packets.
*/
if (*total_flags & FIF_ALLMULTI) {
kfree(cmd);
cmd = __mwl8k_cmd_mac_multicast_adr(hw, 1, 0, NULL);
}
if (cmd != NULL) {
mwl8k_post_cmd(hw, cmd);
kfree(cmd);
} }
mwl8k_fw_unlock(hw); mwl8k_fw_unlock(hw);