diff options
Diffstat (limited to 'net/wanrouter/wanmain.c')
-rw-r--r-- | net/wanrouter/wanmain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index d6844ac226f5..13b650ad22e2 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c | |||
@@ -358,10 +358,10 @@ int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev, | |||
358 | */ | 358 | */ |
359 | 359 | ||
360 | 360 | ||
361 | unsigned short wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) | 361 | __be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) |
362 | { | 362 | { |
363 | int cnt = skb->data[0] ? 0 : 1; /* there may be a pad present */ | 363 | int cnt = skb->data[0] ? 0 : 1; /* there may be a pad present */ |
364 | unsigned short ethertype; | 364 | __be16 ethertype; |
365 | 365 | ||
366 | switch (skb->data[cnt]) { | 366 | switch (skb->data[cnt]) { |
367 | case NLPID_IP: /* IP datagramm */ | 367 | case NLPID_IP: /* IP datagramm */ |
@@ -379,7 +379,7 @@ unsigned short wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
379 | skb->data[cnt+3], dev->name); | 379 | skb->data[cnt+3], dev->name); |
380 | return 0; | 380 | return 0; |
381 | } | 381 | } |
382 | ethertype = *((unsigned short*)&skb->data[cnt+4]); | 382 | ethertype = *((__be16*)&skb->data[cnt+4]); |
383 | cnt += 6; | 383 | cnt += 6; |
384 | break; | 384 | break; |
385 | 385 | ||