diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-01-14 10:39:07 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-18 15:20:34 -0500 |
commit | 0f19b41e223d787251c59137e61fc5145c13d1c4 (patch) | |
tree | 32715057d43ecb8a35b36f97320225f12094de70 /include/net/mac80211.h | |
parent | de5fad815703b5b24bc4726cd71422929537d259 (diff) |
mac80211: remove ARP filter enable/disable logic
Depending on the driver, having ARP filtering for
some addresses may be possible. Remove the logic
that tracks whether ARP filter is enabled or not
and give the driver the total number of addresses
instead of the length of the list so it can make
its own decision.
Reviewed-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index e0825a9dbfea..679ad4bb222b 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -297,11 +297,9 @@ enum ieee80211_rssi_event { | |||
297 | * may filter ARP queries targeted for other addresses than listed here. | 297 | * may filter ARP queries targeted for other addresses than listed here. |
298 | * The driver must allow ARP queries targeted for all address listed here | 298 | * The driver must allow ARP queries targeted for all address listed here |
299 | * to pass through. An empty list implies no ARP queries need to pass. | 299 | * to pass through. An empty list implies no ARP queries need to pass. |
300 | * @arp_addr_cnt: Number of addresses currently on the list. | 300 | * @arp_addr_cnt: Number of addresses currently on the list. Note that this |
301 | * @arp_filter_enabled: Enable ARP filtering - if enabled, the hardware may | 301 | * may be larger than %IEEE80211_BSS_ARP_ADDR_LIST_LEN (the arp_addr_list |
302 | * filter ARP queries based on the @arp_addr_list, if disabled, the | 302 | * array size), it's up to the driver what to do in that case. |
303 | * hardware must not perform any ARP filtering. Note, that the filter will | ||
304 | * be enabled also in promiscuous mode. | ||
305 | * @qos: This is a QoS-enabled BSS. | 303 | * @qos: This is a QoS-enabled BSS. |
306 | * @idle: This interface is idle. There's also a global idle flag in the | 304 | * @idle: This interface is idle. There's also a global idle flag in the |
307 | * hardware config which may be more appropriate depending on what | 305 | * hardware config which may be more appropriate depending on what |
@@ -338,8 +336,7 @@ struct ieee80211_bss_conf { | |||
338 | u32 cqm_rssi_hyst; | 336 | u32 cqm_rssi_hyst; |
339 | struct cfg80211_chan_def chandef; | 337 | struct cfg80211_chan_def chandef; |
340 | __be32 arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN]; | 338 | __be32 arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN]; |
341 | u8 arp_addr_cnt; | 339 | int arp_addr_cnt; |
342 | bool arp_filter_enabled; | ||
343 | bool qos; | 340 | bool qos; |
344 | bool idle; | 341 | bool idle; |
345 | bool ps; | 342 | bool ps; |