Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
  net/ieee80211: fix more crypto-related build breakage
  [PATCH] Spidernet: add ethtool -S (show statistics)
  [NET] GT96100: Delete bitrotting ethernet driver
  [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
  [PATCH] Cirrus Logic ep93xx ethernet driver
  r8169: the MMIO region of the 8167 stands behin BAR#1
  e1000, ixgb: Remove pointless wrappers
  [PATCH] Remove powerpc specific parts of 3c509 driver
  [PATCH] s2io: Switch to pci_get_device
  [PATCH] gt96100: move to pci_get_device API
  [PATCH] ehea: bugfix for register access functions
  [PATCH] e1000 disable device on PCI error
  drivers/net/phy/fixed: #if 0 some incomplete code
  drivers/net: const-ify ethtool_ops declarations
  [PATCH] ethtool: allow const ethtool_ops
  [PATCH] sky2: big endian
  [PATCH] sky2: fiber support
  [PATCH] sky2: tx pause bug fix
  drivers/net: Trim trailing whitespace
  [PATCH] ehea: IBM eHEA Ethernet Device Driver
  ...

Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be
next to unrelated changes in this update.

1 files changed, 54 insertions, 68 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index a48b211c489d..5a4990ae3730 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -48,7 +48,7 @@
  */
 
 #define DRV_NAME                "8139cp"
-#define DRV_VERSION             "1.2"
+#define DRV_VERSION             "1.3"
 #define DRV_RELDATE             "Mar 22, 2004"
 
 
@@ -314,12 +314,6 @@ struct cp_desc {
         u64             addr;
 };
 
-struct ring_info {
-        struct sk_buff          *skb;
-        dma_addr_t              mapping;
-        u32                     len;
-};
-
 struct cp_dma_stats {
         u64                     tx_ok;
         u64                     rx_ok;
@@ -353,23 +347,23 @@ struct cp_private {
         struct net_device_stats net_stats;
         struct cp_extra_stats   cp_stats;
 
-        unsigned                rx_tail         ____cacheline_aligned;
+        unsigned                rx_head         ____cacheline_aligned;
+        unsigned                rx_tail;
         struct cp_desc          *rx_ring;
-        struct ring_info        rx_skb[CP_RX_RING_SIZE];
-        unsigned                rx_buf_sz;
+        struct sk_buff          *rx_skb[CP_RX_RING_SIZE];
 
         unsigned                tx_head         ____cacheline_aligned;
         unsigned                tx_tail;
-
         struct cp_desc          *tx_ring;
-        struct ring_info        tx_skb[CP_TX_RING_SIZE];
-        dma_addr_t              ring_dma;
+        struct sk_buff          *tx_skb[CP_TX_RING_SIZE];
+
+        unsigned                rx_buf_sz;
+        unsigned                wol_enabled : 1; /* Is Wake-on-LAN enabled? */
 
 #if CP_VLAN_TAG_USED
         struct vlan_group       *vlgrp;
 #endif
-
-        unsigned int            wol_enabled : 1; /* Is Wake-on-LAN enabled? */
+        dma_addr_t              ring_dma;
 
         struct mii_if_info      mii_if;
 };
@@ -407,10 +401,8 @@ static int cp_set_eeprom(struct net_device *dev,
                          struct ethtool_eeprom *eeprom, u8 *data);
 
 static struct pci_device_id cp_pci_tbl[] = {
-        { PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-        { PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     PCI_DEVICE_ID_REALTEK_8139), },
+        { PCI_DEVICE(PCI_VENDOR_ID_TTTECH,      PCI_DEVICE_ID_TTTECH_MC322), },
         { },
 };
 MODULE_DEVICE_TABLE(pci, cp_pci_tbl);
@@ -542,7 +534,7 @@ rx_status_loop:
                 struct cp_desc *desc;
                 unsigned buflen;
 
-                skb = cp->rx_skb[rx_tail].skb;
+                skb = cp->rx_skb[rx_tail];
                 BUG_ON(!skb);
 
                 desc = &cp->rx_ring[rx_tail];
@@ -551,7 +543,7 @@ rx_status_loop:
                         break;
 
                 len = (status & 0x1fff) - 4;
-                mapping = cp->rx_skb[rx_tail].mapping;
+                mapping = le64_to_cpu(desc->addr);
 
                 if ((status & (FirstFrag | LastFrag)) != (FirstFrag | LastFrag)) {
                         /* we don't support incoming fragmented frames.
@@ -572,7 +564,7 @@ rx_status_loop:
 
                 if (netif_msg_rx_status(cp))
                         printk(KERN_DEBUG "%s: rx slot %d status 0x%x len %d\n",
-                               cp->dev->name, rx_tail, status, len);
+                               dev->name, rx_tail, status, len);
 
                 buflen = cp->rx_buf_sz + RX_OFFSET;
                 new_skb = dev_alloc_skb (buflen);
@@ -582,7 +574,7 @@ rx_status_loop:
                 }
 
                 skb_reserve(new_skb, RX_OFFSET);
-                new_skb->dev = cp->dev;
+                new_skb->dev = dev;
 
                 pci_unmap_single(cp->pdev, mapping,
                                  buflen, PCI_DMA_FROMDEVICE);
@@ -595,11 +587,9 @@ rx_status_loop:
 
                 skb_put(skb, len);
 
-                mapping =
-                cp->rx_skb[rx_tail].mapping =
-                        pci_map_single(cp->pdev, new_skb->data,
-                                       buflen, PCI_DMA_FROMDEVICE);
-                cp->rx_skb[rx_tail].skb = new_skb;
+                mapping = pci_map_single(cp->pdev, new_skb->data, buflen,
+                                         PCI_DMA_FROMDEVICE);
+                cp->rx_skb[rx_tail] = new_skb;
 
                 cp_rx_skb(cp, skb, desc);
                 rx++;
@@ -717,19 +707,21 @@ static void cp_tx (struct cp_private *cp)
         unsigned tx_tail = cp->tx_tail;
 
         while (tx_tail != tx_head) {
+                struct cp_desc *txd = cp->tx_ring + tx_tail;
                 struct sk_buff *skb;
                 u32 status;
 
                 rmb();
-                status = le32_to_cpu(cp->tx_ring[tx_tail].opts1);
+                status = le32_to_cpu(txd->opts1);
                 if (status & DescOwn)
                         break;
 
-                skb = cp->tx_skb[tx_tail].skb;
+                skb = cp->tx_skb[tx_tail];
                 BUG_ON(!skb);
 
-                pci_unmap_single(cp->pdev, cp->tx_skb[tx_tail].mapping,
-                                 cp->tx_skb[tx_tail].len, PCI_DMA_TODEVICE);
+                pci_unmap_single(cp->pdev, le64_to_cpu(txd->addr),
+                                 le32_to_cpu(txd->opts1) & 0xffff,
+                                 PCI_DMA_TODEVICE);
 
                 if (status & LastFrag) {
                         if (status & (TxError | TxFIFOUnder)) {
@@ -756,7 +748,7 @@ static void cp_tx (struct cp_private *cp)
                         dev_kfree_skb_irq(skb);
                 }
 
-                cp->tx_skb[tx_tail].skb = NULL;
+                cp->tx_skb[tx_tail] = NULL;
 
                 tx_tail = NEXT_TX(tx_tail);
         }
@@ -826,9 +818,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
                 txd->opts1 = cpu_to_le32(flags);
                 wmb();
 
-                cp->tx_skb[entry].skb = skb;
-                cp->tx_skb[entry].mapping = mapping;
-                cp->tx_skb[entry].len = len;
+                cp->tx_skb[entry] = skb;
                 entry = NEXT_TX(entry);
         } else {
                 struct cp_desc *txd;
@@ -844,9 +834,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
                 first_len = skb_headlen(skb);
                 first_mapping = pci_map_single(cp->pdev, skb->data,
                                                first_len, PCI_DMA_TODEVICE);
-                cp->tx_skb[entry].skb = skb;
-                cp->tx_skb[entry].mapping = first_mapping;
-                cp->tx_skb[entry].len = first_len;
+                cp->tx_skb[entry] = skb;
                 entry = NEXT_TX(entry);
 
                 for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
@@ -887,9 +875,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
                         txd->opts1 = cpu_to_le32(ctrl);
                         wmb();
 
-                        cp->tx_skb[entry].skb = skb;
-                        cp->tx_skb[entry].mapping = mapping;
-                        cp->tx_skb[entry].len = len;
+                        cp->tx_skb[entry] = skb;
                         entry = NEXT_TX(entry);
                 }
 
@@ -942,8 +928,6 @@ static void __cp_set_rx_mode (struct net_device *dev)
         /* Note: do not reorder, GCC is clever about common statements. */
         if (dev->flags & IFF_PROMISC) {
                 /* Unconditionally log net taps. */
-                printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",
-                        dev->name);
                 rx_mode =
                     AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
                     AcceptAllPhys;
@@ -1091,6 +1075,7 @@ static int cp_refill_rx (struct cp_private *cp)
 
         for (i = 0; i < CP_RX_RING_SIZE; i++) {
                 struct sk_buff *skb;
+                dma_addr_t mapping;
 
                 skb = dev_alloc_skb(cp->rx_buf_sz + RX_OFFSET);
                 if (!skb)
@@ -1099,12 +1084,12 @@ static int cp_refill_rx (struct cp_private *cp)
                 skb->dev = cp->dev;
                 skb_reserve(skb, RX_OFFSET);
 
-                cp->rx_skb[i].mapping = pci_map_single(cp->pdev,
-                        skb->data, cp->rx_buf_sz, PCI_DMA_FROMDEVICE);
-                cp->rx_skb[i].skb = skb;
+                mapping = pci_map_single(cp->pdev, skb->data, cp->rx_buf_sz,
+                                         PCI_DMA_FROMDEVICE);
+                cp->rx_skb[i] = skb;
 
                 cp->rx_ring[i].opts2 = 0;
-                cp->rx_ring[i].addr = cpu_to_le64(cp->rx_skb[i].mapping);
+                cp->rx_ring[i].addr = cpu_to_le64(mapping);
                 if (i == (CP_RX_RING_SIZE - 1))
                         cp->rx_ring[i].opts1 =
                                 cpu_to_le32(DescOwn | RingEnd | cp->rx_buf_sz);
@@ -1152,23 +1137,27 @@ static int cp_alloc_rings (struct cp_private *cp)
 
 static void cp_clean_rings (struct cp_private *cp)
 {
+        struct cp_desc *desc;
         unsigned i;
 
         for (i = 0; i < CP_RX_RING_SIZE; i++) {
-                if (cp->rx_skb[i].skb) {
-                        pci_unmap_single(cp->pdev, cp->rx_skb[i].mapping,
+                if (cp->rx_skb[i]) {
+                        desc = cp->rx_ring + i;
+                        pci_unmap_single(cp->pdev, le64_to_cpu(desc->addr),
                                          cp->rx_buf_sz, PCI_DMA_FROMDEVICE);
-                        dev_kfree_skb(cp->rx_skb[i].skb);
+                        dev_kfree_skb(cp->rx_skb[i]);
                 }
         }
 
         for (i = 0; i < CP_TX_RING_SIZE; i++) {
-                if (cp->tx_skb[i].skb) {
-                        struct sk_buff *skb = cp->tx_skb[i].skb;
-
-                        pci_unmap_single(cp->pdev, cp->tx_skb[i].mapping,
-                                         cp->tx_skb[i].len, PCI_DMA_TODEVICE);
-                        if (le32_to_cpu(cp->tx_ring[i].opts1) & LastFrag)
+                if (cp->tx_skb[i]) {
+                        struct sk_buff *skb = cp->tx_skb[i];
+
+                        desc = cp->tx_ring + i;
+                        pci_unmap_single(cp->pdev, le64_to_cpu(desc->addr),
+                                         le32_to_cpu(desc->opts1) & 0xffff,
+                                         PCI_DMA_TODEVICE);
+                        if (le32_to_cpu(desc->opts1) & LastFrag)
                                 dev_kfree_skb(skb);
                         cp->net_stats.tx_dropped++;
                 }
@@ -1177,8 +1166,8 @@ static void cp_clean_rings (struct cp_private *cp)
         memset(cp->rx_ring, 0, sizeof(struct cp_desc) * CP_RX_RING_SIZE);
         memset(cp->tx_ring, 0, sizeof(struct cp_desc) * CP_TX_RING_SIZE);
 
-        memset(&cp->rx_skb, 0, sizeof(struct ring_info) * CP_RX_RING_SIZE);
-        memset(&cp->tx_skb, 0, sizeof(struct ring_info) * CP_TX_RING_SIZE);
+        memset(cp->rx_skb, 0, sizeof(struct sk_buff *) * CP_RX_RING_SIZE);
+        memset(cp->tx_skb, 0, sizeof(struct sk_buff *) * CP_TX_RING_SIZE);
 }
 
 static void cp_free_rings (struct cp_private *cp)
@@ -1557,7 +1546,7 @@ static void cp_get_ethtool_stats (struct net_device *dev,
         pci_free_consistent(cp->pdev, sizeof(*nic_stats), nic_stats, dma);
 }
 
-static struct ethtool_ops cp_ethtool_ops = {
+static const struct ethtool_ops cp_ethtool_ops = {
         .get_drvinfo            = cp_get_drvinfo,
         .get_regs_len           = cp_get_regs_len,
         .get_stats_count        = cp_get_stats_count,
@@ -2010,7 +1999,6 @@ static void cp_remove_one (struct pci_dev *pdev)
         struct net_device *dev = pci_get_drvdata(pdev);
         struct cp_private *cp = netdev_priv(dev);
 
-        BUG_ON(!dev);
         unregister_netdev(dev);
         iounmap(cp->regs);
         if (cp->wol_enabled)
@@ -2025,14 +2013,12 @@ static void cp_remove_one (struct pci_dev *pdev)
 #ifdef CONFIG_PM
 static int cp_suspend (struct pci_dev *pdev, pm_message_t state)
 {
-        struct net_device *dev;
-        struct cp_private *cp;
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct cp_private *cp = netdev_priv(dev);
         unsigned long flags;
 
-        dev = pci_get_drvdata (pdev);
-        cp  = netdev_priv(dev);
-
-        if (!dev || !netif_running (dev)) return 0;
+        if (!netif_running(dev))
+                return 0;
 
         netif_device_detach (dev);
         netif_stop_queue (dev);
@@ -2098,7 +2084,7 @@ static int __init cp_init (void)
 #ifdef MODULE
         printk("%s", version);
 #endif
-        return pci_module_init (&cp_driver);
+        return pci_register_driver(&cp_driver);
 }
 
 static void __exit cp_exit (void)