X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fatm%2Fbr2684.c;h=289956c4dd3e8c1bc1501e9ed429a3f2de272ce8;hb=ef88b7dba2b47c70037a34a599d383462bb74bd3;hp=e6954cf1459d1da367226ff0f5b954daa0d4e45e;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=linux-2.6

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index e6954cf145..289956c4dd 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;