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

1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b62e61d4ca3e..8613a52ddf17 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -54,8 +54,8 @@
 #include <linux/io.h>
 #include <linux/types.h>
 #include <linux/inet_lro.h>
+#include <linux/slab.h>
 #include <asm/system.h>
-#include <linux/list.h>
 
 static char mv643xx_eth_driver_name[] = "mv643xx_eth";
 static char mv643xx_eth_driver_version[] = "1.4";
@@ -656,6 +656,7 @@ static int rxq_refill(struct rx_queue *rxq, int budget)
                 struct sk_buff *skb;
                 int rx;
                 struct rx_desc *rx_desc;
+                int size;
 
                 skb = __skb_dequeue(&mp->rx_recycle);
                 if (skb == NULL)
@@ -678,10 +679,11 @@ static int rxq_refill(struct rx_queue *rxq, int budget)
 
                 rx_desc = rxq->rx_desc_area + rx;
 
+                size = skb->end - skb->data;
                 rx_desc->buf_ptr = dma_map_single(mp->dev->dev.parent,
-                                                  skb->data, mp->skb_size,
+                                                  skb->data, size,
                                                   DMA_FROM_DEVICE);
-                rx_desc->buf_size = mp->skb_size;
+                rx_desc->buf_size = size;
                 rxq->rx_skb[rx] = skb;
                 wmb();
                 rx_desc->cmd_sts = BUFFER_OWNED_BY_DMA | RX_ENABLE_INTERRUPT;
@@ -849,7 +851,7 @@ no_csum:
         return 0;
 }
 
-static int mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct mv643xx_eth_private *mp = netdev_priv(dev);
         int queue;
@@ -1695,7 +1697,7 @@ static u32 uc_addr_filter_mask(struct net_device *dev)
                 return 0;
 
         nibbles = 1 << (dev->dev_addr[5] & 0x0f);
-        list_for_each_entry(ha, &dev->uc.list, list) {
+        netdev_for_each_uc_addr(ha, dev) {
                 if (memcmp(dev->dev_addr, ha->addr, 5))
                         return 0;
                 if ((dev->dev_addr[5] ^ ha->addr[5]) & 0xf0)
@@ -1793,7 +1795,7 @@ oom:
         memset(mc_spec, 0, 0x100);
         memset(mc_other, 0, 0x100);
 
-        for (addr = dev->mc_list; addr != NULL; addr = addr->next) {
+        netdev_for_each_mc_addr(addr, dev) {
                 u8 *a = addr->da_addr;
                 u32 *table;
                 int entry;
@@ -1827,6 +1829,9 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
 {
         struct sockaddr *sa = addr;
 
+        if (!is_valid_ether_addr(sa->sa_data))
+                return -EINVAL;
+
         memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN);
 
         netif_addr_lock_bh(dev);
@@ -2842,6 +2847,7 @@ static const struct net_device_ops mv643xx_eth_netdev_ops = {
         .ndo_start_xmit         = mv643xx_eth_xmit,
         .ndo_set_rx_mode        = mv643xx_eth_set_rx_mode,
         .ndo_set_mac_address    = mv643xx_eth_set_mac_address,
+        .ndo_validate_addr      = eth_validate_addr,
         .ndo_do_ioctl           = mv643xx_eth_ioctl,
         .ndo_change_mtu         = mv643xx_eth_change_mtu,
         .ndo_tx_timeout         = mv643xx_eth_tx_timeout,