diff --git a/[refs] b/[refs]
index a5964fa1c82d..dd658c553627 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 204b190cabf901b4bdece2006acc15a8978288db
+refs/heads/master: 34e8f08231388f9e16c6f1e2461f53afaf7f1e5e
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index aa8937c56285..7a944ca1c840 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -291,6 +291,10 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 				sdata->u.ibss.ssid_len))
 		goto put_bss;
 
+	/* same BSSID */
+	if (memcmp(bss->cbss.bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0)
+		goto put_bss;
+
 	if (rx_status->flag & RX_FLAG_TSFT) {
 		/*
 		 * For correct IBSS merging we need mactime; since mactime is