1 files changed, 14 insertions, 12 deletions

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 7253a499d9c8..13f11f402a99 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -136,21 +136,23 @@ static char mv643xx_eth_driver_version[] = "1.4";
 /*
  * SDMA configuration register.
  */
+#define RX_BURST_SIZE_4_64BIT           (2 << 1)
 #define RX_BURST_SIZE_16_64BIT          (4 << 1)
 #define BLM_RX_NO_SWAP                  (1 << 4)
 #define BLM_TX_NO_SWAP                  (1 << 5)
+#define TX_BURST_SIZE_4_64BIT           (2 << 22)
 #define TX_BURST_SIZE_16_64BIT          (4 << 22)
 
 #if defined(__BIG_ENDIAN)
 #define PORT_SDMA_CONFIG_DEFAULT_VALUE          \
-                (RX_BURST_SIZE_16_64BIT |       \
-                TX_BURST_SIZE_16_64BIT)
+                (RX_BURST_SIZE_4_64BIT  |       \
+                 TX_BURST_SIZE_4_64BIT)
 #elif defined(__LITTLE_ENDIAN)
 #define PORT_SDMA_CONFIG_DEFAULT_VALUE          \
-                (RX_BURST_SIZE_16_64BIT |       \
-                BLM_RX_NO_SWAP          |       \
-                BLM_TX_NO_SWAP          |       \
-                TX_BURST_SIZE_16_64BIT)
+                (RX_BURST_SIZE_4_64BIT  |       \
+                 BLM_RX_NO_SWAP         |       \
+                 BLM_TX_NO_SWAP         |       \
+                 TX_BURST_SIZE_4_64BIT)
 #else
 #error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
 #endif
@@ -1173,7 +1175,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mp)
 {
         struct mib_counters *p = &mp->mib_counters;
 
-        spin_lock(&mp->mib_counters_lock);
+        spin_lock_bh(&mp->mib_counters_lock);
         p->good_octets_received += mib_read(mp, 0x00);
         p->good_octets_received += (u64)mib_read(mp, 0x04) << 32;
         p->bad_octets_received += mib_read(mp, 0x08);
@@ -1206,7 +1208,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mp)
         p->bad_crc_event += mib_read(mp, 0x74);
         p->collision += mib_read(mp, 0x78);
         p->late_collision += mib_read(mp, 0x7c);
-        spin_unlock(&mp->mib_counters_lock);
+        spin_unlock_bh(&mp->mib_counters_lock);
 
         mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ);
 }
@@ -1573,7 +1575,7 @@ oom:
                 return;
         }
 
-        mc_spec = kmalloc(0x200, GFP_KERNEL);
+        mc_spec = kmalloc(0x200, GFP_ATOMIC);
         if (mc_spec == NULL)
                 goto oom;
         mc_other = mc_spec + (0x100 >> 2);
@@ -1594,7 +1596,7 @@ oom:
                         entry = addr_crc(a);
                 }
 
-                table[entry >> 2] |= 1 << (entry & 3);
+                table[entry >> 2] |= 1 << (8 * (entry & 3));
         }
 
         for (i = 0; i < 0x100; i += 4) {
@@ -2210,11 +2212,10 @@ static int mv643xx_eth_stop(struct net_device *dev)
         struct mv643xx_eth_private *mp = netdev_priv(dev);
         int i;
 
+        wrlp(mp, INT_MASK_EXT, 0x00000000);
         wrlp(mp, INT_MASK, 0x00000000);
         rdlp(mp, INT_MASK);
 
-        del_timer_sync(&mp->mib_counters_timer);
-
         napi_disable(&mp->napi);
 
         del_timer_sync(&mp->rx_oom);
@@ -2226,6 +2227,7 @@ static int mv643xx_eth_stop(struct net_device *dev)
         port_reset(mp);
         mv643xx_eth_get_stats(dev);
         mib_counters_update(mp);
+        del_timer_sync(&mp->mib_counters_timer);
 
         skb_queue_purge(&mp->rx_recycle);