Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux13...

[linux-2.6-omap-h63xx.git] / net / 802 / hippi.c

diff --git a/net/802/hippi.c b/net/802/hippi.c
index 138302c14ee605c84cca9fa3760c0826b91d1f42..87ffc12b6891826232ebba946f29c101e3b4b2dc 100644 (file)
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -131,8 +131,8 @@ __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
         * set the raw address here.
         */
        skb->dev = dev;
-       skb->mac.raw = skb->data;
-       hip = (struct hippi_hdr *)skb->mac.raw;
+       skb_reset_mac_header(skb);
+       hip = (struct hippi_hdr *)skb_mac_header(skb);
        skb_pull(skb, HIPPI_HLEN);
 
        /*