|
@@ -370,7 +370,7 @@ int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
|
|
|
iftype != NL80211_IFTYPE_P2P_CLIENT &&
|
|
|
iftype != NL80211_IFTYPE_MESH_POINT) ||
|
|
|
(is_multicast_ether_addr(dst) &&
|
|
|
- !compare_ether_addr(src, addr)))
|
|
|
+ ether_addr_equal(src, addr)))
|
|
|
return -1;
|
|
|
if (iftype == NL80211_IFTYPE_MESH_POINT) {
|
|
|
struct ieee80211s_hdr *meshdr =
|
|
@@ -398,9 +398,9 @@ int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
|
|
|
payload = skb->data + hdrlen;
|
|
|
ethertype = (payload[6] << 8) | payload[7];
|
|
|
|
|
|
- if (likely((compare_ether_addr(payload, rfc1042_header) == 0 &&
|
|
|
+ if (likely((ether_addr_equal(payload, rfc1042_header) &&
|
|
|
ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
|
|
|
- compare_ether_addr(payload, bridge_tunnel_header) == 0)) {
|
|
|
+ ether_addr_equal(payload, bridge_tunnel_header))) {
|
|
|
/* remove RFC1042 or Bridge-Tunnel encapsulation and
|
|
|
* replace EtherType */
|
|
|
skb_pull(skb, hdrlen + 6);
|