Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 66444
b: refs/heads/master
c: 0aef64d
h: refs/heads/master
v: v3
  • Loading branch information
Dan Williams authored and David S. Miller committed Oct 10, 2007
1 parent 3b1ab90 commit 1da5d25
Show file tree
Hide file tree
Showing 17 changed files with 704 additions and 704 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b44898eb2c917cd397a0d8654f1c249dd3cdc67e
refs/heads/master: 0aef64d75851c9f3545d0793f26486ed862306d8
22 changes: 11 additions & 11 deletions trunk/drivers/net/wireless/libertas/11d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,13 +422,13 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
u8 libertas_get_scan_type_11d(u8 chan,
struct parsed_region_chan_11d * parsed_region_chan)
{
u8 scan_type = cmd_scan_type_passive;
u8 scan_type = CMD_SCAN_TYPE_PASSIVE;

lbs_deb_enter(LBS_DEB_11D);

if (wlan_channel_known_11d(chan, parsed_region_chan)) {
lbs_deb_11d("11D: Found and do Active Scan\n");
scan_type = cmd_scan_type_active;
scan_type = CMD_SCAN_TYPE_ACTIVE;
} else {
lbs_deb_11d("11D: Not Find and do Passive Scan\n");
}
Expand All @@ -454,9 +454,9 @@ static int wlan_enable_11d(wlan_private * priv, u8 flag)

/* send cmd to FW to enable/disable 11D function in FW */
ret = libertas_prepare_and_send_command(priv,
cmd_802_11_snmp_mib,
cmd_act_set,
cmd_option_waitforrsp,
CMD_802_11_SNMP_MIB,
CMD_ACT_SET,
CMD_OPTION_WAITFORRSP,
OID_802_11D_ENABLE,
&priv->adapter->enable11d);
if (ret)
Expand All @@ -479,9 +479,9 @@ static int set_domain_info_11d(wlan_private * priv)
return 0;
}

ret = libertas_prepare_and_send_command(priv, cmd_802_11d_domain_info,
cmd_act_set,
cmd_option_waitforrsp, 0, NULL);
ret = libertas_prepare_and_send_command(priv, CMD_802_11D_DOMAIN_INFO,
CMD_ACT_SET,
CMD_OPTION_WAITFORRSP, 0, NULL);
if (ret)
lbs_deb_11d("11D: Fail to dnld domain Info\n");

Expand Down Expand Up @@ -541,7 +541,7 @@ int libertas_cmd_802_11d_domain_info(wlan_private * priv,

cmd->command = cpu_to_le16(cmdno);
pdomaininfo->action = cpu_to_le16(cmdoption);
if (cmdoption == cmd_act_get) {
if (cmdoption == CMD_ACT_GET) {
cmd->size =
cpu_to_le16(sizeof(pdomaininfo->action) + S_DS_GEN);
lbs_dbg_hex("11D: 802_11D_DOMAIN_INFO:", (u8 *) cmd,
Expand Down Expand Up @@ -633,10 +633,10 @@ int libertas_ret_802_11d_domain_info(wlan_private * priv,
}

switch (action) {
case cmd_act_set: /*Proc Set action */
case CMD_ACT_SET: /*Proc Set action */
break;

case cmd_act_get:
case CMD_ACT_GET:
break;
default:
lbs_deb_11d("Invalid action:%d\n", domaininfo->action);
Expand Down
68 changes: 34 additions & 34 deletions trunk/drivers/net/wireless/libertas/assoc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,14 @@ static int assoc_helper_mode(wlan_private *priv,

if (assoc_req->mode == IW_MODE_INFRA) {
if (adapter->psstate != PS_STATE_FULL_POWER)
libertas_ps_wakeup(priv, cmd_option_waitforrsp);
adapter->psmode = wlan802_11powermodecam;
libertas_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
adapter->psmode = WLAN802_11POWERMODECAM;
}

adapter->mode = assoc_req->mode;
ret = libertas_prepare_and_send_command(priv,
cmd_802_11_snmp_mib,
0, cmd_option_waitforrsp,
CMD_802_11_SNMP_MIB,
0, CMD_OPTION_WAITFORRSP,
OID_802_11_INFRASTRUCTURE_MODE,
/* Shoot me now */ (void *) (size_t) assoc_req->mode);

Expand All @@ -195,9 +195,9 @@ static int assoc_helper_mode(wlan_private *priv,
static int update_channel(wlan_private * priv)
{
/* the channel in f/w could be out of sync, get the current channel */
return libertas_prepare_and_send_command(priv, cmd_802_11_rf_channel,
cmd_opt_802_11_rf_channel_get,
cmd_option_waitforrsp, 0, NULL);
return libertas_prepare_and_send_command(priv, CMD_802_11_RF_CHANNEL,
CMD_OPT_802_11_RF_CHANNEL_GET,
CMD_OPTION_WAITFORRSP, 0, NULL);
}

void libertas_sync_channel(struct work_struct *work)
Expand Down Expand Up @@ -227,9 +227,9 @@ static int assoc_helper_channel(wlan_private *priv,
lbs_deb_assoc("ASSOC: channel: %d -> %d\n",
adapter->curbssparams.channel, assoc_req->channel);

ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_channel,
cmd_opt_802_11_rf_channel_set,
cmd_option_waitforrsp, 0, &assoc_req->channel);
ret = libertas_prepare_and_send_command(priv, CMD_802_11_RF_CHANNEL,
CMD_OPT_802_11_RF_CHANNEL_SET,
CMD_OPTION_WAITFORRSP, 0, &assoc_req->channel);
if (ret < 0) {
lbs_deb_assoc("ASSOC: channel: error setting channel.");
}
Expand Down Expand Up @@ -278,15 +278,15 @@ static int assoc_helper_wep_keys(wlan_private *priv,
|| assoc_req->wep_keys[2].len
|| assoc_req->wep_keys[3].len) {
ret = libertas_prepare_and_send_command(priv,
cmd_802_11_set_wep,
cmd_act_add,
cmd_option_waitforrsp,
CMD_802_11_SET_WEP,
CMD_ACT_ADD,
CMD_OPTION_WAITFORRSP,
0, assoc_req);
} else {
ret = libertas_prepare_and_send_command(priv,
cmd_802_11_set_wep,
cmd_act_remove,
cmd_option_waitforrsp,
CMD_802_11_SET_WEP,
CMD_ACT_REMOVE,
CMD_OPTION_WAITFORRSP,
0, NULL);
}

Expand All @@ -295,9 +295,9 @@ static int assoc_helper_wep_keys(wlan_private *priv,

/* enable/disable the MAC's WEP packet filter */
if (assoc_req->secinfo.wep_enabled)
adapter->currentpacketfilter |= cmd_act_mac_wep_enable;
adapter->currentpacketfilter |= CMD_ACT_MAC_WEP_ENABLE;
else
adapter->currentpacketfilter &= ~cmd_act_mac_wep_enable;
adapter->currentpacketfilter &= ~CMD_ACT_MAC_WEP_ENABLE;
ret = libertas_set_mac_packet_filter(priv);
if (ret)
goto out;
Expand Down Expand Up @@ -342,9 +342,9 @@ static int assoc_helper_secinfo(wlan_private *priv,

/* Get RSN enabled/disabled */
ret = libertas_prepare_and_send_command(priv,
cmd_802_11_enable_rsn,
cmd_act_set,
cmd_option_waitforrsp,
CMD_802_11_ENABLE_RSN,
CMD_ACT_GET,
CMD_OPTION_WAITFORRSP,
0, &rsn);
if (ret) {
lbs_deb_assoc("Failed to get RSN status: %d", ret);
Expand All @@ -359,9 +359,9 @@ static int assoc_helper_secinfo(wlan_private *priv,
/* Set RSN enabled/disabled */
rsn = do_wpa;
ret = libertas_prepare_and_send_command(priv,
cmd_802_11_enable_rsn,
cmd_act_set,
cmd_option_waitforrsp,
CMD_802_11_ENABLE_RSN,
CMD_ACT_SET,
CMD_OPTION_WAITFORRSP,
0, &rsn);

out:
Expand All @@ -378,9 +378,9 @@ static int assoc_helper_wpa_keys(wlan_private *priv,
lbs_deb_enter(LBS_DEB_ASSOC);

ret = libertas_prepare_and_send_command(priv,
cmd_802_11_key_material,
cmd_act_set,
cmd_option_waitforrsp,
CMD_802_11_KEY_MATERIAL,
CMD_ACT_SET,
CMD_OPTION_WAITFORRSP,
0, assoc_req);

lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
Expand Down Expand Up @@ -412,7 +412,7 @@ static int assoc_helper_wpa_ie(wlan_private *priv,
static int should_deauth_infrastructure(wlan_adapter *adapter,
struct assoc_request * assoc_req)
{
if (adapter->connect_status != libertas_connected)
if (adapter->connect_status != LIBERTAS_CONNECTED)
return 0;

if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
Expand Down Expand Up @@ -453,7 +453,7 @@ static int should_deauth_infrastructure(wlan_adapter *adapter,
static int should_stop_adhoc(wlan_adapter *adapter,
struct assoc_request * assoc_req)
{
if (adapter->connect_status != libertas_connected)
if (adapter->connect_status != LIBERTAS_CONNECTED)
return 0;

if (libertas_ssid_cmp(adapter->curbssparams.ssid,
Expand Down Expand Up @@ -623,7 +623,7 @@ void libertas_association_worker(struct work_struct *work)
success = 0;
}

if (adapter->connect_status != libertas_connected) {
if (adapter->connect_status != LIBERTAS_CONNECTED) {
lbs_deb_assoc("ASSOC: assoication attempt unsuccessful, "
"not connected.\n");
success = 0;
Expand All @@ -636,12 +636,12 @@ void libertas_association_worker(struct work_struct *work)
adapter->curbssparams.ssid_len),
MAC_ARG(adapter->curbssparams.bssid));
libertas_prepare_and_send_command(priv,
cmd_802_11_rssi,
0, cmd_option_waitforrsp, 0, NULL);
CMD_802_11_RSSI,
0, CMD_OPTION_WAITFORRSP, 0, NULL);

libertas_prepare_and_send_command(priv,
cmd_802_11_get_log,
0, cmd_option_waitforrsp, 0, NULL);
CMD_802_11_GET_LOG,
0, CMD_OPTION_WAITFORRSP, 0, NULL);
} else {
ret = -1;
}
Expand Down
Loading

0 comments on commit 1da5d25

Please sign in to comment.