diff options
author | Joe Perches <joe@perches.com> | 2012-05-08 14:56:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-09 20:49:18 -0400 |
commit | 3bc7945e2642bcea92b0fd6a718565f45061439f (patch) | |
tree | 4437668566814f6a9f10a6ddcf22e575e208a039 /net/mac80211 | |
parent | b203ca39126bad99583c908be587df067820a1ea (diff) |
mac80211: Convert compare_ether_addr to ether_addr_equal by hand
spatch/coccinelle isn't perfect. It doesn't understand
__aligned(x) and doesn't convert functions it can't parse.
Convert the remaining compare_ether_addr uses.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/rx.c | 4 | ||||
-rw-r--r-- | net/mac80211/sta_info.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 26bfd6fcaa48..d722c40c7eca 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -1714,8 +1714,8 @@ static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx, __le16 fc) | |||
1714 | * of whether the frame was encrypted or not. | 1714 | * of whether the frame was encrypted or not. |
1715 | */ | 1715 | */ |
1716 | if (ehdr->h_proto == rx->sdata->control_port_protocol && | 1716 | if (ehdr->h_proto == rx->sdata->control_port_protocol && |
1717 | (compare_ether_addr(ehdr->h_dest, rx->sdata->vif.addr) == 0 || | 1717 | (ether_addr_equal(ehdr->h_dest, rx->sdata->vif.addr) || |
1718 | compare_ether_addr(ehdr->h_dest, pae_group_addr) == 0)) | 1718 | ether_addr_equal(ehdr->h_dest, pae_group_addr))) |
1719 | return true; | 1719 | return true; |
1720 | 1720 | ||
1721 | if (ieee80211_802_1x_port_control(rx) || | 1721 | if (ieee80211_802_1x_port_control(rx) || |
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index f75f5d9ac06d..e920b229fb8c 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -501,7 +501,7 @@ void for_each_sta_info_type_check(struct ieee80211_local *local, | |||
501 | nxt = _sta ? rcu_dereference(_sta->hnext) : NULL \ | 501 | nxt = _sta ? rcu_dereference(_sta->hnext) : NULL \ |
502 | ) \ | 502 | ) \ |
503 | /* compare address and run code only if it matches */ \ | 503 | /* compare address and run code only if it matches */ \ |
504 | if (compare_ether_addr(_sta->sta.addr, (_addr)) == 0) | 504 | if (ether_addr_equal(_sta->sta.addr, (_addr))) |
505 | 505 | ||
506 | /* | 506 | /* |
507 | * Get STA info by index, BROKEN! | 507 | * Get STA info by index, BROKEN! |