Merge branch 'linux-2.6'

1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index dd18af0ce676..76cc1d3adf71 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -428,7 +428,6 @@ static inline void smc911x_drop_pkt(struct net_device *dev)
  */
 static inline void       smc911x_rcv(struct net_device *dev)
 {
-        struct smc911x_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         unsigned int pkt_len, status;
         struct sk_buff *skb;
@@ -473,6 +472,7 @@ static inline void	 smc911x_rcv(struct net_device *dev)
                 skb_put(skb,pkt_len-4);
 #ifdef SMC_USE_DMA
                 {
+                struct smc911x_local *lp = netdev_priv(dev);
                 unsigned int fifo;
                 /* Lower the FIFO threshold if possible */
                 fifo = SMC_GET_FIFO_INT();
@@ -1299,9 +1299,9 @@ smc911x_rx_dma_irq(int dma, void *data)
         PRINT_PKT(skb->data, skb->len);
         dev->last_rx = jiffies;
         skb->protocol = eth_type_trans(skb, dev);
-        netif_rx(skb);
         dev->stats.rx_packets++;
         dev->stats.rx_bytes += skb->len;
+        netif_rx(skb);
 
         spin_lock_irqsave(&lp->lock, flags);
         pkts = (SMC_GET_RX_FIFO_INF() & RX_FIFO_INF_RXSUSED_) >> 16;
@@ -1379,13 +1379,6 @@ static void smc911x_set_multicast_list(struct net_device *dev)
         unsigned int multicast_table[2];
         unsigned int mcr, update_multicast = 0;
         unsigned long flags;
-        /* table for flipping the order of 5 bits */
-        static const unsigned char invert5[] =
-                {0x00, 0x10, 0x08, 0x18, 0x04, 0x14, 0x0C, 0x1C,
-                 0x02, 0x12, 0x0A, 0x1A, 0x06, 0x16, 0x0E, 0x1E,
-                 0x01, 0x11, 0x09, 0x19, 0x05, 0x15, 0x0D, 0x1D,
-                 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x17, 0x0F, 0x1F};
-
 
         DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
 
@@ -1432,7 +1425,7 @@ static void smc911x_set_multicast_list(struct net_device *dev)
 
                 cur_addr = dev->mc_list;
                 for (i = 0; i < dev->mc_count; i++, cur_addr = cur_addr->next) {
-                        int position;
+                        u32 position;
 
                         /* do we have a pointer here? */
                         if (!cur_addr)
@@ -1442,12 +1435,10 @@ static void smc911x_set_multicast_list(struct net_device *dev)
                         if (!(*cur_addr->dmi_addr & 1))
                                  continue;
 
-                        /* only use the low order bits */
-                        position = crc32_le(~0, cur_addr->dmi_addr, 6) & 0x3f;
+                        /* upper 6 bits are used as hash index */
+                        position = ether_crc(ETH_ALEN, cur_addr->dmi_addr)>>26;
 
-                        /* do some messy swapping to put the bit in the right spot */
-                        multicast_table[invert5[position&0x1F]&0x1] |=
-                                (1<<invert5[(position>>1)&0x1F]);
+                        multicast_table[position>>5] |= 1 << (position&0x1f);
                 }
 
                 /* be sure I get rid of flags I might have set */