From: "John W. Linville" <linville@tuxdriver.com>
To: Jesse Gross <jesse@nicira.com>
Cc: netdev <netdev@vger.kernel.org>, David Miller <davem@davemloft.net>
Subject: Re: [PATCH] geneve: remove use of internal IP header when calling IP_ECN_decapsulate
Date: Thu, 17 Sep 2015 16:17:01 -0400 [thread overview]
Message-ID: <20150917201701.GG25806@tuxdriver.com> (raw)
In-Reply-To: <CAEP_g=8Hjcae1zrzV2--j6J3rsXfZmexnGsziA3OTmezdLtbkA@mail.gmail.com>
On Thu, Sep 17, 2015 at 12:46:48PM -0700, Jesse Gross wrote:
> On Thu, Sep 17, 2015 at 10:17 AM, John W. Linville
> <linville@tuxdriver.com> wrote:
> > diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
> > index da3259ce7c8d..a917ae1cfbf3 100644
> > --- a/drivers/net/geneve.c
> > +++ b/drivers/net/geneve.c
> > @@ -178,13 +178,15 @@ static void geneve_rx(struct geneve_sock *gs, struct sk_buff *skb)
> >
> > skb_reset_network_header(skb);
> >
> > - iph = ip_hdr(skb); /* Now inner IP header... */
> > - err = IP_ECN_decapsulate(iph, skb);
> > + if (iph)
> > + err = IP_ECN_decapsulate(iph, skb);
>
> It looks like this is now conditional based on !collect_md. I'm not
> sure that we want to have a difference in behavior between the two.
Sure, I can move the iph assignment higher-up and keep the other bits unconditional.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2015-09-17 20:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-17 17:17 [PATCH] geneve: remove use of internal IP header when calling IP_ECN_decapsulate John W. Linville
2015-09-17 19:46 ` Jesse Gross
2015-09-17 20:17 ` John W. Linville [this message]
2015-09-17 20:34 ` [PATCH v2] " John W. Linville
2015-09-18 20:30 ` Jesse Gross
2015-09-18 20:40 ` John W. Linville
2015-09-18 21:49 ` Jesse Gross
2015-09-19 1:36 ` John W. Linville
2015-09-19 2:19 ` Jesse Gross
2015-09-21 5:24 ` David Miller
2015-09-21 14:04 ` John W. Linville
2015-09-21 14:29 ` [PATCH v3] geneve: ensure ECN info is handled properly in all tx/rx paths John W. Linville
2015-09-22 1:11 ` Jesse Gross
2015-09-22 23:50 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150917201701.GG25806@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=jesse@nicira.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).