diff options
Diffstat (limited to 'net/802/hippi.c')
-rw-r--r-- | net/802/hippi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/802/hippi.c b/net/802/hippi.c index 578f2a3d692d..87ffc12b6891 100644 --- a/net/802/hippi.c +++ b/net/802/hippi.c | |||
@@ -60,7 +60,7 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev, | |||
60 | * Due to the stupidity of the little endian byte-order we | 60 | * Due to the stupidity of the little endian byte-order we |
61 | * have to set the fp field this way. | 61 | * have to set the fp field this way. |
62 | */ | 62 | */ |
63 | hip->fp.fixed = __constant_htonl(0x04800018); | 63 | hip->fp.fixed = htonl(0x04800018); |
64 | hip->fp.d2_size = htonl(len + 8); | 64 | hip->fp.d2_size = htonl(len + 8); |
65 | hip->le.fc = 0; | 65 | hip->le.fc = 0; |
66 | hip->le.double_wide = 0; /* only HIPPI 800 for the time being */ | 66 | hip->le.double_wide = 0; /* only HIPPI 800 for the time being */ |
@@ -104,7 +104,7 @@ static int hippi_rebuild_header(struct sk_buff *skb) | |||
104 | * Only IP is currently supported | 104 | * Only IP is currently supported |
105 | */ | 105 | */ |
106 | 106 | ||
107 | if(hip->snap.ethertype != __constant_htons(ETH_P_IP)) | 107 | if(hip->snap.ethertype != htons(ETH_P_IP)) |
108 | { | 108 | { |
109 | printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n",skb->dev->name,ntohs(hip->snap.ethertype)); | 109 | printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n",skb->dev->name,ntohs(hip->snap.ethertype)); |
110 | return 0; | 110 | return 0; |
@@ -126,14 +126,14 @@ __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
126 | { | 126 | { |
127 | struct hippi_hdr *hip; | 127 | struct hippi_hdr *hip; |
128 | 128 | ||
129 | hip = (struct hippi_hdr *) skb->data; | ||
130 | |||
131 | /* | 129 | /* |
132 | * This is actually wrong ... question is if we really should | 130 | * This is actually wrong ... question is if we really should |
133 | * set the raw address here. | 131 | * set the raw address here. |
134 | */ | 132 | */ |
135 | skb->mac.raw = skb->data; | 133 | skb->dev = dev; |
136 | skb_pull(skb, HIPPI_HLEN); | 134 | skb_reset_mac_header(skb); |
135 | hip = (struct hippi_hdr *)skb_mac_header(skb); | ||
136 | skb_pull(skb, HIPPI_HLEN); | ||
137 | 137 | ||
138 | /* | 138 | /* |
139 | * No fancy promisc stuff here now. | 139 | * No fancy promisc stuff here now. |