diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-04-22 15:10:45 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-04-24 11:14:14 +0200 |
| commit | 6fe3eac79329611eaa716b7a3e3b85f6698b668b (patch) | |
| tree | 09c0843d88e316c0a17a2453a407a7e2b20ce37d /net/mac80211/rx.c | |
| parent | mac80211: clean up/rename prepare_for_handlers() (diff) | |
| download | linux-6fe3eac79329611eaa716b7a3e3b85f6698b668b.tar.xz linux-6fe3eac79329611eaa716b7a3e3b85f6698b668b.zip | |
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>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5fea34b158fe..11dbbc576491 100644 --- 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 |