diff options
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 4cc6f41c6930..5e3380388046 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
@@ -76,8 +76,8 @@ static struct ieee80211_frag_entry *ieee80211_frag_cache_find(struct | |||
76 | 76 | ||
77 | if (entry->skb != NULL && entry->seq == seq && | 77 | if (entry->skb != NULL && entry->seq == seq && |
78 | (entry->last_frag + 1 == frag || frag == -1) && | 78 | (entry->last_frag + 1 == frag || frag == -1) && |
79 | memcmp(entry->src_addr, src, ETH_ALEN) == 0 && | 79 | !compare_ether_addr(entry->src_addr, src) && |
80 | memcmp(entry->dst_addr, dst, ETH_ALEN) == 0) | 80 | !compare_ether_addr(entry->dst_addr, dst)) |
81 | return entry; | 81 | return entry; |
82 | } | 82 | } |
83 | 83 | ||
@@ -243,12 +243,12 @@ static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee, | |||
243 | /* check that the frame is unicast frame to us */ | 243 | /* check that the frame is unicast frame to us */ |
244 | if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == | 244 | if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == |
245 | IEEE80211_FCTL_TODS && | 245 | IEEE80211_FCTL_TODS && |
246 | memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN) == 0 && | 246 | !compare_ether_addr(hdr->addr1, dev->dev_addr) && |
247 | memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) { | 247 | !compare_ether_addr(hdr->addr3, dev->dev_addr)) { |
248 | /* ToDS frame with own addr BSSID and DA */ | 248 | /* ToDS frame with own addr BSSID and DA */ |
249 | } else if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == | 249 | } else if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == |
250 | IEEE80211_FCTL_FROMDS && | 250 | IEEE80211_FCTL_FROMDS && |
251 | memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN) == 0) { | 251 | !compare_ether_addr(hdr->addr1, dev->dev_addr)) { |
252 | /* FromDS frame with own addr as DA */ | 252 | /* FromDS frame with own addr as DA */ |
253 | } else | 253 | } else |
254 | return 0; | 254 | return 0; |
@@ -505,7 +505,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
505 | if (ieee->iw_mode == IW_MODE_MASTER && !wds && | 505 | if (ieee->iw_mode == IW_MODE_MASTER && !wds && |
506 | (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == | 506 | (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == |
507 | IEEE80211_FCTL_FROMDS && ieee->stadev | 507 | IEEE80211_FCTL_FROMDS && ieee->stadev |
508 | && memcmp(hdr->addr2, ieee->assoc_ap_addr, ETH_ALEN) == 0) { | 508 | && !compare_ether_addr(hdr->addr2, ieee->assoc_ap_addr)) { |
509 | /* Frame from BSSID of the AP for which we are a client */ | 509 | /* Frame from BSSID of the AP for which we are a client */ |
510 | skb->dev = dev = ieee->stadev; | 510 | skb->dev = dev = ieee->stadev; |
511 | stats = hostap_get_stats(dev); | 511 | stats = hostap_get_stats(dev); |
@@ -1231,7 +1231,7 @@ static inline int is_same_network(struct ieee80211_network *src, | |||
1231 | * as one network */ | 1231 | * as one network */ |
1232 | return ((src->ssid_len == dst->ssid_len) && | 1232 | return ((src->ssid_len == dst->ssid_len) && |
1233 | (src->channel == dst->channel) && | 1233 | (src->channel == dst->channel) && |
1234 | !memcmp(src->bssid, dst->bssid, ETH_ALEN) && | 1234 | !compare_ether_addr(src->bssid, dst->bssid) && |
1235 | !memcmp(src->ssid, dst->ssid, src->ssid_len)); | 1235 | !memcmp(src->ssid, dst->ssid, src->ssid_len)); |
1236 | } | 1236 | } |
1237 | 1237 | ||