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

1 files changed, 38 insertions, 54 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 83a1922e68e0..a09e6ce3eaa0 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -46,6 +46,8 @@
 
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define DRV_NAME                "8139cp"
 #define DRV_VERSION             "1.3"
 #define DRV_RELDATE             "Mar 22, 2004"
@@ -62,6 +64,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>
+#include <linux/gfp.h>
 #include <linux/mii.h>
 #include <linux/if_vlan.h>
 #include <linux/crc32.h>
@@ -104,8 +107,6 @@ static int multicast_filter_limit = 32;
 module_param(multicast_filter_limit, int, 0);
 MODULE_PARM_DESC (multicast_filter_limit, "8139cp: maximum number of filtered multicast addresses");
 
-#define PFX                     DRV_NAME ": "
-
 #define CP_DEF_MSG_ENABLE       (NETIF_MSG_DRV          | \
                                  NETIF_MSG_PROBE        | \
                                  NETIF_MSG_LINK)
@@ -394,7 +395,7 @@ static int cp_get_eeprom(struct net_device *dev,
 static int cp_set_eeprom(struct net_device *dev,
                          struct ethtool_eeprom *eeprom, u8 *data);
 
-static struct pci_device_id cp_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(cp_pci_tbl) = {
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     PCI_DEVICE_ID_REALTEK_8139), },
         { PCI_DEVICE(PCI_VENDOR_ID_TTTECH,      PCI_DEVICE_ID_TTTECH_MC322), },
         { },
@@ -470,9 +471,8 @@ static inline void cp_rx_skb (struct cp_private *cp, struct sk_buff *skb,
 static void cp_rx_err_acct (struct cp_private *cp, unsigned rx_tail,
                             u32 status, u32 len)
 {
-        if (netif_msg_rx_err (cp))
-                pr_debug("%s: rx err, slot %d status 0x%x len %d\n",
-                        cp->dev->name, rx_tail, status, len);
+        netif_dbg(cp, rx_err, cp->dev, "rx err, slot %d status 0x%x len %d\n",
+                  rx_tail, status, len);
         cp->dev->stats.rx_errors++;
         if (status & RxErrFrame)
                 cp->dev->stats.rx_frame_errors++;
@@ -545,18 +545,15 @@ rx_status_loop:
                         goto rx_next;
                 }
 
-                if (netif_msg_rx_status(cp))
-                        pr_debug("%s: rx slot %d status 0x%x len %d\n",
-                               dev->name, rx_tail, status, len);
+                netif_dbg(cp, rx_status, dev, "rx slot %d status 0x%x len %d\n",
+                          rx_tail, status, len);
 
-                new_skb = netdev_alloc_skb(dev, buflen + NET_IP_ALIGN);
+                new_skb = netdev_alloc_skb_ip_align(dev, buflen);
                 if (!new_skb) {
                         dev->stats.rx_dropped++;
                         goto rx_next;
                 }
 
-                skb_reserve(new_skb, NET_IP_ALIGN);
-
                 dma_unmap_single(&cp->pdev->dev, mapping,
                                  buflen, PCI_DMA_FROMDEVICE);
 
@@ -623,9 +620,8 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance)
         if (!status || (status == 0xFFFF))
                 return IRQ_NONE;
 
-        if (netif_msg_intr(cp))
-                pr_debug("%s: intr, status %04x cmd %02x cpcmd %04x\n",
-                        dev->name, status, cpr8(Cmd), cpr16(CpCmd));
+        netif_dbg(cp, intr, dev, "intr, status %04x cmd %02x cpcmd %04x\n",
+                  status, cpr8(Cmd), cpr16(CpCmd));
 
         cpw16(IntrStatus, status & ~cp_rx_intr_mask);
 
@@ -656,8 +652,8 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance)
 
                 pci_read_config_word(cp->pdev, PCI_STATUS, &pci_status);
                 pci_write_config_word(cp->pdev, PCI_STATUS, pci_status);
-                pr_err("%s: PCI bus error, status=%04x, PCI status=%04x\n",
-                       dev->name, status, pci_status);
+                netdev_err(dev, "PCI bus error, status=%04x, PCI status=%04x\n",
+                           status, pci_status);
 
                 /* TODO: reset hardware */
         }
@@ -702,9 +698,8 @@ static void cp_tx (struct cp_private *cp)
 
                 if (status & LastFrag) {
                         if (status & (TxError | TxFIFOUnder)) {
-                                if (netif_msg_tx_err(cp))
-                                        pr_debug("%s: tx err, status 0x%x\n",
-                                               cp->dev->name, status);
+                                netif_dbg(cp, tx_err, cp->dev,
+                                          "tx err, status 0x%x\n", status);
                                 cp->dev->stats.tx_errors++;
                                 if (status & TxOWC)
                                         cp->dev->stats.tx_window_errors++;
@@ -719,8 +714,8 @@ static void cp_tx (struct cp_private *cp)
                                         ((status >> TxColCntShift) & TxColCntMask);
                                 cp->dev->stats.tx_packets++;
                                 cp->dev->stats.tx_bytes += skb->len;
-                                if (netif_msg_tx_done(cp))
-                                        pr_debug("%s: tx done, slot %d\n", cp->dev->name, tx_tail);
+                                netif_dbg(cp, tx_done, cp->dev,
+                                          "tx done, slot %d\n", tx_tail);
                         }
                         dev_kfree_skb_irq(skb);
                 }
@@ -754,8 +749,7 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,
         if (TX_BUFFS_AVAIL(cp) <= (skb_shinfo(skb)->nr_frags + 1)) {
                 netif_stop_queue(dev);
                 spin_unlock_irqrestore(&cp->lock, intr_flags);
-                pr_err(PFX "%s: BUG! Tx Ring full when queue awake!\n",
-                       dev->name);
+                netdev_err(dev, "BUG! Tx Ring full when queue awake!\n");
                 return NETDEV_TX_BUSY;
         }
 
@@ -880,9 +874,8 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,
                 wmb();
         }
         cp->tx_head = entry;
-        if (netif_msg_tx_queued(cp))
-                pr_debug("%s: tx queued, slot %d, skblen %d\n",
-                       dev->name, entry, skb->len);
+        netif_dbg(cp, tx_queued, cp->dev, "tx queued, slot %d, skblen %d\n",
+                  entry, skb->len);
         if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1))
                 netif_stop_queue(dev);
 
@@ -901,7 +894,7 @@ static void __cp_set_rx_mode (struct net_device *dev)
 {
         struct cp_private *cp = netdev_priv(dev);
         u32 mc_filter[2];       /* Multicast hash filter */
-        int i, rx_mode;
+        int rx_mode;
         u32 tmp;
 
         /* Note: do not reorder, GCC is clever about common statements. */
@@ -911,8 +904,8 @@ static void __cp_set_rx_mode (struct net_device *dev)
                     AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
                     AcceptAllPhys;
                 mc_filter[1] = mc_filter[0] = 0xffffffff;
-        } else if ((dev->mc_count > multicast_filter_limit)
-                   || (dev->flags & IFF_ALLMULTI)) {
+        } else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
+                   (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to filter perfectly -- accept all multicasts. */
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
                 mc_filter[1] = mc_filter[0] = 0xffffffff;
@@ -920,8 +913,7 @@ static void __cp_set_rx_mode (struct net_device *dev)
                 struct dev_mc_list *mclist;
                 rx_mode = AcceptBroadcast | AcceptMyPhys;
                 mc_filter[1] = mc_filter[0] = 0;
-                for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-                     i++, mclist = mclist->next) {
+                netdev_for_each_mc_addr(mclist, dev) {
                         int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
 
                         mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
@@ -995,7 +987,7 @@ static void cp_reset_hw (struct cp_private *cp)
                 schedule_timeout_uninterruptible(10);
         }
 
-        pr_err("%s: hardware reset timeout\n", cp->dev->name);
+        netdev_err(cp->dev, "hardware reset timeout\n");
 }
 
 static inline void cp_start_hw (struct cp_private *cp)
@@ -1057,12 +1049,10 @@ static int cp_refill_rx(struct cp_private *cp)
                 struct sk_buff *skb;
                 dma_addr_t mapping;
 
-                skb = netdev_alloc_skb(dev, cp->rx_buf_sz + NET_IP_ALIGN);
+                skb = netdev_alloc_skb_ip_align(dev, cp->rx_buf_sz);
                 if (!skb)
                         goto err_out;
 
-                skb_reserve(skb, NET_IP_ALIGN);
-
                 mapping = dma_map_single(&cp->pdev->dev, skb->data,
                                          cp->rx_buf_sz, PCI_DMA_FROMDEVICE);
                 cp->rx_skb[i] = skb;
@@ -1164,8 +1154,7 @@ static int cp_open (struct net_device *dev)
         struct cp_private *cp = netdev_priv(dev);
         int rc;
 
-        if (netif_msg_ifup(cp))
-                pr_debug("%s: enabling interface\n", dev->name);
+        netif_dbg(cp, ifup, dev, "enabling interface\n");
 
         rc = cp_alloc_rings(cp);
         if (rc)
@@ -1199,8 +1188,7 @@ static int cp_close (struct net_device *dev)
 
         napi_disable(&cp->napi);
 
-        if (netif_msg_ifdown(cp))
-                pr_debug("%s: disabling interface\n", dev->name);
+        netif_dbg(cp, ifdown, dev, "disabling interface\n");
 
         spin_lock_irqsave(&cp->lock, flags);
 
@@ -1223,9 +1211,9 @@ static void cp_tx_timeout(struct net_device *dev)
         unsigned long flags;
         int rc;
 
-        pr_warning("%s: Transmit timeout, status %2x %4x %4x %4x\n",
-               dev->name, cpr8(Cmd), cpr16(CpCmd),
-               cpr16(IntrStatus), cpr16(IntrMask));
+        netdev_warn(dev, "Transmit timeout, status %2x %4x %4x %4x\n",
+                    cpr8(Cmd), cpr16(CpCmd),
+                    cpr16(IntrStatus), cpr16(IntrMask));
 
         spin_lock_irqsave(&cp->lock, flags);
 
@@ -1878,8 +1866,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
             pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision < 0x20) {
                 dev_info(&pdev->dev,
-                           "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip, use 8139too\n",
-                           pdev->vendor, pdev->device, pdev->revision);
+                         "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip, use 8139too\n",
+                         pdev->vendor, pdev->device, pdev->revision);
                 return -ENODEV;
         }
 
@@ -1937,14 +1925,13 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
                         dev_err(&pdev->dev,
-                                   "No usable DMA configuration, aborting.\n");
+                                "No usable DMA configuration, aborting\n");
                         goto err_out_res;
                 }
                 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
                         dev_err(&pdev->dev,
-                                   "No usable consistent DMA configuration, "
-                                   "aborting.\n");
+                                "No usable consistent DMA configuration, aborting\n");
                         goto err_out_res;
                 }
         }
@@ -1956,7 +1943,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!regs) {
                 rc = -EIO;
                 dev_err(&pdev->dev, "Cannot map PCI MMIO (%Lx@%Lx)\n",
-                       (unsigned long long)pci_resource_len(pdev, 1),
+                        (unsigned long long)pci_resource_len(pdev, 1),
                        (unsigned long long)pciaddr);
                 goto err_out_res;
         }
@@ -1994,11 +1981,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (rc)
                 goto err_out_iomap;
 
-        pr_info("%s: RTL-8139C+ at 0x%lx, %pM, IRQ %d\n",
-                dev->name,
-                dev->base_addr,
-                dev->dev_addr,
-                dev->irq);
+        netdev_info(dev, "RTL-8139C+ at 0x%lx, %pM, IRQ %d\n",
+                    dev->base_addr, dev->dev_addr, dev->irq);
 
         pci_set_drvdata(pdev, dev);