| Message ID | 1309349760-1776-1-git-send-email-tklauser@distanz.ch |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Tobias Klauser <tklauser@distanz.ch> Date: Wed, 29 Jun 2011 14:16:00 +0200 > There is no need to check for the address being a multicast address in > the netdev_for_each_mc_addr loop, so remove it. > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Please build test your patches! > @@ -1954,7 +1954,6 @@ SetMulticastFilter(struct net_device *dev) > u16 hashcode; > u32 omr, crc; > char *pa; > - unsigned char *addrs; > > omr = inl(DE4X5_OMR); > omr &= ~(OMR_PR | OMR_PM); You removed this local variable 'addrs' but you did not remove all uses of that variable, so the build will fail. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Tobias Klauser <tklauser@distanz.ch> Date: Fri, 1 Jul 2011 09:25:33 +0200 > On 2011-07-01 at 08:57:30 +0200, David Miller <davem@davemloft.net> wrote: >> From: Tobias Klauser <tklauser@distanz.ch> >> Date: Wed, 29 Jun 2011 14:16:00 +0200 >> >> > There is no need to check for the address being a multicast address in >> > the netdev_for_each_mc_addr loop, so remove it. >> > >> > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> >> >> Please build test your patches! > > Sorry for the mess. Here's an updated patch, not removing the addrs > local variable. > > There is no need to check for the address being a multicast address in > the netdev_for_each_mc_addr loop, so remove it. > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Do not mix patch submissions into existing discussions. Please, instead, make a new fresh patch submission. Otherwise I have to do a lot of work editing your commit log messages and the headers. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index efaa1d6..0c3151a 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c @@ -1954,7 +1954,6 @@ SetMulticastFilter(struct net_device *dev) u16 hashcode; u32 omr, crc; char *pa; - unsigned char *addrs; omr = inl(DE4X5_OMR); omr &= ~(OMR_PR | OMR_PM); @@ -1964,9 +1963,7 @@ SetMulticastFilter(struct net_device *dev) omr |= OMR_PM; /* Pass all multicasts */ } else if (lp->setup_f == HASH_PERF) { /* Hash Filtering */ netdev_for_each_mc_addr(ha, dev) { - addrs = ha->addr; - if ((*addrs & 0x01) == 1) { /* multicast address? */ - crc = ether_crc_le(ETH_ALEN, addrs); + crc = ether_crc_le(ETH_ALEN, ha->addr); hashcode = crc & HASH_BITS; /* hashcode is 9 LSb of CRC */ byte = hashcode >> 3; /* bit[3-8] -> byte in filter */ @@ -1977,7 +1974,6 @@ SetMulticastFilter(struct net_device *dev) byte -= 1; } lp->setup_frame[byte] |= bit; - } } } else { /* Perfect filtering */ netdev_for_each_mc_addr(ha, dev) {
There is no need to check for the address being a multicast address in the netdev_for_each_mc_addr loop, so remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> --- drivers/net/tulip/de4x5.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)