2 files changed, 3 insertions, 4 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index cc07c3be2705..8ea8a8b70755 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -237,8 +237,7 @@ struct netdev_hw_addr_list {
         netdev_hw_addr_list_for_each(ha, &(dev)->mc)
 
 struct hh_cache {
-        u16             hh_len;
-        u16             __pad;
+        unsigned int    hh_len;
         seqlock_t       hh_lock;
 
         /* cached hardware header; allow for machine alignment needs.        */
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 9496179c7b4e..e4dd3a214034 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -450,7 +450,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
 static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb)
 {
         unsigned int seq;
-        int hh_len;
+        unsigned int hh_len;
 
         do {
                 seq = read_seqbegin(&hh->hh_lock);
@@ -459,7 +459,7 @@ static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb
                         /* this is inlined by gcc */
                         memcpy(skb->data - HH_DATA_MOD, hh->hh_data, HH_DATA_MOD);
                 } else {
-                        int hh_alen = HH_DATA_ALIGN(hh_len);
+                        unsigned int hh_alen = HH_DATA_ALIGN(hh_len);
 
                         memcpy(skb->data - hh_alen, hh->hh_data, hh_alen);
                 }