aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 3ba366f51b07..1cd255892a43 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -370,7 +370,7 @@ int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
370 iftype != NL80211_IFTYPE_P2P_CLIENT && 370 iftype != NL80211_IFTYPE_P2P_CLIENT &&
371 iftype != NL80211_IFTYPE_MESH_POINT) || 371 iftype != NL80211_IFTYPE_MESH_POINT) ||
372 (is_multicast_ether_addr(dst) && 372 (is_multicast_ether_addr(dst) &&
373 !compare_ether_addr(src, addr))) 373 ether_addr_equal(src, addr)))
374 return -1; 374 return -1;
375 if (iftype == NL80211_IFTYPE_MESH_POINT) { 375 if (iftype == NL80211_IFTYPE_MESH_POINT) {
376 struct ieee80211s_hdr *meshdr = 376 struct ieee80211s_hdr *meshdr =
@@ -398,9 +398,9 @@ int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
398 payload = skb->data + hdrlen; 398 payload = skb->data + hdrlen;
399 ethertype = (payload[6] << 8) | payload[7]; 399 ethertype = (payload[6] << 8) | payload[7];
400 400
401 if (likely((compare_ether_addr(payload, rfc1042_header) == 0 && 401 if (likely((ether_addr_equal(payload, rfc1042_header) &&
402 ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) || 402 ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
403 compare_ether_addr(payload, bridge_tunnel_header) == 0)) { 403 ether_addr_equal(payload, bridge_tunnel_header))) {
404 /* remove RFC1042 or Bridge-Tunnel encapsulation and 404 /* remove RFC1042 or Bridge-Tunnel encapsulation and
405 * replace EtherType */ 405 * replace EtherType */
406 skb_pull(skb, hdrlen + 6); 406 skb_pull(skb, hdrlen + 6);