diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2005-07-12 12:08:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-12 12:08:43 -0700 |
| commit | ab611487d8ada506e511d2b8f22fb8e7be9939b9 (patch) | |
| tree | caa87031e209e8845f84209b69c6c8225def945f /net | |
| parent | 84531c24f27b02daa8e54e2bb6dc74a730fdf0a5 (diff) | |
| download | op-kernel-dev-ab611487d8ada506e511d2b8f22fb8e7be9939b9.zip op-kernel-dev-ab611487d8ada506e511d2b8f22fb8e7be9939b9.tar.gz | |
[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')
| -rw-r--r-- | net/802/fddi.c | 4 | ||||
| -rw-r--r-- | net/atm/br2684.c | 3 | ||||
| -rw-r--r-- | net/ethernet/eth.c | 2 | ||||
| -rw-r--r-- | net/wanrouter/wanmain.c | 6 |
4 files changed, 7 insertions, 8 deletions
diff --git a/net/802/fddi.c b/net/802/fddi.c index ebcf483..5ce24c4 100644 --- a/net/802/fddi.c +++ b/net/802/fddi.c @@ -122,10 +122,10 @@ static int fddi_rebuild_header(struct sk_buff *skb) * the proper pointer to the start of packet data (skb->data). */ -unsigned short fddi_type_trans(struct sk_buff *skb, struct net_device *dev) +__be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev) { struct fddihdr *fddi = (struct fddihdr *)skb->data; - unsigned short type; + __be16 type; /* * Set mac.raw field to point to FC byte, set data field to point diff --git a/net/atm/br2684.c b/net/atm/br2684.c index e6954cf..289956c 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c @@ -289,8 +289,7 @@ xmit will add the additional header part in that case */ * This is similar to eth_type_trans, which cannot be used because of * our dev->hard_header_len */ -static inline unsigned short br_type_trans(struct sk_buff *skb, - struct net_device *dev) +static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev) { struct ethhdr *eth; unsigned char *rawp; diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index ab60ea6..f6dbfb9 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -155,7 +155,7 @@ int eth_rebuild_header(struct sk_buff *skb) * This is normal practice and works for any 'now in use' protocol. */ -unsigned short eth_type_trans(struct sk_buff *skb, struct net_device *dev) +__be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) { struct ethhdr *eth; unsigned char *rawp; diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index d6844ac..13b650a 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; |
