Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[sfrench/cifs-2.6.git] / net / ax25 / ax25_subr.c

diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
index c41dbe5fadee53867d98e24967ce96f942a32c18..5fe9b2a6697d117af0c0ee77e8c7cc46c2d8e7b7 100644 (file)
--- a/net/ax25/ax25_subr.c
+++ b/net/ax25/ax25_subr.c
@@ -14,7 +14,6 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>
@@ -56,7 +55,7 @@ void ax25_frames_acked(ax25_cb *ax25, unsigned short nr)
         */
        if (ax25->va != nr) {
                while (skb_peek(&ax25->ack_queue) != NULL && ax25->va != nr) {
-                       skb = skb_dequeue(&ax25->ack_queue);
+                       skb = skb_dequeue(&ax25->ack_queue);
                        kfree_skb(skb);
                        ax25->va = (ax25->va + 1) % ax25->modulus;
                }
@@ -65,7 +64,7 @@ void ax25_frames_acked(ax25_cb *ax25, unsigned short nr)
 
 void ax25_requeue_frames(ax25_cb *ax25)
 {
-        struct sk_buff *skb, *skb_prev = NULL;
+       struct sk_buff *skb, *skb_prev = NULL;
 
        /*
         * Requeue all the un-ack-ed frames on the output queue to be picked
@@ -163,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) {
@@ -206,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);