mac80211: OCB: remove pointless check for broadcast BSSID

jmberg-intel · jmberg-intel · commit 6fe3eac79329 · 2015-04-24T11:14:14.000+02:00
The OCB input path already checked that the BSSID is the broadcast
address, so the later check can never fail.

Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
@@ -1362,11 +1362,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
 			}
 		}
 	} else if (rx->sdata->vif.type == NL80211_IFTYPE_OCB) {
-		u8 *bssid = ieee80211_get_bssid(hdr, rx->skb->len,
-						NL80211_IFTYPE_OCB);
-		/* OCB uses wild-card BSSID */
-		if (is_broadcast_ether_addr(bssid))
-			sta->last_rx = jiffies;
+		sta->last_rx = jiffies;
 	} else if (!is_multicast_ether_addr(hdr->addr1)) {
 		/*
 		 * Mesh beacons will update last_rx when if they are found to

Original file line number	Diff line number	Diff line change
`@@ -1362,11 +1362,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)`
`1362`	`1362`	`}`
`1363`	`1363`	`}`
`1364`	`1364`	`} else if (rx->sdata->vif.type == NL80211_IFTYPE_OCB) {`
`1365`		`- u8 *bssid = ieee80211_get_bssid(hdr, rx->skb->len,`
`1366`		`- NL80211_IFTYPE_OCB);`
`1367`		`- /* OCB uses wild-card BSSID */`
`1368`		`- if (is_broadcast_ether_addr(bssid))`
`1369`		`- sta->last_rx = jiffies;`
	`1365`	`+ sta->last_rx = jiffies;`
`1370`	`1366`	`} else if (!is_multicast_ether_addr(hdr->addr1)) {`
`1371`	`1367`	`/*`
`1372`	`1368`	`* Mesh beacons will update last_rx when if they are found to`