14 files changed, 44 insertions, 65 deletions

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 78e34ee79df8..10da36934769 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -59,7 +59,6 @@
  * - doesn't support OAM cells
  * - eni_put_free may hang if not putting memory fragments that _complete_
  *   2^n block (never happens in real life, though)
- * - keeps IRQ even if initialization fails
  */
 
 
@@ -1802,22 +1801,22 @@ static int __devinit eni_start(struct atm_dev *dev)
         if (request_irq(eni_dev->irq,&eni_int,SA_SHIRQ,DEV_LABEL,dev)) {
                 printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
                     dev->number,eni_dev->irq);
-                return -EAGAIN;
+                error = -EAGAIN;
+                goto out;
         }
-        /* @@@ should release IRQ on error */
         pci_set_master(eni_dev->pci_dev);
         if ((error = pci_write_config_word(eni_dev->pci_dev,PCI_COMMAND,
             PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
             (eni_dev->asic ? PCI_COMMAND_PARITY | PCI_COMMAND_SERR : 0)))) {
                 printk(KERN_ERR DEV_LABEL "(itf %d): can't enable memory+"
                     "master (0x%02x)\n",dev->number,error);
-                return error;
+                goto free_irq;
         }
         if ((error = pci_write_config_byte(eni_dev->pci_dev,PCI_TONGA_CTRL,
             END_SWAP_DMA))) {
                 printk(KERN_ERR DEV_LABEL "(itf %d): can't set endian swap "
                     "(0x%02x)\n",dev->number,error);
-                return error;
+                goto free_irq;
         }
         /* determine addresses of internal tables */
         eni_dev->vci = eni_dev->ram;
@@ -1839,7 +1838,8 @@ static int __devinit eni_start(struct atm_dev *dev)
         if (!eni_dev->free_list) {
                 printk(KERN_ERR DEV_LABEL "(itf %d): couldn't get free page\n",
                     dev->number);
-                return -ENOMEM;
+                error = -ENOMEM;
+                goto free_irq;
         }
         eni_dev->free_len = 0;
         eni_put_free(eni_dev,buf,buffer_mem);
@@ -1855,17 +1855,26 @@ static int __devinit eni_start(struct atm_dev *dev)
          */
         eni_out(0xffffffff,MID_IE);
         error = start_tx(dev);
-        if (error) return error;
+        if (error) goto free_list;
         error = start_rx(dev);
-        if (error) return error;
+        if (error) goto free_list;
         error = dev->phy->start(dev);
-        if (error) return error;
+        if (error) goto free_list;
         eni_out(eni_in(MID_MC_S) | (1 << MID_INT_SEL_SHIFT) |
             MID_TX_LOCK_MODE | MID_DMA_ENABLE | MID_TX_ENABLE | MID_RX_ENABLE,
             MID_MC_S);
             /* Tonga uses SBus INTReq1 */
         (void) eni_in(MID_ISA); /* clear Midway interrupts */
         return 0;
+
+free_list:
+        kfree(eni_dev->free_list);
+
+free_irq:
+        free_irq(eni_dev->irq, eni_dev);
+
+out:
+        return error;
 }
 
 
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 196b33644627..9e65bfb85ba3 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2792,8 +2792,6 @@ static void __devexit fore200e_pca_remove_one(struct pci_dev *pci_dev)
 
     fore200e = pci_get_drvdata(pci_dev);
 
-    list_del(&fore200e->entry);
-
     fore200e_shutdown(fore200e);
     kfree(fore200e);
     pci_disable_device(pci_dev);
@@ -2850,7 +2848,7 @@ fore200e_module_init(void)
     }
 
 #ifdef CONFIG_ATM_FORE200E_PCA
-    if (!pci_module_init(&fore200e_pca_driver))
+    if (!pci_register_driver(&fore200e_pca_driver))
         return 0;
 #endif
 
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index c2c31a5f4513..3022c548a132 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -70,6 +70,7 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
@@ -371,7 +372,7 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
 
         if (pci_enable_device(pci_dev))
                 return -EIO;
-        if (pci_set_dma_mask(pci_dev, HE_DMA_MASK) != 0) {
+        if (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK) != 0) {
                 printk(KERN_WARNING "he: no suitable dma available\n");
                 err = -EIO;
                 goto init_one_failure;
diff --git a/drivers/atm/he.h b/drivers/atm/he.h
index 1a903859343a..1dc277547a73 100644
--- a/drivers/atm/he.h
+++ b/drivers/atm/he.h
@@ -380,8 +380,6 @@ struct he_vcc
 #define PCI_VENDOR_ID_FORE      0x1127
 #define PCI_DEVICE_ID_FORE_HE   0x400
 
-#define HE_DMA_MASK             0xffffffff
-
 #define GEN_CNTL_0                              0x40
 #define  INT_PROC_ENBL          (1<<25)
 #define  SLAVE_ENDIAN_MODE      (1<<16)
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 067b353e1cbd..89454915b857 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -394,13 +394,11 @@ static void sp_bump(struct sixpack *sp, char cmd)
         if ((skb = dev_alloc_skb(count)) == NULL)
                 goto out_mem;
 
-        skb->dev = sp->dev;
         ptr = skb_put(skb, count);
         *ptr++ = cmd;   /* KISS command */
 
         memcpy(ptr, sp->cooked_buf + 1, count);
-        skb->mac.raw = skb->data;
-        skb->protocol = htons(ETH_P_AX25);
+        skb->protocol = ax25_type_trans(skb, sp->dev);
         netif_rx(skb);
         sp->dev->last_rx = jiffies;
         sp->stats.rx_packets++;
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index e8cb87d906fc..1c563f905a59 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -601,12 +601,10 @@ static void do_rxpacket(struct net_device *dev)
                 bc->stats.rx_dropped++;
                 return;
         }
-        skb->dev = dev;
         cp = skb_put(skb, pktlen);
         *cp++ = 0; /* KISS kludge */
         memcpy(cp, bc->hdlcrx.buf, pktlen - 1);
-        skb->protocol = htons(ETH_P_AX25);
-        skb->mac.raw = skb->data;
+        skb->protocol = ax25_type_trans(skb, dev);
         netif_rx(skb);
         dev->last_rx = jiffies;
         bc->stats.rx_packets++;
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index ef1a359e2273..ba9f0580e1f9 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -211,11 +211,7 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
         ptr = skb_push(skb, 1);
         *ptr = 0;
 
-        skb->dev = dev;
-        skb->protocol = htons(ETH_P_AX25);
-        skb->mac.raw = skb->data;
-        skb->pkt_type = PACKET_HOST;
-
+        skb->protocol = ax25_type_trans(skb, dev);
         netif_rx(skb);
         dev->last_rx = jiffies;
 unlock:
@@ -272,8 +268,6 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
                 skb = newskb;
         }
 
-        skb->protocol = htons(ETH_P_AX25);
-
         ptr = skb_push(skb, 2);
 
         *ptr++ = (size + 5) % 256;
@@ -287,7 +281,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
                 return -ENODEV;
         }
 
-        skb->dev = dev;
+        skb->protocol = ax25_type_trans(skb, dev);
         skb->nh.raw = skb->data;
         dev->hard_header(skb, dev, ETH_P_BPQ, bpq->dest_addr, NULL, 0);
         bpq->stats.tx_packets++;
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index f3269b70a8c5..f515245a3fd0 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -1306,9 +1306,7 @@ static void rx_bh(void *arg)
                         data = skb_put(skb, cb + 1);
                         data[0] = 0;
                         memcpy(&data[1], priv->rx_buf[i], cb);
-                        skb->dev = priv->dev;
-                        skb->protocol = ntohs(ETH_P_AX25);
-                        skb->mac.raw = skb->data;
+                        skb->protocol = ax25_type_trans(skb, priv->dev);
                         netif_rx(skb);
                         priv->dev->last_rx = jiffies;
                         priv->stats.rx_packets++;
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index b89959a596d7..b4c836e4fe86 100644
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -174,12 +174,10 @@ static void hdlc_rx_flag(struct net_device *dev, struct hdlcdrv_state *s)
                 s->stats.rx_dropped++;
                 return;
         }
-        skb->dev = dev;
         cp = skb_put(skb, pkt_len);
         *cp++ = 0; /* KISS kludge */
         memcpy(cp, s->hdlcrx.buffer, pkt_len - 1);
-        skb->protocol = htons(ETH_P_AX25);
-        skb->mac.raw = skb->data;
+        skb->protocol = ax25_type_trans(skb, dev);
         netif_rx(skb);
         dev->last_rx = jiffies;
         s->stats.rx_packets++;
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index d9ea080aea0f..62790511098f 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -332,12 +332,10 @@ static void ax_bump(struct ax_disp *ax)
                 return;
         }
 
-        skb->dev      = ax->dev;
         spin_lock_bh(&ax->buflock);
         memcpy(skb_put(skb,count), ax->rbuff, count);
         spin_unlock_bh(&ax->buflock);
-        skb->mac.raw  = skb->data;
-        skb->protocol = htons(ETH_P_AX25);
+        skb->protocol = ax25_type_trans(skb, ax->dev);
         netif_rx(skb);
         ax->dev->last_rx = jiffies;
         ax->rx_packets++;
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index ce9e7af020da..ece1b1a13186 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1630,10 +1630,7 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
         scc->dev_stat.rx_packets++;
         scc->dev_stat.rx_bytes += skb->len;
 
-        skb->dev      = scc->dev;
-        skb->protocol = htons(ETH_P_AX25);
-        skb->mac.raw  = skb->data;
-        skb->pkt_type = PACKET_HOST;
+        skb->protocol = ax25_type_trans(skb, scc->dev);
         
         netif_rx(skb);
         scc->dev->last_rx = jiffies;
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index fd7b00fe38e5..41213ef602dc 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -522,12 +522,10 @@ static inline void yam_rx_flag(struct net_device *dev, struct yam_port *yp)
                                 ++yp->stats.rx_dropped;
                         } else {
                                 unsigned char *cp;
-                                skb->dev = dev;
                                 cp = skb_put(skb, pkt_len);
                                 *cp++ = 0;              /* KISS kludge */
                                 memcpy(cp, yp->rx_buf, pkt_len - 1);
-                                skb->protocol = htons(ETH_P_AX25);
-                                skb->mac.raw = skb->data;
+                                skb->protocol = ax25_type_trans(skb, dev);
                                 netif_rx(skb);
                                 dev->last_rx = jiffies;
                                 ++yp->stats.rx_packets;
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 4ce52f5f2419..8f7841c0374d 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -185,15 +185,12 @@ sl_alloc_bufs(struct slip *sl, int mtu)
         /* Cleanup */
 err_exit:
 #ifdef SL_INCLUDE_CSLIP
-        if (cbuff)
-                kfree(cbuff);
+        kfree(cbuff);
         if (slcomp)
                 slhc_free(slcomp);
 #endif
-        if (xbuff)
-                kfree(xbuff);
-        if (rbuff)
-                kfree(rbuff);
+        kfree(xbuff);
+        kfree(rbuff);
         return err;
 }
 
@@ -204,13 +201,13 @@ sl_free_bufs(struct slip *sl)
         void * tmp;
 
         /* Free all SLIP frame buffers. */
-        if ((tmp = xchg(&sl->rbuff, NULL)) != NULL)
-                kfree(tmp);
-        if ((tmp = xchg(&sl->xbuff, NULL)) != NULL)
-                kfree(tmp);
+        tmp = xchg(&sl->rbuff, NULL);
+        kfree(tmp);
+        tmp = xchg(&sl->xbuff, NULL);
+        kfree(tmp);
 #ifdef SL_INCLUDE_CSLIP
-        if ((tmp = xchg(&sl->cbuff, NULL)) != NULL)
-                kfree(tmp);
+        tmp = xchg(&sl->cbuff, NULL);
+        kfree(tmp);
         if ((tmp = xchg(&sl->slcomp, NULL)) != NULL)
                 slhc_free(tmp);
 #endif
@@ -297,13 +294,10 @@ done_on_bh:
         spin_unlock_bh(&sl->lock);
 
 done:
-        if (xbuff)
-                kfree(xbuff);
-        if (rbuff)
-                kfree(rbuff);
+        kfree(xbuff);
+        kfree(rbuff);
 #ifdef SL_INCLUDE_CSLIP
-        if (cbuff)
-                kfree(cbuff);
+        kfree(cbuff);
 #endif
         return err;
 }
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f65ca3b2da6f..10d476153ee0 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -61,8 +61,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.25"
-#define DRV_MODULE_RELDATE      "March 24, 2005"
+#define DRV_MODULE_VERSION      "3.26"
+#define DRV_MODULE_RELDATE      "April 24, 2005"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0