Merge branch 'pandora-27-omap1' into rev2

[pandora-kernel.git] / net / ax25 / ax25_ds_subr.c

diff --git a/net/ax25/ax25_ds_subr.c b/net/ax25/ax25_ds_subr.c
index 9569dd3..b5e5978 100644 (file)
--- a/net/ax25/ax25_ds_subr.c
+++ b/net/ax25/ax25_ds_subr.c
@@ -41,7 +41,7 @@ void ax25_ds_enquiry_response(ax25_cb *ax25)
        ax25_cb *ax25o;
        struct hlist_node *node;
 
-       /* Please note that neither DK4EG´s nor DG2FEF´s
+       /* Please note that neither DK4EG's nor DG2FEF's
         * DAMA spec mention the following behaviour as seen
         * with TheFirmware:
         *
@@ -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;