Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9a7b6ef9b9938a1f5cb91ccc0b713b9443edc79f

Authored by Joe Perches
Committed by David S. Miller
1 parent 171fe5ef14
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

bridge: 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>

Showing 5 changed files with 15 additions and 16 deletions Side-by-side Diff

net/bridge/br_device.c
Diff comments   View file @ 9a7b6ef
... ... @@ -170,7 +170,7 @@
170 170 return -EADDRNOTAVAIL;
171 171  
172 172 spin_lock_bh(&br->lock);
173   - if (compare_ether_addr(dev->dev_addr, addr->sa_data)) {
  173 + if (!ether_addr_equal(dev->dev_addr, addr->sa_data)) {
174 174 dev->addr_assign_type &= ~NET_ADDR_RANDOM;
175 175 memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
176 176 br_fdb_change_mac_address(br, addr->sa_data);
... ... @@ -107,8 +107,8 @@
107 107 struct net_bridge_port *op;
108 108 list_for_each_entry(op, &br->port_list, list) {
109 109 if (op != p &&
110   - !compare_ether_addr(op->dev->dev_addr,
111   - f->addr.addr)) {
  110 + ether_addr_equal(op->dev->dev_addr,
  111 + f->addr.addr)) {
112 112 f->dst = op;
113 113 goto insert;
114 114 }
... ... @@ -214,8 +214,8 @@
214 214 struct net_bridge_port *op;
215 215 list_for_each_entry(op, &br->port_list, list) {
216 216 if (op != p &&
217   - !compare_ether_addr(op->dev->dev_addr,
218   - f->addr.addr)) {
  217 + ether_addr_equal(op->dev->dev_addr,
  218 + f->addr.addr)) {
219 219 f->dst = op;
220 220 goto skip_delete;
221 221 }
... ... @@ -237,7 +237,7 @@
237 237 struct net_bridge_fdb_entry *fdb;
238 238  
239 239 hlist_for_each_entry_rcu(fdb, h, &br->hash[br_mac_hash(addr)], hlist) {
240   - if (!compare_ether_addr(fdb->addr.addr, addr)) {
  240 + if (ether_addr_equal(fdb->addr.addr, addr)) {
241 241 if (unlikely(has_expired(br, fdb)))
242 242 break;
243 243 return fdb;
... ... @@ -331,7 +331,7 @@
331 331 struct net_bridge_fdb_entry *fdb;
332 332  
333 333 hlist_for_each_entry(fdb, h, head, hlist) {
334   - if (!compare_ether_addr(fdb->addr.addr, addr))
  334 + if (ether_addr_equal(fdb->addr.addr, addr))
335 335 return fdb;
336 336 }
337 337 return NULL;
... ... @@ -344,7 +344,7 @@
344 344 struct net_bridge_fdb_entry *fdb;
345 345  
346 346 hlist_for_each_entry_rcu(fdb, h, head, hlist) {
347   - if (!compare_ether_addr(fdb->addr.addr, addr))
  347 + if (ether_addr_equal(fdb->addr.addr, addr))
348 348 return fdb;
349 349 }
350 350 return NULL;
net/bridge/br_input.c
Diff comments   View file @ 9a7b6ef
... ... @@ -216,7 +216,7 @@
216 216 }
217 217 /* fall through */
218 218 case BR_STATE_LEARNING:
219   - if (!compare_ether_addr(p->br->dev->dev_addr, dest))
  219 + if (ether_addr_equal(p->br->dev->dev_addr, dest))
220 220 skb->pkt_type = PACKET_HOST;
221 221  
222 222 NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
net/bridge/br_stp_bpdu.c
Diff comments   View file @ 9a7b6ef
... ... @@ -167,7 +167,7 @@
167 167 if (p->state == BR_STATE_DISABLED)
168 168 goto out;
169 169  
170   - if (compare_ether_addr(dest, br->group_addr) != 0)
  170 + if (!ether_addr_equal(dest, br->group_addr))
171 171 goto out;
172 172  
173 173 buf = skb_pull(skb, 3);
net/bridge/br_stp_if.c
Diff comments   View file @ 9a7b6ef
... ... @@ -178,7 +178,7 @@
178 178 /* called under bridge lock */
179 179 void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *addr)
180 180 {
181   - /* should be aligned on 2 bytes for compare_ether_addr() */
  181 + /* should be aligned on 2 bytes for ether_addr_equal() */
182 182 unsigned short oldaddr_aligned[ETH_ALEN >> 1];
183 183 unsigned char *oldaddr = (unsigned char *)oldaddr_aligned;
184 184 struct net_bridge_port *p;
185 185  
186 186  
... ... @@ -191,12 +191,11 @@
191 191 memcpy(br->dev->dev_addr, addr, ETH_ALEN);
192 192  
193 193 list_for_each_entry(p, &br->port_list, list) {
194   - if (!compare_ether_addr(p->designated_bridge.addr, oldaddr))
  194 + if (ether_addr_equal(p->designated_bridge.addr, oldaddr))
195 195 memcpy(p->designated_bridge.addr, addr, ETH_ALEN);
196 196  
197   - if (!compare_ether_addr(p->designated_root.addr, oldaddr))
  197 + if (ether_addr_equal(p->designated_root.addr, oldaddr))
198 198 memcpy(p->designated_root.addr, addr, ETH_ALEN);
199   -
200 199 }
201 200  
202 201 br_configuration_update(br);
... ... @@ -205,7 +204,7 @@
205 204 br_become_root_bridge(br);
206 205 }
207 206  
208   -/* should be aligned on 2 bytes for compare_ether_addr() */
  207 +/* should be aligned on 2 bytes for ether_addr_equal() */
209 208 static const unsigned short br_mac_zero_aligned[ETH_ALEN >> 1];
210 209  
211 210 /* called under bridge lock */
... ... @@ -227,7 +226,7 @@
227 226  
228 227 }
229 228  
230   - if (compare_ether_addr(br->bridge_id.addr, addr) == 0)
  229 + if (ether_addr_equal(br->bridge_id.addr, addr))
231 230 return false; /* no change */
232 231  
233 232 br_stp_change_bridge_id(br, addr);