Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[powerpc.git] / net / ax25 / ax25_ds_subr.c

diff --git a/net/ax25/ax25_ds_subr.c b/net/ax25/ax25_ds_subr.c
index 4d22d44..a49773f 100644 (file)
--- a/net/ax25/ax25_ds_subr.c
+++ b/net/ax25/ax25_ds_subr.c
@@ -12,7 +12,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>
@@ -137,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;