Skip to content

Commit

Permalink
mac80211: OCB: remove pointless check for broadcast BSSID
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg committed Apr 24, 2015
1 parent a58fbe1 commit 6fe3eac
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions net/mac80211/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6fe3eac

Please sign in to comment.