Skip to content

Commit

Permalink
ath6kl: Remove bssid from struct wmi
Browse files Browse the repository at this point in the history
This is nothing but bssid of struct ath6kl.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
  • Loading branch information
Vasanthakumar Thiagarajan authored and Kalle Valo committed Aug 9, 2011
1 parent e4c7ffc commit 70df051
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
7 changes: 2 additions & 5 deletions drivers/net/wireless/ath/ath6kl/wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,6 @@ static int ath6kl_wmi_connect_event_rx(struct wmi *wmi, u8 *datap, int len)
ath6kl_dbg(ATH6KL_DBG_WMI, "%s: freq %d bssid %pM\n",
__func__, ev->ch, ev->bssid);

memcpy(wmi->bssid, ev->bssid, ETH_ALEN);

/* Start of assoc rsp IEs */
pie = ev->assoc_info + ev->beacon_ie_len +
ev->assoc_req_len + (sizeof(u16) * 3); /* capinfo, status, aid */
Expand Down Expand Up @@ -546,7 +544,6 @@ static int ath6kl_wmi_disconnect_event_rx(struct wmi *wmi, u8 *datap, int len)
return -EINVAL;

ev = (struct wmi_disconnect_event *) datap;
memset(wmi->bssid, 0, sizeof(wmi->bssid));

wmi->is_wmm_enabled = false;
wmi->pair_crypto_type = NONE_CRYPT;
Expand Down Expand Up @@ -772,7 +769,7 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len)
* instance value of scan result. It also sync up RSSI info
* in GUI between scan result and RSSI signal icon.
*/
if (memcmp(wmi->bssid, bih->bssid, ETH_ALEN) == 0) {
if (memcmp(wmi->parent_dev->bssid, bih->bssid, ETH_ALEN) == 0) {
bih->rssi = a_cpu_to_sle16(bss->ni_rssi);
bih->snr = bss->ni_snr;
}
Expand Down Expand Up @@ -2253,7 +2250,7 @@ int ath6kl_wmi_get_tx_pwr_cmd(struct wmi *wmi)
void ath6kl_wmi_get_current_bssid(struct wmi *wmi, u8 *bssid)
{
if (bssid)
memcpy(bssid, wmi->bssid, ETH_ALEN);
memcpy(bssid, wmi->parent_dev->bssid, ETH_ALEN);
}

int ath6kl_wmi_set_lpreamble_cmd(struct wmi *wmi, u8 status, u8 preamble_policy)
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/ath/ath6kl/wmi.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ struct wmi {
u8 fat_pipe_exist;
struct ath6kl *parent_dev;
struct wmi_stats stat;
u8 bssid[ETH_ALEN];
u8 pwr_mode;
u8 phy_mode;
u8 keep_alive_intvl;
Expand Down

0 comments on commit 70df051

Please sign in to comment.