Commit 7367d0b5 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

drivers/net: Convert uses of compare_ether_addr to ether_addr_equal

Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.

Done via cocci script: (and a little typing)

$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
-	!compare_ether_addr(a, b)
+	ether_addr_equal(a, b)

@@
expression a,b;
@@
-	compare_ether_addr(a, b)
+	!ether_addr_equal(a, b)

@@
expression a,b;
@@
-	!ether_addr_equal(a, b) == 0
+	ether_addr_equal(a, b)

@@
expression a,b;
@@
-	!ether_addr_equal(a, b) != 0
+	!ether_addr_equal(a, b)

@@
expression a,b;
@@
-	ether_addr_equal(a, b) == 0
+	!ether_addr_equal(a, b)

@@
expression a,b;
@@
-	ether_addr_equal(a, b) != 0
+	ether_addr_equal(a, b)

@@
expression a,b;
@@
-	!!ether_addr_equal(a, b)
+	ether_addr_equal(a, b)
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9b37458
...@@ -488,8 +488,8 @@ static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, ...@@ -488,8 +488,8 @@ static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector,
* source pruning. * source pruning.
*/ */
if ((skb->pkt_type & (PACKET_BROADCAST | PACKET_MULTICAST)) && if ((skb->pkt_type & (PACKET_BROADCAST | PACKET_MULTICAST)) &&
!(compare_ether_addr(adapter->netdev->dev_addr, ether_addr_equal(adapter->netdev->dev_addr,
eth_hdr(skb)->h_source))) { eth_hdr(skb)->h_source)) {
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
goto next_desc; goto next_desc;
} }
......
...@@ -1652,14 +1652,14 @@ int qlcnic_sriov_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) ...@@ -1652,14 +1652,14 @@ int qlcnic_sriov_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
if (!is_valid_ether_addr(mac) || vf >= num_vfs) if (!is_valid_ether_addr(mac) || vf >= num_vfs)
return -EINVAL; return -EINVAL;
if (!compare_ether_addr(adapter->mac_addr, mac)) { if (ether_addr_equal(adapter->mac_addr, mac)) {
netdev_err(netdev, "MAC address is already in use by the PF\n"); netdev_err(netdev, "MAC address is already in use by the PF\n");
return -EINVAL; return -EINVAL;
} }
for (i = 0; i < num_vfs; i++) { for (i = 0; i < num_vfs; i++) {
vf_info = &sriov->vf_info[i]; vf_info = &sriov->vf_info[i];
if (!compare_ether_addr(vf_info->vp->mac, mac)) { if (ether_addr_equal(vf_info->vp->mac, mac)) {
netdev_err(netdev, netdev_err(netdev,
"MAC address is already in use by VF %d\n", "MAC address is already in use by VF %d\n",
i); i);
......
...@@ -544,7 +544,7 @@ static inline bool filter_packet(struct net_device *dev, void *buf) ...@@ -544,7 +544,7 @@ static inline bool filter_packet(struct net_device *dev, void *buf)
/* Filter out packets that aren't for us. */ /* Filter out packets that aren't for us. */
if (!(dev->flags & IFF_PROMISC) && if (!(dev->flags & IFF_PROMISC) &&
!is_multicast_ether_addr(buf) && !is_multicast_ether_addr(buf) &&
compare_ether_addr(dev->dev_addr, buf) != 0) !ether_addr_equal(dev->dev_addr, buf))
return true; return true;
return false; return false;
......
...@@ -323,7 +323,7 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) ...@@ -323,7 +323,7 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
/* Never use the same address on both ends of the link, even /* Never use the same address on both ends of the link, even
* if the buggy firmware told us to. * if the buggy firmware told us to.
*/ */
if (!compare_ether_addr(dev->net->dev_addr, default_modem_addr)) if (ether_addr_equal(dev->net->dev_addr, default_modem_addr))
eth_hw_addr_random(dev->net); eth_hw_addr_random(dev->net);
/* make MAC addr easily distinguishable from an IP header */ /* make MAC addr easily distinguishable from an IP header */
......
...@@ -478,7 +478,7 @@ static struct vxlan_fdb *__vxlan_find_mac(struct vxlan_dev *vxlan, ...@@ -478,7 +478,7 @@ static struct vxlan_fdb *__vxlan_find_mac(struct vxlan_dev *vxlan,
struct vxlan_fdb *f; struct vxlan_fdb *f;
hlist_for_each_entry_rcu(f, head, hlist) { hlist_for_each_entry_rcu(f, head, hlist) {
if (compare_ether_addr(mac, f->eth_addr) == 0) if (ether_addr_equal(mac, f->eth_addr))
return f; return f;
} }
...@@ -1049,8 +1049,7 @@ static void vxlan_rcv(struct vxlan_sock *vs, ...@@ -1049,8 +1049,7 @@ static void vxlan_rcv(struct vxlan_sock *vs,
skb->protocol = eth_type_trans(skb, vxlan->dev); skb->protocol = eth_type_trans(skb, vxlan->dev);
/* Ignore packet loops (and multicast echo) */ /* Ignore packet loops (and multicast echo) */
if (compare_ether_addr(eth_hdr(skb)->h_source, if (ether_addr_equal(eth_hdr(skb)->h_source, vxlan->dev->dev_addr))
vxlan->dev->dev_addr) == 0)
goto drop; goto drop;
/* Re-examine inner Ethernet packet */ /* Re-examine inner Ethernet packet */
...@@ -1320,7 +1319,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) ...@@ -1320,7 +1319,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
if (n) { if (n) {
bool diff; bool diff;
diff = compare_ether_addr(eth_hdr(skb)->h_dest, n->ha) != 0; diff = !ether_addr_equal(eth_hdr(skb)->h_dest, n->ha);
if (diff) { if (diff) {
memcpy(eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest, memcpy(eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest,
dev->addr_len); dev->addr_len);
......
...@@ -602,8 +602,8 @@ static void carl9170_ba_check(struct ar9170 *ar, void *data, unsigned int len) ...@@ -602,8 +602,8 @@ static void carl9170_ba_check(struct ar9170 *ar, void *data, unsigned int len)
if (bar->start_seq_num == entry_bar->start_seq_num && if (bar->start_seq_num == entry_bar->start_seq_num &&
TID_CHECK(bar->control, entry_bar->control) && TID_CHECK(bar->control, entry_bar->control) &&
compare_ether_addr(bar->ra, entry_bar->ta) == 0 && ether_addr_equal(bar->ra, entry_bar->ta) &&
compare_ether_addr(bar->ta, entry_bar->ra) == 0) { ether_addr_equal(bar->ta, entry_bar->ra)) {
struct ieee80211_tx_info *tx_info; struct ieee80211_tx_info *tx_info;
tx_info = IEEE80211_SKB_CB(entry_skb); tx_info = IEEE80211_SKB_CB(entry_skb);
......
...@@ -566,10 +566,10 @@ static void rt2x00lib_rxdone_check_ba(struct rt2x00_dev *rt2x00dev, ...@@ -566,10 +566,10 @@ static void rt2x00lib_rxdone_check_ba(struct rt2x00_dev *rt2x00dev,
#undef TID_CHECK #undef TID_CHECK
if (compare_ether_addr(ba->ra, entry->ta)) if (!ether_addr_equal(ba->ra, entry->ta))
continue; continue;
if (compare_ether_addr(ba->ta, entry->ra)) if (!ether_addr_equal(ba->ta, entry->ra))
continue; continue;
/* Mark BAR since we received the according BA */ /* Mark BAR since we received the according BA */
......
...@@ -1304,7 +1304,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb) ...@@ -1304,7 +1304,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb)
return; return;
/* and only beacons from the associated BSSID, please */ /* and only beacons from the associated BSSID, please */
if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid)) if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
return; return;
rtlpriv->link_info.bcn_rx_inperiod++; rtlpriv->link_info.bcn_rx_inperiod++;
......
...@@ -923,7 +923,7 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len) ...@@ -923,7 +923,7 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len)
return; return;
/* and only beacons from the associated BSSID, please */ /* and only beacons from the associated BSSID, please */
if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid)) if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
return; return;
/* check if this really is a beacon */ /* check if this really is a beacon */
......
...@@ -305,13 +305,14 @@ static void _rtl88ee_translate_rx_signal_stuff(struct ieee80211_hw *hw, ...@@ -305,13 +305,14 @@ static void _rtl88ee_translate_rx_signal_stuff(struct ieee80211_hw *hw,
psaddr = ieee80211_get_SA(hdr); psaddr = ieee80211_get_SA(hdr);
memcpy(pstatus->psaddr, psaddr, ETH_ALEN); memcpy(pstatus->psaddr, psaddr, ETH_ALEN);
addr = (!compare_ether_addr(mac->bssid, (ufc & IEEE80211_FCTL_TODS) ? addr = ether_addr_equal(mac->bssid,
hdr->addr1 : (ufc & IEEE80211_FCTL_FROMDS) ? (ufc & IEEE80211_FCTL_TODS) ? hdr->addr1 :
hdr->addr2 : hdr->addr3)); (ufc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
hdr->addr3);
match_bssid = ((IEEE80211_FTYPE_CTL != type) && (!pstatus->hwerror) && match_bssid = ((IEEE80211_FTYPE_CTL != type) && (!pstatus->hwerror) &&
(!pstatus->crc) && (!pstatus->icv)) && addr; (!pstatus->crc) && (!pstatus->icv)) && addr;
addr = (!compare_ether_addr(praddr, rtlefuse->dev_addr)); addr = ether_addr_equal(praddr, rtlefuse->dev_addr);
packet_toself = match_bssid && addr; packet_toself = match_bssid && addr;
if (ieee80211_is_beacon(fc)) if (ieee80211_is_beacon(fc))
......
...@@ -255,16 +255,16 @@ static void _rtl8723ae_translate_rx_signal_stuff(struct ieee80211_hw *hw, ...@@ -255,16 +255,16 @@ static void _rtl8723ae_translate_rx_signal_stuff(struct ieee80211_hw *hw,
type = WLAN_FC_GET_TYPE(fc); type = WLAN_FC_GET_TYPE(fc);
praddr = hdr->addr1; praddr = hdr->addr1;
packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) && packet_matchbssid =
(!compare_ether_addr(mac->bssid, ((IEEE80211_FTYPE_CTL != type) &&
(le16_to_cpu(fc) & IEEE80211_FCTL_TODS) ? ether_addr_equal(mac->bssid,
hdr->addr1 : (le16_to_cpu(fc) & (le16_to_cpu(fc) & IEEE80211_FCTL_TODS) ? hdr->addr1 :
IEEE80211_FCTL_FROMDS) ? (le16_to_cpu(fc) & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
hdr->addr2 : hdr->addr3)) && (!pstatus->hwerror) && hdr->addr3) &&
(!pstatus->crc) && (!pstatus->icv)); (!pstatus->hwerror) && (!pstatus->crc) && (!pstatus->icv));
packet_toself = packet_matchbssid && packet_toself = (packet_matchbssid &&
(!compare_ether_addr(praddr, rtlefuse->dev_addr)); ether_addr_equal(praddr, rtlefuse->dev_addr));
if (ieee80211_is_beacon(fc)) if (ieee80211_is_beacon(fc))
packet_beacon = true; packet_beacon = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment