Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / drivers / net / arcnet / arcnet.c

diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index fabc060..681e20b 100644 (file)
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -41,10 +41,9 @@
  *     <jojo@repas.de>
  */
 
-#define VERSION "arcnet: v3.93 BETA 2000/04/29 - by Avery Pennarun et al.\n"
+#define VERSION "arcnet: v3.94 BETA 2007/02/08 - by Avery Pennarun et al.\n"
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
@@ -520,9 +519,12 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev,
                 * real header when we do rebuild_header.
                 */
                *(uint16_t *) skb_push(skb, 2) = type;
-               if (skb->nh.raw - skb->mac.raw != 2)
+               /*
+                * XXX: Why not use skb->mac_len?
+                */
+               if (skb->network_header - skb->mac_header != 2)
                        BUGMSG(D_NORMAL, "arcnet_header: Yikes!  diff (%d) is not 2!\n",
-                              (int)(skb->nh.raw - skb->mac.raw));
+                              (int)(skb->network_header - skb->mac_header));
                return -2;      /* return error -- can't transmit yet! */
        }
        else {
@@ -555,11 +557,13 @@ static int arcnet_rebuild_header(struct sk_buff *skb)
        unsigned short type;
        uint8_t daddr=0;
        struct ArcProto *proto;
-
-       if (skb->nh.raw - skb->mac.raw != 2) {
+       /*
+        * XXX: Why not use skb->mac_len?
+        */
+       if (skb->network_header - skb->mac_header != 2) {
                BUGMSG(D_NORMAL,
-                    "rebuild_header: shouldn't be here! (hdrsize=%d)\n",
-                    (int)(skb->nh.raw - skb->mac.raw));
+                      "rebuild_header: shouldn't be here! (hdrsize=%d)\n",
+                      (int)(skb->network_header - skb->mac_header));
                return 0;
        }
        type = *(uint16_t *) skb_pull(skb, 2);
@@ -753,7 +757,7 @@ static void arcnet_timeout(struct net_device *dev)
  * interrupts. Establish which device needs attention, and call the correct
  * chipset interrupt handler.
  */
-irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t arcnet_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = dev_id;
        struct arcnet_local *lp;