diff options
Diffstat (limited to 'net/802')
-rw-r--r-- | net/802/tr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/802/tr.c b/net/802/tr.c index d7d8f40c4fed..829deb41ce81 100644 --- a/net/802/tr.c +++ b/net/802/tr.c | |||
@@ -164,7 +164,7 @@ static int tr_rebuild_header(struct sk_buff *skb) | |||
164 | */ | 164 | */ |
165 | 165 | ||
166 | if(trllc->ethertype != htons(ETH_P_IP)) { | 166 | if(trllc->ethertype != htons(ETH_P_IP)) { |
167 | printk("tr_rebuild_header: Don't know how to resolve type %04X addresses ?\n",(unsigned int)htons(trllc->ethertype)); | 167 | printk("tr_rebuild_header: Don't know how to resolve type %04X addresses ?\n", ntohs(trllc->ethertype)); |
168 | return 0; | 168 | return 0; |
169 | } | 169 | } |
170 | 170 | ||
@@ -186,7 +186,7 @@ static int tr_rebuild_header(struct sk_buff *skb) | |||
186 | * it via SNAP. | 186 | * it via SNAP. |
187 | */ | 187 | */ |
188 | 188 | ||
189 | unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev) | 189 | __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev) |
190 | { | 190 | { |
191 | 191 | ||
192 | struct trh_hdr *trh=(struct trh_hdr *)skb->data; | 192 | struct trh_hdr *trh=(struct trh_hdr *)skb->data; |
@@ -229,15 +229,15 @@ unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
229 | */ | 229 | */ |
230 | 230 | ||
231 | if (trllc->dsap == EXTENDED_SAP && | 231 | if (trllc->dsap == EXTENDED_SAP && |
232 | (trllc->ethertype == ntohs(ETH_P_IP) || | 232 | (trllc->ethertype == htons(ETH_P_IP) || |
233 | trllc->ethertype == ntohs(ETH_P_IPV6) || | 233 | trllc->ethertype == htons(ETH_P_IPV6) || |
234 | trllc->ethertype == ntohs(ETH_P_ARP))) | 234 | trllc->ethertype == htons(ETH_P_ARP))) |
235 | { | 235 | { |
236 | skb_pull(skb, sizeof(struct trllc)); | 236 | skb_pull(skb, sizeof(struct trllc)); |
237 | return trllc->ethertype; | 237 | return trllc->ethertype; |
238 | } | 238 | } |
239 | 239 | ||
240 | return ntohs(ETH_P_TR_802_2); | 240 | return htons(ETH_P_TR_802_2); |
241 | } | 241 | } |
242 | 242 | ||
243 | /* | 243 | /* |