2 files changed, 16 insertions, 8 deletions

diff --git a/include/net/dst.h b/include/net/dst.h
index baf597890064..77f52f7dc823 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -396,11 +396,15 @@ static inline void dst_confirm(struct dst_entry *dst)
 static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
                                    struct sk_buff *skb)
 {
-        struct hh_cache *hh;
+        const struct hh_cache *hh;
+
+        if (dst->pending_confirm) {
+                unsigned long now = jiffies;
 
-        if (unlikely(dst->pending_confirm)) {
-                n->confirmed = jiffies;
                 dst->pending_confirm = 0;
+                /* avoid dirtying neighbour */
+                if (n->confirmed != now)
+                        n->confirmed = now;
         }
 
         hh = &n->hh;
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 344d8988842a..0dab173e27da 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -334,18 +334,22 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
 }
 #endif
 
-static inline int neigh_hh_output(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;
 
         do {
-                int hh_alen;
-
                 seq = read_seqbegin(&hh->hh_lock);
                 hh_len = hh->hh_len;
-                hh_alen = HH_DATA_ALIGN(hh_len);
-                memcpy(skb->data - hh_alen, hh->hh_data, hh_alen);
+                if (likely(hh_len <= HH_DATA_MOD)) {
+                        /* 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);
+
+                        memcpy(skb->data - hh_alen, hh->hh_data, hh_alen);
+                }
         } while (read_seqretry(&hh->hh_lock, seq));
 
         skb_push(skb, hh_len);