Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 17 insertions, 16 deletions

diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index ba29dc319b34..17460aba3bae 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -21,6 +21,7 @@
 #include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/etherdevice.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
@@ -320,16 +321,13 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)
                 if (len < copybreak) {
                         struct sk_buff *nskb;
 
-                        nskb = netdev_alloc_skb(dev, len + NET_IP_ALIGN);
+                        nskb = netdev_alloc_skb_ip_align(dev, len);
                         if (!nskb) {
                                 /* forget packet, just rearm desc */
                                 priv->stats.rx_dropped++;
                                 continue;
                         }
 
-                        /* since we're copying the data, we can align
-                         * them properly */
-                        skb_reserve(nskb, NET_IP_ALIGN);
                         dma_sync_single_for_cpu(kdev, desc->address,
                                                 len, DMA_FROM_DEVICE);
                         memcpy(nskb->data, skb->data, len);
@@ -622,7 +620,7 @@ static void bcm_enet_set_multicast_list(struct net_device *dev)
 
         /* only 3 perfect match registers left, first one is used for
          * own mac address */
-        if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > 3)
+        if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > 3)
                 val |= ENET_RXCFG_ALLMCAST_MASK;
         else
                 val &= ~ENET_RXCFG_ALLMCAST_MASK;
@@ -634,16 +632,13 @@ static void bcm_enet_set_multicast_list(struct net_device *dev)
                 return;
         }
 
-        for (i = 0, mc_list = dev->mc_list;
-             (mc_list != NULL) && (i < dev->mc_count) && (i < 3);
-             i++, mc_list = mc_list->next) {
+        i = 0;
+        netdev_for_each_mc_addr(mc_list, dev) {
                 u8 *dmi_addr;
                 u32 tmp;
 
-                /* filter non ethernet address */
-                if (mc_list->dmi_addrlen != 6)
-                        continue;
-
+                if (i == 3)
+                        break;
                 /* update perfect match registers */
                 dmi_addr = mc_list->dmi_addr;
                 tmp = (dmi_addr[2] << 24) | (dmi_addr[3] << 16) |
@@ -652,7 +647,7 @@ static void bcm_enet_set_multicast_list(struct net_device *dev)
 
                 tmp = (dmi_addr[0] << 8 | dmi_addr[1]);
                 tmp |= ENET_PMH_DATAVALID_MASK;
-                enet_writel(priv, tmp, ENET_PMH_REG(i + 1));
+                enet_writel(priv, tmp, ENET_PMH_REG(i++ + 1));
         }
 
         for (; i < 3; i++) {
@@ -1248,9 +1243,15 @@ static void bcm_enet_get_drvinfo(struct net_device *netdev,
         drvinfo->n_stats = BCM_ENET_STATS_LEN;
 }
 
-static int bcm_enet_get_stats_count(struct net_device *netdev)
+static int bcm_enet_get_sset_count(struct net_device *netdev,
+                                        int string_set)
 {
-        return BCM_ENET_STATS_LEN;
+        switch (string_set) {
+        case ETH_SS_STATS:
+                return BCM_ENET_STATS_LEN;
+        default:
+                return -EINVAL;
+        }
 }
 
 static void bcm_enet_get_strings(struct net_device *netdev,
@@ -1476,7 +1477,7 @@ static int bcm_enet_set_pauseparam(struct net_device *dev,
 
 static struct ethtool_ops bcm_enet_ethtool_ops = {
         .get_strings            = bcm_enet_get_strings,
-        .get_stats_count        = bcm_enet_get_stats_count,
+        .get_sset_count         = bcm_enet_get_sset_count,
         .get_ethtool_stats      = bcm_enet_get_ethtool_stats,
         .get_settings           = bcm_enet_get_settings,
         .set_settings           = bcm_enet_set_settings,