[NET]: Annotate dst_ops protocol

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 13d6d4eb8b3af70b008be76f6fcf3fc23dc602cb..9264139bd8df0ee171c2d52531fa626720c42a1f 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -187,7 +187,7 @@ struct hh_cache
 {
        struct hh_cache *hh_next;       /* Next entry                        */
        atomic_t        hh_refcnt;      /* number of users                   */
-       unsigned short  hh_type;        /* protocol identifier, f.e ETH_P_IP
+       __be16          hh_type;        /* protocol identifier, f.e ETH_P_IP
                                          *  NOTE:  For VLANs, this will be the
                                          *  encapuslated type. --BLG
                                          */

diff --git a/include/net/dst.h b/include/net/dst.h
index a8d825f90305a751447c207d140853c9bf79c523..e156e38e4ac37db61db754822e59877299e2f9a0 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -84,7 +84,7 @@ struct dst_entry
 struct dst_ops
 {
        unsigned short          family;
-       unsigned short          protocol;
+       __be16                  protocol;
        unsigned                gc_thresh;
 
        int                     (*gc)(void);

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index b6c69e1463e87f0dc756022ade88e52e4062dea0..8ce8c471d8687427ad2b88acf5d33a17a874bbbc 100644 (file)
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1079,7 +1079,7 @@ struct neighbour *neigh_event_ns(struct neigh_table *tbl,
 }
 
 static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst,
-                         u16 protocol)
+                         __be16 protocol)
 {
        struct hh_cache *hh;
        struct net_device *dev = dst->dev;

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 43863933f27f92dc0c6f09556dfee953fab08704..4bd78c8cfb26fe9f229813613a14b0548de3a4d1 100644 (file)
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -223,7 +223,7 @@ static int eth_header_parse(struct sk_buff *skb, unsigned char *haddr)
  */
 int eth_header_cache(struct neighbour *neigh, struct hh_cache *hh)
 {
-       unsigned short type = hh->hh_type;
+       __be16 type = hh->hh_type;
        struct ethhdr *eth;
        struct net_device *dev = neigh->dev;