diff options
-rw-r--r-- | include/linux/netdevice.h | 2 | ||||
-rw-r--r-- | include/net/dst.h | 2 | ||||
-rw-r--r-- | net/core/neighbour.c | 2 | ||||
-rw-r--r-- | net/ethernet/eth.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 13d6d4eb8b3a..9264139bd8df 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -187,7 +187,7 @@ struct hh_cache | |||
187 | { | 187 | { |
188 | struct hh_cache *hh_next; /* Next entry */ | 188 | struct hh_cache *hh_next; /* Next entry */ |
189 | atomic_t hh_refcnt; /* number of users */ | 189 | atomic_t hh_refcnt; /* number of users */ |
190 | unsigned short hh_type; /* protocol identifier, f.e ETH_P_IP | 190 | __be16 hh_type; /* protocol identifier, f.e ETH_P_IP |
191 | * NOTE: For VLANs, this will be the | 191 | * NOTE: For VLANs, this will be the |
192 | * encapuslated type. --BLG | 192 | * encapuslated type. --BLG |
193 | */ | 193 | */ |
diff --git a/include/net/dst.h b/include/net/dst.h index a8d825f90305..e156e38e4ac3 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
@@ -84,7 +84,7 @@ struct dst_entry | |||
84 | struct dst_ops | 84 | struct dst_ops |
85 | { | 85 | { |
86 | unsigned short family; | 86 | unsigned short family; |
87 | unsigned short protocol; | 87 | __be16 protocol; |
88 | unsigned gc_thresh; | 88 | unsigned gc_thresh; |
89 | 89 | ||
90 | int (*gc)(void); | 90 | int (*gc)(void); |
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index b6c69e1463e8..8ce8c471d868 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
@@ -1079,7 +1079,7 @@ struct neighbour *neigh_event_ns(struct neigh_table *tbl, | |||
1079 | } | 1079 | } |
1080 | 1080 | ||
1081 | static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst, | 1081 | static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst, |
1082 | u16 protocol) | 1082 | __be16 protocol) |
1083 | { | 1083 | { |
1084 | struct hh_cache *hh; | 1084 | struct hh_cache *hh; |
1085 | struct net_device *dev = dst->dev; | 1085 | struct net_device *dev = dst->dev; |
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 43863933f27f..4bd78c8cfb26 100644 --- 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) | |||
223 | */ | 223 | */ |
224 | int eth_header_cache(struct neighbour *neigh, struct hh_cache *hh) | 224 | int eth_header_cache(struct neighbour *neigh, struct hh_cache *hh) |
225 | { | 225 | { |
226 | unsigned short type = hh->hh_type; | 226 | __be16 type = hh->hh_type; |
227 | struct ethhdr *eth; | 227 | struct ethhdr *eth; |
228 | struct net_device *dev = neigh->dev; | 228 | struct net_device *dev = neigh->dev; |
229 | 229 | ||