Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block

[safe/jmp/linux-2.6] / drivers / net / rrunner.c

diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 19c2df9..19152f5 100644 (file)
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -28,7 +28,6 @@
 #define RX_DMA_SKBUFF 1
 #define PKT_COPY_THRESHOLD 512
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -110,7 +109,6 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
 
        rrpriv = netdev_priv(dev);
 
-       SET_MODULE_OWNER(dev);
        SET_NETDEV_DEV(dev, &pdev->dev);
 
        if (pci_request_regions(pdev, "rrunner")) {
@@ -128,7 +126,6 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
        dev->open = &rr_open;
        dev->hard_start_xmit = &rr_start_xmit;
        dev->stop = &rr_close;
-       dev->get_stats = &rr_get_stats;
        dev->do_ioctl = &rr_ioctl;
 
        dev->base_addr = pci_resource_start(pdev, 0);
@@ -215,13 +212,13 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
 
  out:
        if (rrpriv->rx_ring)
-               pci_free_consistent(pdev, RX_TOTAL_SIZE, rrpriv->rx_ring, 
+               pci_free_consistent(pdev, RX_TOTAL_SIZE, rrpriv->rx_ring,
                                    rrpriv->rx_ring_dma);
        if (rrpriv->tx_ring)
                pci_free_consistent(pdev, TX_TOTAL_SIZE, rrpriv->tx_ring,
                                    rrpriv->tx_ring_dma);
        if (rrpriv->regs)
-               iounmap(rrpriv->regs);  
+               iounmap(rrpriv->regs);
        if (pdev) {
                pci_release_regions(pdev);
                pci_set_drvdata(pdev, NULL);
@@ -517,13 +514,13 @@ static unsigned int write_eeprom(struct rr_private *rrpriv,
 }
 
 
-static int __init rr_init(struct net_device *dev)
+static int __devinit rr_init(struct net_device *dev)
 {
        struct rr_private *rrpriv;
        struct rr_regs __iomem *regs;
        struct eeprom *hw = NULL;
        u32 sram_size, rev;
-       int i;
+       DECLARE_MAC_BUF(mac);
 
        rrpriv = netdev_priv(dev);
        regs = rrpriv->regs;
@@ -560,12 +557,8 @@ static int __init rr_init(struct net_device *dev)
          htons(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA));
        *(u32 *)(dev->dev_addr+2) =
          htonl(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA[4]));
-       
-       printk("  MAC: ");
 
-       for (i = 0; i < 5; i++)
-               printk("%2.2x:", dev->dev_addr[i]);
-       printk("%2.2x\n", dev->dev_addr[i]);
+       printk("  MAC: %s\n", print_mac(mac, dev->dev_addr));
 
        sram_size = rr_read_eeprom_word(rrpriv, (void *)8);
        printk("  SRAM size 0x%06x\n", sram_size);
@@ -737,8 +730,8 @@ static int rr_init1(struct net_device *dev)
                struct sk_buff *skb = rrpriv->rx_skbuff[i];
 
                if (skb) {
-                       pci_unmap_single(rrpriv->pci_dev, 
-                                        rrpriv->rx_ring[i].addr.addrlo, 
+                       pci_unmap_single(rrpriv->pci_dev,
+                                        rrpriv->rx_ring[i].addr.addrlo,
                                         dev->mtu + HIPPI_HLEN,
                                         PCI_DMA_FROMDEVICE);
                        rrpriv->rx_ring[i].size = 0;
@@ -793,14 +786,14 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
                case E_INTERN_ERR:
                        printk(KERN_ERR "%s: HIPPI Internal NIC error\n",
                               dev->name);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
                case E_HOST_ERR:
                        printk(KERN_ERR "%s: Host software error\n",
                               dev->name);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
@@ -810,7 +803,7 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
                case E_CON_REJ:
                        printk(KERN_WARNING "%s: Connection rejected\n",
                               dev->name);
-                       rrpriv->stats.tx_aborted_errors++;
+                       dev->stats.tx_aborted_errors++;
                        break;
                case E_CON_TMOUT:
                        printk(KERN_WARNING "%s: Connection timeout\n",
@@ -819,12 +812,12 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
                case E_DISC_ERR:
                        printk(KERN_WARNING "%s: HIPPI disconnect error\n",
                               dev->name);
-                       rrpriv->stats.tx_aborted_errors++;
+                       dev->stats.tx_aborted_errors++;
                        break;
                case E_INT_PRTY:
                        printk(KERN_ERR "%s: HIPPI Internal Parity error\n",
                               dev->name);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
@@ -835,29 +828,29 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
                case E_TX_LINK_DROP:
                        printk(KERN_WARNING "%s: Link lost during transmit\n",
                               dev->name);
-                       rrpriv->stats.tx_aborted_errors++;
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       dev->stats.tx_aborted_errors++;
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
                case E_TX_INV_RNG:
                        printk(KERN_ERR "%s: Invalid send ring block\n",
                               dev->name);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
                case E_TX_INV_BUF:
                        printk(KERN_ERR "%s: Invalid send buffer address\n",
                               dev->name);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
                case E_TX_INV_DSC:
                        printk(KERN_ERR "%s: Invalid descriptor address\n",
                               dev->name);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
@@ -911,21 +904,21 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
                case E_RX_INV_BUF:
                        printk(KERN_ERR "%s: Invalid receive buffer "
                               "address\n", dev->name);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
                case E_RX_INV_DSC:
                        printk(KERN_ERR "%s: Invalid receive descriptor "
                               "address\n", dev->name);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
                case E_RNG_BLK:
                        printk(KERN_ERR "%s: Invalid ring block\n",
                               dev->name);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        wmb();
                        break;
@@ -975,7 +968,7 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
                printk("len %x, mode %x\n", pkt_len, desc->mode);
 #endif
                if ( (rrpriv->rx_ring[index].mode & PACKET_BAD) == PACKET_BAD){
-                       rrpriv->stats.rx_dropped++;
+                       dev->stats.rx_dropped++;
                        goto defer;
                }
 
@@ -988,7 +981,7 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
                                skb = alloc_skb(pkt_len, GFP_ATOMIC);
                                if (skb == NULL){
                                        printk(KERN_WARNING "%s: Unable to allocate skb (%i bytes), deferring packet\n", dev->name, pkt_len);
-                                       rrpriv->stats.rx_dropped++;
+                                       dev->stats.rx_dropped++;
                                        goto defer;
                                } else {
                                        pci_dma_sync_single_for_cpu(rrpriv->pci_dev,
@@ -1012,32 +1005,31 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
                                if (newskb){
                                        dma_addr_t addr;
 
-                                       pci_unmap_single(rrpriv->pci_dev, 
-                                               desc->addr.addrlo, dev->mtu + 
+                                       pci_unmap_single(rrpriv->pci_dev,
+                                               desc->addr.addrlo, dev->mtu +
                                                HIPPI_HLEN, PCI_DMA_FROMDEVICE);
                                        skb = rx_skb;
                                        skb_put(skb, pkt_len);
                                        rrpriv->rx_skbuff[index] = newskb;
-                                       addr = pci_map_single(rrpriv->pci_dev, 
-                                               newskb->data, 
-                                               dev->mtu + HIPPI_HLEN, 
+                                       addr = pci_map_single(rrpriv->pci_dev,
+                                               newskb->data,
+                                               dev->mtu + HIPPI_HLEN,
                                                PCI_DMA_FROMDEVICE);
                                        set_rraddr(&desc->addr, addr);
                                } else {
                                        printk("%s: Out of memory, deferring "
                                               "packet\n", dev->name);
-                                       rrpriv->stats.rx_dropped++;
+                                       dev->stats.rx_dropped++;
                                        goto defer;
                                }
                        }
-                       skb->dev = dev;
                        skb->protocol = hippi_type_trans(skb, dev);
 
                        netif_rx(skb);          /* send it up */
 
                        dev->last_rx = jiffies;
-                       rrpriv->stats.rx_packets++;
-                       rrpriv->stats.rx_bytes += pkt_len;
+                       dev->stats.rx_packets++;
+                       dev->stats.rx_bytes += pkt_len;
                }
        defer:
                desc->mode = 0;
@@ -1054,7 +1046,7 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
 }
 
 
-static irqreturn_t rr_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
+static irqreturn_t rr_interrupt(int irq, void *dev_id)
 {
        struct rr_private *rrpriv;
        struct rr_regs __iomem *regs;
@@ -1105,8 +1097,8 @@ static irqreturn_t rr_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
                                desc = &(rrpriv->tx_ring[txcon]);
                                skb = rrpriv->tx_skbuff[txcon];
 
-                               rrpriv->stats.tx_packets++;
-                               rrpriv->stats.tx_bytes += skb->len;
+                               dev->stats.tx_packets++;
+                               dev->stats.tx_bytes += skb->len;
 
                                pci_unmap_single(rrpriv->pci_dev,
                                                 desc->addr.addrlo, skb->len,
@@ -1200,7 +1192,7 @@ static void rr_timer(unsigned long data)
 
                if (rr_init1(dev)) {
                        spin_lock_irqsave(&rrpriv->lock, flags);
-                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT, 
+                       writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                               &regs->HostCtrl);
                        spin_unlock_irqrestore(&rrpriv->lock, flags);
                }
@@ -1253,7 +1245,7 @@ static int rr_open(struct net_device *dev)
        readl(&regs->HostCtrl);
        spin_unlock_irqrestore(&rrpriv->lock, flags);
 
-       if (request_irq(dev->irq, rr_interrupt, SA_SHIRQ, dev->name, dev)) {
+       if (request_irq(dev->irq, rr_interrupt, IRQF_SHARED, dev->name, dev)) {
                printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
                       dev->name, dev->irq);
                ecode = -EAGAIN;
@@ -1292,7 +1284,7 @@ static int rr_open(struct net_device *dev)
        }
 
        netif_stop_queue(dev);
-       
+
        return ecode;
 }
 
@@ -1453,7 +1445,7 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev)
                }
                skb_reserve(new_skb, 8);
                skb_put(new_skb, len);
-               memcpy(new_skb->data, skb->data, len);
+               skb_copy_from_linear_data(skb, new_skb->data, len);
                dev_kfree_skb(skb);
                skb = new_skb;
        }
@@ -1494,16 +1486,6 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 
-static struct net_device_stats *rr_get_stats(struct net_device *dev)
-{
-       struct rr_private *rrpriv;
-
-       rrpriv = netdev_priv(dev);
-
-       return(&rrpriv->stats);
-}
-
-
 /*
  * Read the firmware out of the EEPROM and put it into the SRAM
  * (or from user space - later)
@@ -1528,7 +1510,7 @@ static int rr_load_firmware(struct net_device *dev)
                return -EBUSY;
 
        if (!(readl(&regs->HostCtrl) & NIC_HALTED)){
-               printk("%s: Trying to load firmware to a running NIC.\n", 
+               printk("%s: Trying to load firmware to a running NIC.\n",
                       dev->name);
                return -EBUSY;
        }
@@ -1661,7 +1643,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        gf_out:
                kfree(image);
                return error;
-               
+
        case SIOCRRPFW:
                if (!capable(CAP_SYS_RAWIO)){
                        return -EPERM;
@@ -1713,7 +1695,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                kfree(oldimage);
                kfree(image);
                return error;
-               
+
        case SIOCRRID:
                return put_user(0x52523032, (int __user *)rq->ifr_data);
        default:
@@ -1737,7 +1719,7 @@ static struct pci_driver rr_driver = {
 
 static int __init rr_init_module(void)
 {
-       return pci_module_init(&rr_driver);
+       return pci_register_driver(&rr_driver);
 }
 
 static void __exit rr_cleanup_module(void)