Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

7 files changed, 117 insertions, 103 deletions

diff --git a/net/ax25/Kconfig b/net/ax25/Kconfig
index a8993a041724..43dd86fca4d3 100644
--- a/net/ax25/Kconfig
+++ b/net/ax25/Kconfig
@@ -1,30 +1,27 @@
 #
 # Amateur Radio protocols and AX.25 device configuration
 #
-# 19971130      Now in an own category to make correct compilation of the
-#               AX.25 stuff easier...
-#               Joerg Reuter DL1BKE <jreuter@yaina.de>
-# 19980129      Moved to net/ax25/Config.in, sourcing device drivers.
 
 menuconfig HAMRADIO
         depends on NET
         bool "Amateur Radio support"
         help
           If you want to connect your Linux box to an amateur radio, answer Y
-          here. You want to read <http://www.tapr.org/tapr/html/pkthome.html> and
-          the AX25-HOWTO, available from <http://www.tldp.org/docs.html#howto>.
+          here. You want to read <http://www.tapr.org/tapr/html/pkthome.html>
+          and more specifically about AX.25 on Linux
+          <http://www.linux-ax25.org/>.
 
           Note that the answer to this question won't directly affect the
           kernel: saying N will just cause the configurator to skip all
           the questions about amateur radio.
 
 comment "Packet Radio protocols"
-        depends on HAMRADIO && NET
+        depends on HAMRADIO
 
 config AX25
         tristate "Amateur Radio AX.25 Level 2 protocol"
-        depends on HAMRADIO && NET
-        ---help---
+        depends on HAMRADIO
+        help
           This is the protocol used for computer communication over amateur
           radio. It is either used by itself for point-to-point links, or to
           carry other protocols such as tcp/ip. To use it, you need a device
@@ -52,6 +49,7 @@ config AX25
 
 config AX25_DAMA_SLAVE
         bool "AX.25 DAMA Slave support"
+        default y
         depends on AX25
         help
           DAMA is a mechanism to prevent collisions when doing AX.25
@@ -59,23 +57,38 @@ config AX25_DAMA_SLAVE
           from clients (called "slaves") and redistributes it to other slaves.
           If you say Y here, your Linux box will act as a DAMA slave; this is
           transparent in that you don't have to do any special DAMA
-          configuration. (Linux cannot yet act as a DAMA server.) If unsure,
-          say N.
+          configuration. Linux cannot yet act as a DAMA server.  This option
+          only compiles DAMA slave support into the kernel.  It still needs to
+          be enabled at runtime.  For more about DAMA see
+          <http://www.linux-ax25.org>.  If unsure, say Y.
+
+# placeholder until implemented
+config AX25_DAMA_MASTER
+        bool 'AX.25 DAMA Master support'
+        depends on AX25_DAMA_SLAVE && BROKEN
+        help
+          DAMA is a mechanism to prevent collisions when doing AX.25
+          networking. A DAMA server (called "master") accepts incoming traffic
+          from clients (called "slaves") and redistributes it to other slaves.
+          If you say Y here, your Linux box will act as a DAMA master; this is
+          transparent in that you don't have to do any special DAMA
+          configuration. Linux cannot yet act as a DAMA server.  This option
+          only compiles DAMA slave support into the kernel.  It still needs to
+          be explicitly enabled, so if unsure, say Y.
 
-#        bool '    AX.25 DAMA Master support' CONFIG_AX25_DAMA_MASTER
 config NETROM
         tristate "Amateur Radio NET/ROM protocol"
         depends on AX25
-        ---help---
+        help
           NET/ROM is a network layer protocol on top of AX.25 useful for
           routing.
 
           A comprehensive listing of all the software for Linux amateur radio
           users as well as information about how to configure an AX.25 port is
-          contained in the AX25-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>. You also might want to
-          check out the file <file:Documentation/networking/ax25.txt>. More
-          information about digital amateur radio in general is on the WWW at
+          contained in the Linux Ham Wiki, available from
+          <http://www.linux-ax25.org>. You also might want to check out the
+          file <file:Documentation/networking/ax25.txt>. More information about
+          digital amateur radio in general is on the WWW at
           <http://www.tapr.org/tapr/html/pkthome.html>.
 
           To compile this driver as a module, choose M here: the
@@ -84,27 +97,25 @@ config NETROM
 config ROSE
         tristate "Amateur Radio X.25 PLP (Rose)"
         depends on AX25
-        ---help---
+        help
           The Packet Layer Protocol (PLP) is a way to route packets over X.25
           connections in general and amateur radio AX.25 connections in
           particular, essentially an alternative to NET/ROM.
 
           A comprehensive listing of all the software for Linux amateur radio
           users as well as information about how to configure an AX.25 port is
-          contained in the AX25-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.  You also might want to
-          check out the file <file:Documentation/networking/ax25.txt>. More
-          information about digital amateur radio in general is on the WWW at
+          contained in the Linux Ham Wiki, available from
+          <http://www.linux-ax25.org>.  You also might want to check out the
+          file <file:Documentation/networking/ax25.txt>. More information about
+          digital amateur radio in general is on the WWW at
           <http://www.tapr.org/tapr/html/pkthome.html>.
 
           To compile this driver as a module, choose M here: the
           module will be called rose.
 
-
 menu "AX.25 network device drivers"
-        depends on HAMRADIO && NET && AX25!=n
+        depends on HAMRADIO && AX25
 
 source "drivers/net/hamradio/Kconfig"
 
 endmenu
-
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 1c07c6a50eb8..6ded95272a53 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1127,22 +1127,22 @@ static int __must_check ax25_connect(struct socket *sock,
                 switch (sk->sk_state) {
                 case TCP_SYN_SENT: /* still trying */
                         err = -EINPROGRESS;
-                        goto out;
+                        goto out_release;
 
                 case TCP_ESTABLISHED: /* connection established */
                         sock->state = SS_CONNECTED;
-                        goto out;
+                        goto out_release;
 
                 case TCP_CLOSE: /* connection refused */
                         sock->state = SS_UNCONNECTED;
                         err = -ECONNREFUSED;
-                        goto out;
+                        goto out_release;
                 }
         }
 
         if (sk->sk_state == TCP_ESTABLISHED && sk->sk_type == SOCK_SEQPACKET) {
                 err = -EISCONN; /* No reconnect on a seqpacket socket */
-                goto out;
+                goto out_release;
         }
 
         sk->sk_state   = TCP_CLOSE;
@@ -1159,12 +1159,12 @@ static int __must_check ax25_connect(struct socket *sock,
                 /* Valid number of digipeaters ? */
                 if (fsa->fsa_ax25.sax25_ndigis < 1 || fsa->fsa_ax25.sax25_ndigis > AX25_MAX_DIGIS) {
                         err = -EINVAL;
-                        goto out;
+                        goto out_release;
                 }
 
                 if ((digi = kmalloc(sizeof(ax25_digi), GFP_KERNEL)) == NULL) {
                         err = -ENOBUFS;
-                        goto out;
+                        goto out_release;
                 }
 
                 digi->ndigi      = fsa->fsa_ax25.sax25_ndigis;
@@ -1194,7 +1194,7 @@ static int __must_check ax25_connect(struct socket *sock,
                         current->comm);
                 if ((err = ax25_rt_autobind(ax25, &fsa->fsa_ax25.sax25_call)) < 0) {
                         kfree(digi);
-                        goto out;
+                        goto out_release;
                 }
 
                 ax25_fillin_cb(ax25, ax25->ax25_dev);
@@ -1203,7 +1203,7 @@ static int __must_check ax25_connect(struct socket *sock,
                 if (ax25->ax25_dev == NULL) {
                         kfree(digi);
                         err = -EHOSTUNREACH;
-                        goto out;
+                        goto out_release;
                 }
         }
 
@@ -1213,7 +1213,7 @@ static int __must_check ax25_connect(struct socket *sock,
                 kfree(digi);
                 err = -EADDRINUSE;              /* Already such a connection */
                 ax25_cb_put(ax25t);
-                goto out;
+                goto out_release;
         }
 
         ax25->dest_addr = fsa->fsa_ax25.sax25_call;
@@ -1223,7 +1223,7 @@ static int __must_check ax25_connect(struct socket *sock,
         if (sk->sk_type != SOCK_SEQPACKET) {
                 sock->state = SS_CONNECTED;
                 sk->sk_state   = TCP_ESTABLISHED;
-                goto out;
+                goto out_release;
         }
 
         /* Move to connecting socket, ax.25 lapb WAIT_UA.. */
@@ -1255,55 +1255,53 @@ static int __must_check ax25_connect(struct socket *sock,
         /* Now the loop */
         if (sk->sk_state != TCP_ESTABLISHED && (flags & O_NONBLOCK)) {
                 err = -EINPROGRESS;
-                goto out;
+                goto out_release;
         }
 
         if (sk->sk_state == TCP_SYN_SENT) {
-                struct task_struct *tsk = current;
-                DECLARE_WAITQUEUE(wait, tsk);
+                DEFINE_WAIT(wait);
 
-                add_wait_queue(sk->sk_sleep, &wait);
                 for (;;) {
+                        prepare_to_wait(sk->sk_sleep, &wait,
+                                        TASK_INTERRUPTIBLE);
                         if (sk->sk_state != TCP_SYN_SENT)
                                 break;
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        release_sock(sk);
-                        if (!signal_pending(tsk)) {
+                        if (!signal_pending(current)) {
+                                release_sock(sk);
                                 schedule();
                                 lock_sock(sk);
                                 continue;
                         }
-                        current->state = TASK_RUNNING;
-                        remove_wait_queue(sk->sk_sleep, &wait);
-                        return -ERESTARTSYS;
+                        err = -ERESTARTSYS;
+                        break;
                 }
-                current->state = TASK_RUNNING;
-                remove_wait_queue(sk->sk_sleep, &wait);
+                finish_wait(sk->sk_sleep, &wait);
+
+                if (err)
+                        goto out_release;
         }
 
         if (sk->sk_state != TCP_ESTABLISHED) {
                 /* Not in ABM, not in WAIT_UA -> failed */
                 sock->state = SS_UNCONNECTED;
                 err = sock_error(sk);   /* Always set at this point */
-                goto out;
+                goto out_release;
         }
 
         sock->state = SS_CONNECTED;
 
-        err=0;
-out:
+        err = 0;
+out_release:
         release_sock(sk);
 
         return err;
 }
 
-
 static int ax25_accept(struct socket *sock, struct socket *newsock, int flags)
 {
-        struct task_struct *tsk = current;
-        DECLARE_WAITQUEUE(wait, tsk);
         struct sk_buff *skb;
         struct sock *newsk;
+        DEFINE_WAIT(wait);
         struct sock *sk;
         int err = 0;
 
@@ -1328,30 +1326,29 @@ static int ax25_accept(struct socket *sock, struct socket *newsock, int flags)
          *      The read queue this time is holding sockets ready to use
          *      hooked into the SABM we saved
          */
-        add_wait_queue(sk->sk_sleep, &wait);
         for (;;) {
+                prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
                 skb = skb_dequeue(&sk->sk_receive_queue);
                 if (skb)
                         break;
 
-                release_sock(sk);
-                current->state = TASK_INTERRUPTIBLE;
                 if (flags & O_NONBLOCK) {
-                        current->state = TASK_RUNNING;
-                        remove_wait_queue(sk->sk_sleep, &wait);
-                        return -EWOULDBLOCK;
+                        err = -EWOULDBLOCK;
+                        break;
                 }
-                if (!signal_pending(tsk)) {
+                if (!signal_pending(current)) {
+                        release_sock(sk);
                         schedule();
                         lock_sock(sk);
                         continue;
                 }
-                current->state = TASK_RUNNING;
-                remove_wait_queue(sk->sk_sleep, &wait);
-                return -ERESTARTSYS;
+                err = -ERESTARTSYS;
+                break;
         }
-        current->state = TASK_RUNNING;
-        remove_wait_queue(sk->sk_sleep, &wait);
+        finish_wait(sk->sk_sleep, &wait);
+
+        if (err)
+                goto out;
 
         newsk            = skb->sk;
         newsk->sk_socket = newsock;
@@ -1425,7 +1422,6 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock,
         struct sockaddr_ax25 sax;
         struct sk_buff *skb;
         ax25_digi dtmp, *dp;
-        unsigned char *asmptr;
         ax25_cb *ax25;
         size_t size;
         int lv, err, addr_len = msg->msg_namelen;
@@ -1548,13 +1544,11 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock,
                 goto out;
         }
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         /* Add the PID if one is not supplied by the user in the skb */
-        if (!ax25->pidincl) {
-                asmptr  = skb_push(skb, 1);
-                *asmptr = sk->sk_protocol;
-        }
+        if (!ax25->pidincl)
+                *skb_push(skb, 1) = sk->sk_protocol;
 
         SOCK_DEBUG(sk, "AX.25: Transmitting buffer\n");
 
@@ -1573,7 +1567,7 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock,
                 goto out;
         }
 
-        asmptr = skb_push(skb, 1 + ax25_addr_size(dp));
+        skb_push(skb, 1 + ax25_addr_size(dp));
 
         SOCK_DEBUG(sk, "Building AX.25 Header (dp=%p).\n", dp);
 
@@ -1581,17 +1575,17 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock,
                 SOCK_DEBUG(sk, "Num digipeaters=%d\n", dp->ndigi);
 
         /* Build an AX.25 header */
-        asmptr += (lv = ax25_addr_build(asmptr, &ax25->source_addr,
-                                        &sax.sax25_call, dp,
-                                        AX25_COMMAND, AX25_MODULUS));
+        lv = ax25_addr_build(skb->data, &ax25->source_addr, &sax.sax25_call,
+                             dp, AX25_COMMAND, AX25_MODULUS);
 
         SOCK_DEBUG(sk, "Built header (%d bytes)\n",lv);
 
-        skb->h.raw = asmptr;
+        skb_set_transport_header(skb, lv);
 
-        SOCK_DEBUG(sk, "base=%p pos=%p\n", skb->data, asmptr);
+        SOCK_DEBUG(sk, "base=%p pos=%p\n",
+                   skb->data, skb_transport_header(skb));
 
-        *asmptr = AX25_UI;
+        *skb_transport_header(skb) = AX25_UI;
 
         /* Datagram frames go straight out of the door as UI */
         ax25_queue_xmit(skb, ax25->ax25_dev->dev);
@@ -1631,8 +1625,8 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,
         if (!ax25_sk(sk)->pidincl)
                 skb_pull(skb, 1);               /* Remove PID */
 
-        skb->h.raw = skb->data;
-        copied     = skb->len;
+        skb_reset_transport_header(skb);
+        copied = skb->len;
 
         if (copied > size) {
                 copied = size;
@@ -1645,9 +1639,10 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,
                 struct sockaddr_ax25 *sax = (struct sockaddr_ax25 *)msg->msg_name;
                 ax25_digi digi;
                 ax25_address src;
+                const unsigned char *mac = skb_mac_header(skb);
 
-                ax25_addr_parse(skb->mac.raw+1, skb->data-skb->mac.raw-1, &src, NULL, &digi, NULL, NULL);
-
+                ax25_addr_parse(mac + 1, skb->data - mac - 1, &src, NULL,
+                                &digi, NULL, NULL);
                 sax->sax25_family = AF_AX25;
                 /* We set this correctly, even though we may not let the
                    application know the digi calls further down (because it
@@ -1711,6 +1706,10 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 res = sock_get_timestamp(sk, argp);
                 break;
 
+        case SIOCGSTAMPNS:
+                res = sock_get_timestampns(sk, argp);
+                break;
+
         case SIOCAX25ADDUID:    /* Add a uid to the uid/call map table */
         case SIOCAX25DELUID:    /* Delete a uid from the uid/call map table */
         case SIOCAX25GETUID: {
diff --git a/net/ax25/ax25_ds_subr.c b/net/ax25/ax25_ds_subr.c
index 9569dd3fa466..a49773ff2b92 100644
--- a/net/ax25/ax25_ds_subr.c
+++ b/net/ax25/ax25_ds_subr.c
@@ -136,7 +136,7 @@ static void ax25_kiss_cmd(ax25_dev *ax25_dev, unsigned char cmd, unsigned char p
         if ((skb = alloc_skb(2, GFP_ATOMIC)) == NULL)
                 return;
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
         p = skb_put(skb, 2);
 
         *p++ = cmd;
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
index 4a6b26becadc..0ddaff0df217 100644
--- a/net/ax25/ax25_in.c
+++ b/net/ax25/ax25_in.c
@@ -61,12 +61,14 @@ static int ax25_rx_fragment(ax25_cb *ax25, struct sk_buff *skb)
                                         skb_reserve(skbn, AX25_MAX_HEADER_LEN);
 
                                         skbn->dev   = ax25->ax25_dev->dev;
-                                        skbn->h.raw = skbn->data;
-                                        skbn->nh.raw = skbn->data;
+                                        skb_reset_network_header(skbn);
+                                        skb_reset_transport_header(skbn);
 
                                         /* Copy data from the fragments */
                                         while ((skbo = skb_dequeue(&ax25->frag_queue)) != NULL) {
-                                                memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
+                                                skb_copy_from_linear_data(skbo,
+                                                          skb_put(skbn, skbo->len),
+                                                                          skbo->len);
                                                 kfree_skb(skbo);
                                         }
 
@@ -122,8 +124,8 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)
                 }
 
                 skb_pull(skb, 1);       /* Remove PID */
-                skb->mac.raw  = skb->nh.raw;
-                skb->nh.raw   = skb->data;
+                skb_reset_mac_header(skb);
+                skb_reset_network_header(skb);
                 skb->dev      = ax25->ax25_dev->dev;
                 skb->pkt_type = PACKET_HOST;
                 skb->protocol = htons(ETH_P_IP);
@@ -196,7 +198,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
          *      Process the AX.25/LAPB frame.
          */
 
-        skb->h.raw = skb->data;
+        skb_reset_transport_header(skb);
 
         if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) {
                 kfree_skb(skb);
@@ -233,7 +235,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
 
         /* UI frame - bypass LAPB processing */
         if ((*skb->data & ~0x10) == AX25_UI && dp.lastrepeat + 1 == dp.ndigi) {
-                skb->h.raw = skb->data + 2;             /* skip control and pid */
+                skb_set_transport_header(skb, 2); /* skip control and pid */
 
                 ax25_send_to_raw(&dest, skb, skb->data[1]);
 
@@ -246,8 +248,8 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
                 switch (skb->data[1]) {
                 case AX25_P_IP:
                         skb_pull(skb,2);                /* drop PID/CTRL */
-                        skb->h.raw    = skb->data;
-                        skb->nh.raw   = skb->data;
+                        skb_reset_transport_header(skb);
+                        skb_reset_network_header(skb);
                         skb->dev      = dev;
                         skb->pkt_type = PACKET_HOST;
                         skb->protocol = htons(ETH_P_IP);
@@ -256,8 +258,8 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
 
                 case AX25_P_ARP:
                         skb_pull(skb,2);
-                        skb->h.raw    = skb->data;
-                        skb->nh.raw   = skb->data;
+                        skb_reset_transport_header(skb);
+                        skb_reset_network_header(skb);
                         skb->dev      = dev;
                         skb->pkt_type = PACKET_HOST;
                         skb->protocol = htons(ETH_P_ARP);
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
index 7f818bbcd1c5..930e4918037f 100644
--- a/net/ax25/ax25_ip.c
+++ b/net/ax25/ax25_ip.c
@@ -121,7 +121,7 @@ int ax25_rebuild_header(struct sk_buff *skb)
                 digipeat = route->digipeat;
                 dev = route->dev;
                 ip_mode = route->ip_mode;
-        };
+        }
 
         if (dev == NULL)
                 dev = skb->dev;
@@ -171,7 +171,7 @@ int ax25_rebuild_header(struct sk_buff *skb)
                         src_c = *(ax25_address *)(bp + 8);
 
                         skb_pull(ourskb, AX25_HEADER_LEN - 1);  /* Keep PID */
-                        ourskb->nh.raw = ourskb->data;
+                        skb_reset_network_header(ourskb);
 
                         ax25=ax25_send_frame(
                             ourskb,
diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c
index 223835092b7a..92b517af7260 100644
--- a/net/ax25/ax25_out.c
+++ b/net/ax25/ax25_out.c
@@ -148,8 +148,9 @@ void ax25_output(ax25_cb *ax25, int paclen, struct sk_buff *skb)
 
                         if (ka9qfrag == 1) {
                                 skb_reserve(skbn, frontlen + 2);
-                                skbn->nh.raw = skbn->data + (skb->nh.raw - skb->data);
-                                memcpy(skb_put(skbn, len), skb->data, len);
+                                skb_set_network_header(skbn,
+                                                      skb_network_offset(skb));
+                                skb_copy_from_linear_data(skb, skb_put(skbn, len), len);
                                 p = skb_push(skbn, 2);
 
                                 *p++ = AX25_P_SEGMENT;
@@ -161,8 +162,9 @@ void ax25_output(ax25_cb *ax25, int paclen, struct sk_buff *skb)
                                 }
                         } else {
                                 skb_reserve(skbn, frontlen + 1);
-                                skbn->nh.raw = skbn->data + (skb->nh.raw - skb->data);
-                                memcpy(skb_put(skbn, len), skb->data, len);
+                                skb_set_network_header(skbn,
+                                                      skb_network_offset(skb));
+                                skb_copy_from_linear_data(skb, skb_put(skbn, len), len);
                                 p = skb_push(skbn, 1);
                                 *p = AX25_P_TEXT;
                         }
@@ -205,7 +207,7 @@ static void ax25_send_iframe(ax25_cb *ax25, struct sk_buff *skb, int poll_bit)
         if (skb == NULL)
                 return;
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         if (ax25->modulus == AX25_MODULUS) {
                 frame = skb_push(skb, 1);
diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
index b6c577e3c914..5fe9b2a6697d 100644
--- a/net/ax25/ax25_subr.c
+++ b/net/ax25/ax25_subr.c
@@ -162,7 +162,7 @@ void ax25_send_control(ax25_cb *ax25, int frametype, int poll_bit, int type)
 
         skb_reserve(skb, ax25->ax25_dev->dev->hard_header_len);
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         /* Assume a response - address structure for DTE */
         if (ax25->modulus == AX25_MODULUS) {
@@ -205,7 +205,7 @@ void ax25_return_dm(struct net_device *dev, ax25_address *src, ax25_address *des
                 return; /* Next SABM will get DM'd */
 
         skb_reserve(skb, dev->hard_header_len);
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         ax25_digi_invert(digi, &retdigi);