diff --git a/[refs] b/[refs] index 52b85fca562e..0603530eb327 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8659255c599ba497bcfb8b4abc187d9e0951d99 +refs/heads/master: 205902ecc7bcb2a007ed27bb3518e8f70e5d113e diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index ac11d73be4ce..b25bd02720d3 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -503,7 +503,7 @@ static inline void *netdev_priv(struct net_device *dev) #define SET_NETDEV_DEV(net, pdev) ((net)->class_dev.dev = (pdev)) struct packet_type { - unsigned short type; /* This is really htons(ether_type). */ + __be16 type; /* This is really htons(ether_type). */ struct net_device *dev; /* NULL is wildcarded here */ int (*func) (struct sk_buff *, struct net_device *, struct packet_type *);