Browse Source

mac80211: OCB: remove pointless check for broadcast BSSID

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 <johannes.berg@intel.com>
Johannes Berg 10 years ago
parent
commit
6fe3eac793
1 changed files with 1 additions and 5 deletions
  1. 1 5
      net/mac80211/rx.c

+ 1 - 5
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) {
 	} 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)) {
 	} else if (!is_multicast_ether_addr(hdr->addr1)) {
 		/*
 		/*
 		 * Mesh beacons will update last_rx when if they are found to
 		 * Mesh beacons will update last_rx when if they are found to