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

4 files changed, 21 insertions, 25 deletions

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 00569dc1313c..0ebd8208f606 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -84,7 +84,7 @@
 
 #define ATLX_DRIVER_VERSION "2.1.3"
 MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \
-        Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");
+Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(ATLX_DRIVER_VERSION);
 
@@ -232,7 +232,7 @@ static void __devinit atl1_check_options(struct atl1_adapter *adapter)
 /*
  * atl1_pci_tbl - PCI Device ID Table
  */
-static const struct pci_device_id atl1_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(atl1_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1)},
         /* required last entry */
         {0,}
@@ -1344,8 +1344,8 @@ static u32 atl1_check_link(struct atl1_adapter *adapter)
 
         /* link result is our setting */
         if (!reconfig) {
-                if (adapter->link_speed != speed
-                    || adapter->link_duplex != duplex) {
+                if (adapter->link_speed != speed ||
+                    adapter->link_duplex != duplex) {
                         adapter->link_speed = speed;
                         adapter->link_duplex = duplex;
                         atl1_setup_mac_ctrl(adapter);
@@ -1864,21 +1864,14 @@ static u16 atl1_alloc_rx_buffers(struct atl1_adapter *adapter)
 
                 rfd_desc = ATL1_RFD_DESC(rfd_ring, rfd_next_to_use);
 
-                skb = netdev_alloc_skb(adapter->netdev,
-                                       adapter->rx_buffer_len + NET_IP_ALIGN);
+                skb = netdev_alloc_skb_ip_align(adapter->netdev,
+                                                adapter->rx_buffer_len);
                 if (unlikely(!skb)) {
                         /* Better luck next round */
                         adapter->netdev->stats.rx_dropped++;
                         break;
                 }
 
-                /*
-                 * Make buffer alignment 2 beyond a 16 byte boundary
-                 * this will result in a 16 byte aligned IP header after
-                 * the 14 byte MAC header is removed
-                 */
-                skb_reserve(skb, NET_IP_ALIGN);
-
                 buffer_info->alloced = 1;
                 buffer_info->skb = skb;
                 buffer_info->length = (u16) adapter->rx_buffer_len;
@@ -2094,8 +2087,8 @@ static void atl1_intr_tx(struct atl1_adapter *adapter)
         }
         atomic_set(&tpd_ring->next_to_clean, sw_tpd_next_to_clean);
 
-        if (netif_queue_stopped(adapter->netdev)
-            && netif_carrier_ok(adapter->netdev))
+        if (netif_queue_stopped(adapter->netdev) &&
+            netif_carrier_ok(adapter->netdev))
                 netif_wake_queue(adapter->netdev);
 }
 
@@ -2596,7 +2589,7 @@ static s32 atl1_up(struct atl1_adapter *adapter)
                 irq_flags |= IRQF_SHARED;
         }
 
-        err = request_irq(adapter->pdev->irq, &atl1_intr, irq_flags,
+        err = request_irq(adapter->pdev->irq, atl1_intr, irq_flags,
                         netdev->name, netdev);
         if (unlikely(err))
                 goto err_up;
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index ab688862093f..54662f24f9bb 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -39,6 +39,7 @@
 #include <linux/pci_ids.h>
 #include <linux/pm.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/tcp.h>
@@ -63,7 +64,7 @@ MODULE_VERSION(ATL2_DRV_VERSION);
 /*
  * atl2_pci_tbl - PCI Device ID Table
  */
-static struct pci_device_id atl2_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(atl2_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2)},
         /* required last entry */
         {0,}
@@ -157,7 +158,7 @@ static void atl2_set_multi(struct net_device *netdev)
         ATL2_WRITE_REG_ARRAY(hw, REG_RX_HASH_TABLE, 1, 0);
 
         /* comoute mc addresses' hash value ,and put it into hash table */
-        for (mc_ptr = netdev->mc_list; mc_ptr; mc_ptr = mc_ptr->next) {
+        netdev_for_each_mc_addr(mc_ptr, netdev) {
                 hash_value = atl2_hash_mc_addr(hw, mc_ptr->dmi_addr);
                 atl2_hash_set(hw, hash_value);
         }
@@ -409,7 +410,7 @@ static void atl2_intr_rx(struct atl2_adapter *adapter)
                 if (rxd->status.ok && rxd->status.pkt_size >= 60) {
                         int rx_size = (int)(rxd->status.pkt_size - 4);
                         /* alloc new buffer */
-                        skb = netdev_alloc_skb(netdev, rx_size + NET_IP_ALIGN);
+                        skb = netdev_alloc_skb_ip_align(netdev, rx_size);
                         if (NULL == skb) {
                                 printk(KERN_WARNING
                                         "%s: Mem squeeze, deferring packet.\n",
@@ -421,7 +422,6 @@ static void atl2_intr_rx(struct atl2_adapter *adapter)
                                 netdev->stats.rx_dropped++;
                                 break;
                         }
-                        skb_reserve(skb, NET_IP_ALIGN);
                         skb->dev = netdev;
                         memcpy(skb->data, rxd->packet, rx_size);
                         skb_put(skb, rx_size);
@@ -652,7 +652,7 @@ static int atl2_request_irq(struct atl2_adapter *adapter)
         if (adapter->have_msi)
                 flags &= ~IRQF_SHARED;
 
-        return request_irq(adapter->pdev->irq, &atl2_intr, flags, netdev->name,
+        return request_irq(adapter->pdev->irq, atl2_intr, flags, netdev->name,
                 netdev);
 }
 
@@ -1960,12 +1960,15 @@ static int atl2_get_eeprom(struct net_device *netdev,
                 return -ENOMEM;
 
         for (i = first_dword; i < last_dword; i++) {
-                if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword])))
-                        return -EIO;
+                if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword]))) {
+                        ret_val = -EIO;
+                        goto free;
+                }
         }
 
         memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 3),
                 eeprom->len);
+free:
         kfree(eeprom_buff);
 
         return ret_val;
diff --git a/drivers/net/atlx/atl2.h b/drivers/net/atlx/atl2.h
index d918bbe621ea..927e4de6474d 100644
--- a/drivers/net/atlx/atl2.h
+++ b/drivers/net/atlx/atl2.h
@@ -442,7 +442,7 @@ struct atl2_hw {
 struct atl2_ring_header {
     /* pointer to the descriptor ring memory */
     void *desc;
-    /* physical adress of the descriptor ring */
+    /* physical address of the descriptor ring */
     dma_addr_t dma;
     /* length of descriptor ring in bytes */
     unsigned int size;
diff --git a/drivers/net/atlx/atlx.c b/drivers/net/atlx/atlx.c
index 3dc014215679..72f3306352e2 100644
--- a/drivers/net/atlx/atlx.c
+++ b/drivers/net/atlx/atlx.c
@@ -144,7 +144,7 @@ static void atlx_set_multi(struct net_device *netdev)
         iowrite32(0, (hw->hw_addr + REG_RX_HASH_TABLE) + (1 << 2));
 
         /* compute mc addresses' hash value ,and put it into hash table */
-        for (mc_ptr = netdev->mc_list; mc_ptr; mc_ptr = mc_ptr->next) {
+        netdev_for_each_mc_addr(mc_ptr, netdev) {
                 hash_value = atlx_hash_mc_addr(hw, mc_ptr->dmi_addr);
                 atlx_hash_set(hw, hash_value);
         }