aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh_pathtbl.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-05-08 14:56:52 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-09 20:49:18 -0400
commitb203ca39126bad99583c908be587df067820a1ea (patch)
tree940e32bd15392b400cf50c2ac31c7895637c09fe /net/mac80211/mesh_pathtbl.c
parentc47fc9814ca15cc075f1f09e8c069b041f2ea397 (diff)
mac80211: Convert 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: $ 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: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mesh_pathtbl.c')
-rw-r--r--net/mac80211/mesh_pathtbl.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index baa6096c66b4..b39224d8255c 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -348,7 +348,7 @@ static struct mesh_path *mpath_lookup(struct mesh_table *tbl, u8 *dst,
348 hlist_for_each_entry_rcu(node, n, bucket, list) { 348 hlist_for_each_entry_rcu(node, n, bucket, list) {
349 mpath = node->mpath; 349 mpath = node->mpath;
350 if (mpath->sdata == sdata && 350 if (mpath->sdata == sdata &&
351 compare_ether_addr(dst, mpath->dst) == 0) { 351 ether_addr_equal(dst, mpath->dst)) {
352 if (MPATH_EXPIRED(mpath)) { 352 if (MPATH_EXPIRED(mpath)) {
353 spin_lock_bh(&mpath->state_lock); 353 spin_lock_bh(&mpath->state_lock);
354 mpath->flags &= ~MESH_PATH_ACTIVE; 354 mpath->flags &= ~MESH_PATH_ACTIVE;
@@ -517,7 +517,7 @@ int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata)
517 int err = 0; 517 int err = 0;
518 u32 hash_idx; 518 u32 hash_idx;
519 519
520 if (compare_ether_addr(dst, sdata->vif.addr) == 0) 520 if (ether_addr_equal(dst, sdata->vif.addr))
521 /* never add ourselves as neighbours */ 521 /* never add ourselves as neighbours */
522 return -ENOTSUPP; 522 return -ENOTSUPP;
523 523
@@ -561,7 +561,7 @@ int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata)
561 hlist_for_each_entry(node, n, bucket, list) { 561 hlist_for_each_entry(node, n, bucket, list) {
562 mpath = node->mpath; 562 mpath = node->mpath;
563 if (mpath->sdata == sdata && 563 if (mpath->sdata == sdata &&
564 compare_ether_addr(dst, mpath->dst) == 0) 564 ether_addr_equal(dst, mpath->dst))
565 goto err_exists; 565 goto err_exists;
566 } 566 }
567 567
@@ -652,7 +652,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata)
652 int err = 0; 652 int err = 0;
653 u32 hash_idx; 653 u32 hash_idx;
654 654
655 if (compare_ether_addr(dst, sdata->vif.addr) == 0) 655 if (ether_addr_equal(dst, sdata->vif.addr))
656 /* never add ourselves as neighbours */ 656 /* never add ourselves as neighbours */
657 return -ENOTSUPP; 657 return -ENOTSUPP;
658 658
@@ -690,7 +690,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata)
690 hlist_for_each_entry(node, n, bucket, list) { 690 hlist_for_each_entry(node, n, bucket, list) {
691 mpath = node->mpath; 691 mpath = node->mpath;
692 if (mpath->sdata == sdata && 692 if (mpath->sdata == sdata &&
693 compare_ether_addr(dst, mpath->dst) == 0) 693 ether_addr_equal(dst, mpath->dst))
694 goto err_exists; 694 goto err_exists;
695 } 695 }
696 696
@@ -884,7 +884,7 @@ int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata)
884 hlist_for_each_entry(node, n, bucket, list) { 884 hlist_for_each_entry(node, n, bucket, list) {
885 mpath = node->mpath; 885 mpath = node->mpath;
886 if (mpath->sdata == sdata && 886 if (mpath->sdata == sdata &&
887 compare_ether_addr(addr, mpath->dst) == 0) { 887 ether_addr_equal(addr, mpath->dst)) {
888 __mesh_path_del(tbl, node); 888 __mesh_path_del(tbl, node);
889 goto enddel; 889 goto enddel;
890 } 890 }