diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2005-07-12 21:08:43 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-07-12 21:08:43 +0200 |
commit | ab611487d8ada506e511d2b8f22fb8e7be9939b9 (patch) | |
tree | caa87031e209e8845f84209b69c6c8225def945f /net/wanrouter | |
parent | [NETFILTER]: Revert nf_reset change (diff) | |
download | linux-ab611487d8ada506e511d2b8f22fb8e7be9939b9.tar.xz linux-ab611487d8ada506e511d2b8f22fb8e7be9939b9.zip |
[NET]: __be'ify *_type_trans()
tr_type_trans(), hippi_type_trans() left as-is.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wanrouter')
-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, */ -unsigned short wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) +__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) { int cnt = skb->data[0] ? 0 : 1; /* there may be a pad present */ - unsigned short ethertype; + __be16 ethertype; switch (skb->data[cnt]) { case NLPID_IP: /* IP datagramm */ @@ -379,7 +379,7 @@ unsigned short wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) skb->data[cnt+3], dev->name); return 0; } - ethertype = *((unsigned short*)&skb->data[cnt+4]); + ethertype = *((__be16*)&skb->data[cnt+4]); cnt += 6; break; |