From ff0313f9a5e4795325c2dfc612a52e310c55d73a Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Sun, 3 Jul 2011 23:55:53 +0000 Subject: [PATCH] --- yaml --- r: 256048 b: refs/heads/master c: 2effca33194749cc3d5c2fdae52dcd8a7d6556e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/depca.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0c92dbcdf80a..c989bf913da4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abfc89c7b5347b869d1c48ddae027caf91a2300d +refs/heads/master: 2effca33194749cc3d5c2fdae52dcd8a7d6556e5 diff --git a/trunk/drivers/net/depca.c b/trunk/drivers/net/depca.c index a7ccaa67c7d4..f2015a851977 100644 --- a/trunk/drivers/net/depca.c +++ b/trunk/drivers/net/depca.c @@ -1073,13 +1073,13 @@ static int depca_rx(struct net_device *dev) i = DEPCA_PKT_STAT_SZ; } } - if (buf[0] & 0x01) { /* Multicast/Broadcast */ - if ((*(s16 *) & buf[0] == -1) && (*(s16 *) & buf[2] == -1) && (*(s16 *) & buf[4] == -1)) { + if (is_multicast_ether_addr(buf)) { + if (is_broadcast_ether_addr(buf)) { lp->pktStats.broadcast++; } else { lp->pktStats.multicast++; } - } else if ((*(s16 *) & buf[0] == *(s16 *) & dev->dev_addr[0]) && (*(s16 *) & buf[2] == *(s16 *) & dev->dev_addr[2]) && (*(s16 *) & buf[4] == *(s16 *) & dev->dev_addr[4])) { + } else if (compare_ether_addr(buf, dev->dev_addr) == 0) { lp->pktStats.unicast++; }