[PATCH net-next] net: ewrk3: Use helpers from linux/etherdevice.h

Subsystems: networking drivers, the rest

STALE5509d

2 messages, 2 authors, 2011-07-05 · open the first message on its own page

[PATCH net-next] net: ewrk3: Use helpers from linux/etherdevice.h

From: Tobias Klauser <tklauser@distanz.ch>
Date: 2011-07-04 09:56:23

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 drivers/net/ewrk3.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c
index b5f6173..d1e229f 100644
--- a/drivers/net/ewrk3.c
+++ b/drivers/net/ewrk3.c
@@ -1008,15 +1008,13 @@ static int ewrk3_rx(struct net_device *dev)
 							}
 						}
 						p = skb->data;	/* Look at the dest addr */
-						if (p[0] & 0x01) {	/* Multicast/Broadcast */
-							if ((*(s16 *) & p[0] == -1) && (*(s16 *) & p[2] == -1) && (*(s16 *) & p[4] == -1)) {
+						if (is_multicast_ether_addr(p)) {
+							if (is_broadcast_ether_addr(p)) {
 								lp->pktStats.broadcast++;
 							} else {
 								lp->pktStats.multicast++;
 							}
-						} else if ((*(s16 *) & p[0] == *(s16 *) & dev->dev_addr[0]) &&
-							   (*(s16 *) & p[2] == *(s16 *) & dev->dev_addr[2]) &&
-							   (*(s16 *) & p[4] == *(s16 *) & dev->dev_addr[4])) {
+						} else if (compare_ether_addr(p, dev->dev_addr) == 0) {
 							lp->pktStats.unicast++;
 						}
 						lp->pktStats.bins[0]++;		/* Duplicates stats.rx_packets */
-- 
1.7.5.4

Re: [PATCH net-next] net: ewrk3: Use helpers from linux/etherdevice.h

From: David Miller <davem@davemloft.net>
Date: 2011-07-05 03:31:38

From: Tobias Klauser <tklauser@distanz.ch>
Date: Mon,  4 Jul 2011 11:56:22 +0200
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help