2 files changed, 4 insertions, 1 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 96b1a749abb..b142a0d7607 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1210,7 +1210,9 @@ int neigh_resolve_output(struct sk_buff *skb)
         if (!neigh_event_send(neigh, skb)) {
                 int err;
                 struct net_device *dev = neigh->dev;
-                if (dev->header_ops->cache && !dst->hh) {
+                if (dev->header_ops->cache &&
+                    !dst->hh &&
+                    !(dst->flags & DST_NOCACHE)) {
                         write_lock_bh(&neigh->lock);
                         if (!dst->hh)
                                 neigh_hh_init(neigh, dst, dst->ops->protocol);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index a61acea975f..c3cb8bd2363 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1107,6 +1107,7 @@ restart:
                  * on the route gc list.
                  */
 
+                rt->dst.flags |= DST_NOCACHE;
                 if (rt->rt_type == RTN_UNICAST || rt->fl.iif == 0) {
                         int err = arp_bind_neighbour(&rt->dst);
                         if (err) {