aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index aa8937c56285..7a944ca1c840 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -291,6 +291,10 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
291 sdata->u.ibss.ssid_len)) 291 sdata->u.ibss.ssid_len))
292 goto put_bss; 292 goto put_bss;
293 293
294 /* same BSSID */
295 if (memcmp(bss->cbss.bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0)
296 goto put_bss;
297
294 if (rx_status->flag & RX_FLAG_TSFT) { 298 if (rx_status->flag & RX_FLAG_TSFT) {
295 /* 299 /*
296 * For correct IBSS merging we need mactime; since mactime is 300 * For correct IBSS merging we need mactime; since mactime is