[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20131223223005.GQ14073@order.stressinduktion.org>
Date: Mon, 23 Dec 2013 23:30:05 +0100
From: Hannes Frederic Sowa <hannes@...essinduktion.org>
To: Salam Noureddine <noureddine@...stanetworks.com>
Cc: "David S. Miller" <davem@...emloft.net>,
Alexey Kuznetsov <kuznet@....inr.ac.ru>,
James Morris <jmorris@...ei.org>,
Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
Patrick McHardy <kaber@...sh.net>, netdev@...r.kernel.org
Subject: Re: [PATCH 1/1] ipv4: arp: update neighbour address when a gratuitous arp is received and arp_accept is set
On Mon, Dec 23, 2013 at 11:21:32AM -0800, Salam Noureddine wrote:
> @@ -910,7 +913,9 @@ static int arp_process(struct sk_buff *skb)
> agents are active. Taking the first reply prevents
> arp trashing and chooses the fastest router.
> */
> - override = time_after(jiffies, n->updated + n->parms->locktime);
> + override = time_after(jiffies,
> + n->updated + n->parms->locktime) ||
> + is_garp;
Your patch is fine, but you need to rebase it again on net-next.
n->parms->locktime has been since updated to NEIGH_VAR(n->parms, LOCKTIME)
and thus this patch does not apply to net-next any more.
Greetings,
Hannes
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists