1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index cda37be02f8d..a0124eb7dbea 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -475,8 +475,7 @@ int arp_find(unsigned char *haddr, struct sk_buff *skb)
                 return 1;
         }
 
-        paddr = skb_rtable(skb)->rt_gateway;
-
+        paddr = rt_nexthop(skb_rtable(skb), ip_hdr(skb)->daddr);
         if (arp_set_predefined(inet_addr_type(dev_net(dev), paddr), haddr,
                                paddr, dev))
                 return 0;
@@ -790,7 +789,8 @@ static int arp_process(struct sk_buff *skb)
  *      Check for bad requests for 127.x.x.x and requests for multicast
  *      addresses.  If this is one such, delete it.
  */
-        if (ipv4_is_loopback(tip) || ipv4_is_multicast(tip))
+        if (ipv4_is_multicast(tip) ||
+            (!IN_DEV_ROUTE_LOCALNET(in_dev) && ipv4_is_loopback(tip)))
                 goto out;
 
 /*
@@ -827,7 +827,7 @@ static int arp_process(struct sk_buff *skb)
         }
 
         if (arp->ar_op == htons(ARPOP_REQUEST) &&
-            ip_route_input_noref(skb, tip, sip, 0, dev) == 0) {
+            ip_route_input(skb, tip, sip, 0, dev) == 0) {
 
                 rt = skb_rtable(skb);
                 addr_type = rt->rt_type;