lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cfg80211: add feature to hold bss

Browse Source 
In beacon filtering there needs to be a way to not expire the BSS even
when no beacons are received. Add an interface to cfg80211 to hold
BSS and make sure that it's not expired.

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Kalle Valo
2009-03-22 21:57:28 +02:00
committed by John W. Linville
parent 9050bdd858
commit a08c1c1ac0
3 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/net/cfg80211.h
View File

@@ -539,6 +539,7 @@ enum cfg80211_signal_type {
* is no guarantee that these are well-formed!) * is no guarantee that these are well-formed!)
* @len_information_elements: total length of the information elements * @len_information_elements: total length of the information elements
* @signal: signal strength value (type depends on the wiphy's signal_type) * @signal: signal strength value (type depends on the wiphy's signal_type)
* @hold: BSS should not expire
* @free_priv: function pointer to free private data * @free_priv: function pointer to free private data
* @priv: private area for driver use, has at least wiphy->bss_priv_size bytes * @priv: private area for driver use, has at least wiphy->bss_priv_size bytes
*/ */
@@ -940,4 +941,21 @@ void cfg80211_send_rx_deauth(struct net_device *dev, const u8 *buf,
void cfg80211_send_rx_disassoc(struct net_device *dev, const u8 *buf, void cfg80211_send_rx_disassoc(struct net_device *dev, const u8 *buf,
size_t len); size_t len);
/**
* cfg80211_hold_bss - exclude bss from expiration
* @bss: bss which should not expire
*
* In a case when the BSS is not updated but it shouldn't expire this
* function can be used to mark the BSS to be excluded from expiration.
*/
void cfg80211_hold_bss(struct cfg80211_bss *bss);
/**
* cfg80211_unhold_bss - remove expiration exception from the BSS
* @bss: bss which can expire again
*
* This function marks the BSS to be expirable again.
*/
void cfg80211_unhold_bss(struct cfg80211_bss *bss);
#endif /* __NET_CFG80211_H */ #endif /* __NET_CFG80211_H */

2
net/wireless/core.h
View File

@@ -90,6 +90,8 @@ struct cfg80211_internal_bss {
struct rb_node rbn; struct rb_node rbn;
unsigned long ts; unsigned long ts;
struct kref ref; struct kref ref;
bool hold;
/* must be last because of priv member */ /* must be last because of priv member */
struct cfg80211_bss pub; struct cfg80211_bss pub;
}; };

27
net/wireless/scan.c
View File

@@ -80,7 +80,8 @@ void cfg80211_bss_expire(struct cfg80211_registered_device *dev)
bool expired = false; bool expired = false;
list_for_each_entry_safe(bss, tmp, &dev->bss_list, list) { list_for_each_entry_safe(bss, tmp, &dev->bss_list, list) {
if (!time_after(jiffies, bss->ts + IEEE80211_SCAN_RESULT_EXPIRE)) if (bss->hold ||
!time_after(jiffies, bss->ts + IEEE80211_SCAN_RESULT_EXPIRE))
continue; continue;
list_del(&bss->list); list_del(&bss->list);
rb_erase(&bss->rbn, &dev->bss_tree); rb_erase(&bss->rbn, &dev->bss_tree);
@@ -471,6 +472,30 @@ void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *pub)
} }
EXPORT_SYMBOL(cfg80211_unlink_bss); EXPORT_SYMBOL(cfg80211_unlink_bss);
void cfg80211_hold_bss(struct cfg80211_bss *pub)
{
struct cfg80211_internal_bss *bss;
if (!pub)
return;
bss = container_of(pub, struct cfg80211_internal_bss, pub);
bss->hold = true;
}
EXPORT_SYMBOL(cfg80211_hold_bss);
void cfg80211_unhold_bss(struct cfg80211_bss *pub)
{
struct cfg80211_internal_bss *bss;
if (!pub)
return;
bss = container_of(pub, struct cfg80211_internal_bss, pub);
bss->hold = false;
}
EXPORT_SYMBOL(cfg80211_unhold_bss);
#ifdef CONFIG_WIRELESS_EXT #ifdef CONFIG_WIRELESS_EXT
int cfg80211_wext_siwscan(struct net_device *dev, int cfg80211_wext_siwscan(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,