From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964916AbcJGQiT (ORCPT ); Fri, 7 Oct 2016 12:38:19 -0400 Received: from mail-lf0-f53.google.com ([209.85.215.53]:33353 "EHLO mail-lf0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964851AbcJGQiK (ORCPT ); Fri, 7 Oct 2016 12:38:10 -0400 Subject: Re: [PATCH] net: Reset skb to network header in neigh_hh_output To: Abdelrhman Ahmed , davem References: <1579f7f0f4f.114457ec828613.4349884782265574217@abahmed.com> <572cddd1-6a03-4c83-1e0e-55be37273396@cogentembedded.com> Cc: netdev , linux-kernel From: Sergei Shtylyov Organization: Cogent Embedded Message-ID: Date: Fri, 7 Oct 2016 19:38:06 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <572cddd1-6a03-4c83-1e0e-55be37273396@cogentembedded.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/07/2016 07:27 PM, Sergei Shtylyov wrote: >> When hardware header is added without using cached one, neigh_resolve_output >> and neigh_connected_output reset skb to network header before adding it. >> When cached one is used, neigh_hh_output does not reset the skb to network >> header. >> >> The fix is to reset skb to network header before adding cached hardware header >> to keep the behavior consistent in all cases. >> >> Signed-off-by: Abdelrhman Ahmed >> --- >> include/net/neighbour.h | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/include/net/neighbour.h b/include/net/neighbour.h >> index 8b68384..4d89fc2 100644 >> --- a/include/net/neighbour.h >> +++ b/include/net/neighbour.h >> @@ -424,7 +424,7 @@ static inline struct neighbour * neigh_clone(struct >> neighbour *neigh) >> static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff >> *skb) >> { >> unsigned long now = jiffies; >> - >> + > > Unraleted white-space change. And I thought I fixed this word... it's "unrelated" of/c. :-) > >> if (neigh->used != now) >> neigh->used = now; >> if (!(neigh->nud_state&(NUD_CONNECTED|NUD_DELAY|NUD_PROBE))) > [...] MBR, Sergei