Commit d9e9778c authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville

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: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 835d3ac5
...@@ -268,11 +268,11 @@ static int assoc_helper_wep_keys(struct lbs_private *priv, ...@@ -268,11 +268,11 @@ static int assoc_helper_wep_keys(struct lbs_private *priv,
/* enable/disable the MAC's WEP packet filter */ /* enable/disable the MAC's WEP packet filter */
if (assoc_req->secinfo.wep_enabled) if (assoc_req->secinfo.wep_enabled)
priv->currentpacketfilter |= CMD_ACT_MAC_WEP_ENABLE; priv->mac_control |= CMD_ACT_MAC_WEP_ENABLE;
else 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) if (ret)
goto out; goto out;
...@@ -304,7 +304,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv, ...@@ -304,7 +304,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv,
memcpy(&priv->secinfo, &assoc_req->secinfo, memcpy(&priv->secinfo, &assoc_req->secinfo,
sizeof(struct lbs_802_11_security)); sizeof(struct lbs_802_11_security));
ret = lbs_set_mac_packet_filter(priv); ret = lbs_set_mac_control(priv);
if (ret) if (ret)
goto out; goto out;
......
...@@ -1286,7 +1286,7 @@ int lbs_set_radio_control(struct lbs_private *priv) ...@@ -1286,7 +1286,7 @@ int lbs_set_radio_control(struct lbs_private *priv)
return ret; return ret;
} }
int lbs_set_mac_packet_filter(struct lbs_private *priv) int lbs_set_mac_control(struct lbs_private *priv)
{ {
int ret = 0; int ret = 0;
struct cmd_ds_mac_control cmd; struct cmd_ds_mac_control cmd;
...@@ -1294,7 +1294,7 @@ int lbs_set_mac_packet_filter(struct lbs_private *priv) ...@@ -1294,7 +1294,7 @@ int lbs_set_mac_packet_filter(struct lbs_private *priv)
lbs_deb_enter(LBS_DEB_CMD); lbs_deb_enter(LBS_DEB_CMD);
cmd.hdr.size = cpu_to_le16(sizeof(cmd)); cmd.hdr.size = cpu_to_le16(sizeof(cmd));
cmd.action = cpu_to_le16(priv->currentpacketfilter); cmd.action = cpu_to_le16(priv->mac_control);
cmd.reserved = 0; cmd.reserved = 0;
ret = lbs_cmd_with_response(priv, CMD_MAC_CONTROL, &cmd); ret = lbs_cmd_with_response(priv, CMD_MAC_CONTROL, &cmd);
......
...@@ -17,7 +17,7 @@ struct net_device; ...@@ -17,7 +17,7 @@ struct net_device;
struct cmd_ctrl_node; struct cmd_ctrl_node;
struct cmd_ds_command; struct cmd_ds_command;
int lbs_set_mac_packet_filter(struct lbs_private *priv); int lbs_set_mac_control(struct lbs_private *priv);
void lbs_send_tx_feedback(struct lbs_private *priv); void lbs_send_tx_feedback(struct lbs_private *priv);
......
...@@ -252,7 +252,7 @@ struct lbs_private { ...@@ -252,7 +252,7 @@ struct lbs_private {
struct sk_buff *currenttxskb; struct sk_buff *currenttxskb;
/** NIC Operation characteristics */ /** NIC Operation characteristics */
u16 currentpacketfilter; u16 mac_control;
u32 connect_status; u32 connect_status;
u32 mesh_connect_status; u32 mesh_connect_status;
u16 regioncode; u16 regioncode;
......
...@@ -581,45 +581,45 @@ static int lbs_copy_multicast_address(struct lbs_private *priv, ...@@ -581,45 +581,45 @@ static int lbs_copy_multicast_address(struct lbs_private *priv,
static void lbs_set_multicast_list(struct net_device *dev) static void lbs_set_multicast_list(struct net_device *dev)
{ {
struct lbs_private *priv = dev->priv; struct lbs_private *priv = dev->priv;
int oldpacketfilter; int old_mac_control;
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
lbs_deb_enter(LBS_DEB_NET); lbs_deb_enter(LBS_DEB_NET);
oldpacketfilter = priv->currentpacketfilter; old_mac_control = priv->mac_control;
if (dev->flags & IFF_PROMISC) { if (dev->flags & IFF_PROMISC) {
lbs_deb_net("enable promiscuous mode\n"); lbs_deb_net("enable promiscuous mode\n");
priv->currentpacketfilter |= priv->mac_control |=
CMD_ACT_MAC_PROMISCUOUS_ENABLE; CMD_ACT_MAC_PROMISCUOUS_ENABLE;
priv->currentpacketfilter &= priv->mac_control &=
~(CMD_ACT_MAC_ALL_MULTICAST_ENABLE | ~(CMD_ACT_MAC_ALL_MULTICAST_ENABLE |
CMD_ACT_MAC_MULTICAST_ENABLE); CMD_ACT_MAC_MULTICAST_ENABLE);
} else { } else {
/* Multicast */ /* Multicast */
priv->currentpacketfilter &= priv->mac_control &=
~CMD_ACT_MAC_PROMISCUOUS_ENABLE; ~CMD_ACT_MAC_PROMISCUOUS_ENABLE;
if (dev->flags & IFF_ALLMULTI || dev->mc_count > if (dev->flags & IFF_ALLMULTI || dev->mc_count >
MRVDRV_MAX_MULTICAST_LIST_SIZE) { MRVDRV_MAX_MULTICAST_LIST_SIZE) {
lbs_deb_net( "enabling all multicast\n"); lbs_deb_net( "enabling all multicast\n");
priv->currentpacketfilter |= priv->mac_control |=
CMD_ACT_MAC_ALL_MULTICAST_ENABLE; CMD_ACT_MAC_ALL_MULTICAST_ENABLE;
priv->currentpacketfilter &= priv->mac_control &=
~CMD_ACT_MAC_MULTICAST_ENABLE; ~CMD_ACT_MAC_MULTICAST_ENABLE;
} else { } else {
priv->currentpacketfilter &= priv->mac_control &=
~CMD_ACT_MAC_ALL_MULTICAST_ENABLE; ~CMD_ACT_MAC_ALL_MULTICAST_ENABLE;
if (!dev->mc_count) { if (!dev->mc_count) {
lbs_deb_net("no multicast addresses, " lbs_deb_net("no multicast addresses, "
"disabling multicast\n"); "disabling multicast\n");
priv->currentpacketfilter &= priv->mac_control &=
~CMD_ACT_MAC_MULTICAST_ENABLE; ~CMD_ACT_MAC_MULTICAST_ENABLE;
} else { } else {
int i; int i;
priv->currentpacketfilter |= priv->mac_control |=
CMD_ACT_MAC_MULTICAST_ENABLE; CMD_ACT_MAC_MULTICAST_ENABLE;
priv->nr_of_multicastmacaddr = priv->nr_of_multicastmacaddr =
...@@ -642,9 +642,8 @@ static void lbs_set_multicast_list(struct net_device *dev) ...@@ -642,9 +642,8 @@ static void lbs_set_multicast_list(struct net_device *dev)
} }
} }
if (priv->currentpacketfilter != oldpacketfilter) { if (priv->mac_control != old_mac_control)
lbs_set_mac_packet_filter(priv); lbs_set_mac_control(priv);
}
lbs_deb_leave(LBS_DEB_NET); lbs_deb_leave(LBS_DEB_NET);
} }
...@@ -945,7 +944,7 @@ static int lbs_setup_firmware(struct lbs_private *priv) ...@@ -945,7 +944,7 @@ static int lbs_setup_firmware(struct lbs_private *priv)
goto done; goto done;
} }
lbs_set_mac_packet_filter(priv); lbs_set_mac_control(priv);
ret = lbs_get_data_rate(priv); ret = lbs_get_data_rate(priv);
if (ret < 0) { if (ret < 0) {
...@@ -1036,7 +1035,7 @@ static int lbs_init_adapter(struct lbs_private *priv) ...@@ -1036,7 +1035,7 @@ static int lbs_init_adapter(struct lbs_private *priv)
priv->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM; priv->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
priv->mode = IW_MODE_INFRA; priv->mode = IW_MODE_INFRA;
priv->curbssparams.channel = DEFAULT_AD_HOC_CHANNEL; priv->curbssparams.channel = DEFAULT_AD_HOC_CHANNEL;
priv->currentpacketfilter = CMD_ACT_MAC_RX_ON | CMD_ACT_MAC_TX_ON; priv->mac_control = CMD_ACT_MAC_RX_ON | CMD_ACT_MAC_TX_ON;
priv->radioon = RADIO_ON; priv->radioon = RADIO_ON;
priv->auto_rate = 1; priv->auto_rate = 1;
priv->capability = WLAN_CAPABILITY_SHORT_PREAMBLE; priv->capability = WLAN_CAPABILITY_SHORT_PREAMBLE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment