Skip to content

Commit

Permalink
ath6kl: Avoid finding bss presence in cfg80211 scan list
Browse files Browse the repository at this point in the history
Connect event handler function is always reporting BSS info
to CFG80211 layer first and then followed by connect event is passed.

Before these steps, BSS presence is retrieved from CFG80211 layer,
but it is not used. Hence, removing that part.

Signed-off-by: Raja Mani <rmani@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
  • Loading branch information
Raja Mani authored and Kalle Valo committed Aug 31, 2011
1 parent 31024d9 commit f91db9b
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions drivers/net/wireless/ath/ath6kl/cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,6 @@ void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,
unsigned char *ptr_ie_buf = ie_buf;
unsigned char *ieeemgmtbuf = NULL;
u8 source_mac[ETH_ALEN];
u16 capa_mask;
u16 capa_val;

/* capinfo + listen interval */
u8 assoc_req_ie_offset = sizeof(u16) + sizeof(u16);
Expand Down Expand Up @@ -459,24 +457,6 @@ void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,
}
}

if (nw_type & ADHOC_NETWORK) {
capa_mask = WLAN_CAPABILITY_IBSS;
capa_val = WLAN_CAPABILITY_IBSS;
} else {
capa_mask = WLAN_CAPABILITY_ESS;
capa_val = WLAN_CAPABILITY_ESS;
}

/* Before informing the join/connect event, make sure that
* bss entry is present in scan list, if it not present
* construct and insert into scan list, otherwise that
* event will be dropped on the way by cfg80211, due to
* this keys will not be plumbed in case of WEP and
* application will not be aware of join/connect status. */
bss = cfg80211_get_bss(ar->wdev->wiphy, NULL, bssid,
ar->wdev->ssid, ar->wdev->ssid_len,
capa_mask, capa_val);

/*
* Earlier we were updating the cfg about bss by making a beacon frame
* only if the entry for bss is not there. This can have some issue if
Expand Down Expand Up @@ -527,7 +507,6 @@ void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,
ieeemgmtbuf = kzalloc(size, GFP_ATOMIC);
if (!ieeemgmtbuf) {
ath6kl_err("ieee mgmt buf alloc error\n");
cfg80211_put_bss(bss);
return;
}

Expand Down

0 comments on commit f91db9b

Please sign in to comment.