summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/assoc.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2008-03-12 16:06:43 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-03-25 21:41:45 +0100
commitd9e9778c2ac5bac02fc118e9a2954e4c70f88eb6 (patch)
treed2642edca9df92610bbc8cba5b0c2a1036931130 /drivers/net/wireless/libertas/assoc.c
parentlibertas: convert CMD_MAC_CONTROL to a direct command (diff)
downloadlinux-d9e9778c2ac5bac02fc118e9a2954e4c70f88eb6.tar.xz
linux-d9e9778c2ac5bac02fc118e9a2954e4c70f88eb6.zip
libertas: rename packetfilter to mac_control
The CMD_MAC_CONTROL can be used for other things than just filtering packets, e.g. to enable and disable WMM. This uses the same term mac_control for the define, the function and the shadow value in struct lbs_private. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.c')
-rw-r--r--drivers/net/wireless/libertas/assoc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 707b7ff592ec..54161f1e742a 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -268,11 +268,11 @@ static int assoc_helper_wep_keys(struct lbs_private *priv,
/* enable/disable the MAC's WEP packet filter */
if (assoc_req->secinfo.wep_enabled)
- priv->currentpacketfilter |= CMD_ACT_MAC_WEP_ENABLE;
+ priv->mac_control |= CMD_ACT_MAC_WEP_ENABLE;
else
- priv->currentpacketfilter &= ~CMD_ACT_MAC_WEP_ENABLE;
+ priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE;
- ret = lbs_set_mac_packet_filter(priv);
+ ret = lbs_set_mac_control(priv);
if (ret)
goto out;
@@ -304,7 +304,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv,
memcpy(&priv->secinfo, &assoc_req->secinfo,
sizeof(struct lbs_802_11_security));
- ret = lbs_set_mac_packet_filter(priv);
+ ret = lbs_set_mac_control(priv);
if (ret)
goto out;