wifi: mac80211: move ieee80211_bssid_match() function

This is only used in rx.c, so move it into the file.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 0f69859e4e39316de5c8dc3d85442462208195f6..aa5e4c2734b738130c943c412e203adaeab49afa 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1801,12 +1801,6 @@ static inline void init_airtime_info(struct airtime_info *air_info,
        INIT_LIST_HEAD(&air_info->list);
 }
 
-static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
-{
-       return ether_addr_equal(raddr, addr) ||
-              is_broadcast_ether_addr(raddr);
-}
-
 static inline bool
 ieee80211_have_rx_timestamp(struct ieee80211_rx_status *status)
 {

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index e6b16ebbdb480ef57776fcc0c79058ab410d89c0..0b5c34d00c14bc639ca84e87e7d13c389b866656 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -4130,6 +4130,12 @@ EXPORT_SYMBOL(ieee80211_mark_rx_ba_filtered_frames);
 
 /* main receive path */
 
+static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
+{
+       return ether_addr_equal(raddr, addr) ||
+              is_broadcast_ether_addr(raddr);
+}
+
 static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)
 {
        struct ieee80211_sub_if_data *sdata = rx->sdata;