mac80211: OCB: remove pointless check for broadcast BSSID
authorJohannes Berg <johannes.berg@intel.com>
Wed, 22 Apr 2015 13:10:45 +0000 (15:10 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 24 Apr 2015 09:14:14 +0000 (11:14 +0200)
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>
net/mac80211/rx.c

index 5fea34b158fee27b3fbe6f9fd6cbb89df8ef497b..11dbbc576491417290db3462cbe05f8528795b57 100644 (file)
@@ -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