On Thu, Sep 17, 2015 at 10:17 AM, John W. Linville <linvi...@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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
