diff options
| author | Stone Piao | 2013-07-23 04:17:44 +0200 |
|---|---|---|
| committer | John W. Linville | 2013-07-24 17:02:06 +0200 |
| commit | 4481b2dba0930015d7c15acd0b69a3a89cae3591 (patch) | |
| tree | d3fecd91546d0037e1b24c041ecf4e38baf269bf /drivers/net/wireless/mwifiex/cfg80211.c | |
| parent | mwifiex: discard deauth and disassoc event during WPS session (diff) | |
| download | kernel-qcow2-linux-4481b2dba0930015d7c15acd0b69a3a89cae3591.tar.gz kernel-qcow2-linux-4481b2dba0930015d7c15acd0b69a3a89cae3591.tar.xz kernel-qcow2-linux-4481b2dba0930015d7c15acd0b69a3a89cae3591.zip | |
mwifiex: skip registering mgmt frame that has already registered
Before sending command to firmware, we need to check the frame type.
We skip registering the mgmt frame that has already been registered.
Signed-off-by: Stone Piao <piaoyun@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index d824feea39ec..dbdd3b2a5eb5 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -240,16 +240,20 @@ mwifiex_cfg80211_mgmt_frame_register(struct wiphy *wiphy, u16 frame_type, bool reg) { struct mwifiex_private *priv = mwifiex_netdev_get_priv(wdev->netdev); + u32 mask; if (reg) - priv->mgmt_frame_mask |= BIT(frame_type >> 4); + mask = priv->mgmt_frame_mask | BIT(frame_type >> 4); else - priv->mgmt_frame_mask &= ~BIT(frame_type >> 4); + mask = priv->mgmt_frame_mask & ~BIT(frame_type >> 4); - mwifiex_send_cmd_async(priv, HostCmd_CMD_MGMT_FRAME_REG, - HostCmd_ACT_GEN_SET, 0, &priv->mgmt_frame_mask); - - wiphy_dbg(wiphy, "info: mgmt frame registered\n"); + if (mask != priv->mgmt_frame_mask) { + priv->mgmt_frame_mask = mask; + mwifiex_send_cmd_async(priv, HostCmd_CMD_MGMT_FRAME_REG, + HostCmd_ACT_GEN_SET, 0, + &priv->mgmt_frame_mask); + wiphy_dbg(wiphy, "info: mgmt frame registered\n"); + } } /* |