| Message ID | 1497106547.736.104.camel@edumazet-glaptop3.roam.corp.google.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On 06/10/2017 07:55 AM, Eric Dumazet wrote: > On Fri, 2017-06-09 at 12:56 -0700, Chenbo Feng wrote: >> From: Chenbo Feng <fengc@google.com> >> >> This reverts commit 97a7a37a7b7b("ipv6: Initial skb->dev and >> skb->protocol in ip6_output") since it does not handles the >> skb->dev assignment inside ip6_fragment() code path properly. >> Need to rework and upload again > We can avoid the revert I believe the patch is fine after analysis. > > Please submit this followup, thanks ! : > > diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c > index 02cd44f0953900108701895108b2fdaa9f9980e5..0d6f3b6345de26c329ae1d6f25dde652a5452d4b 100644 > --- a/net/ipv6/ip6_output.c > +++ b/net/ipv6/ip6_output.c > @@ -869,7 +869,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, > if (skb->sk && dst_allfrag(skb_dst(skb))) > sk_nocaps_add(skb->sk, NETIF_F_GSO_MASK); > > - skb->dev = skb_dst(skb)->dev; > icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu); > err = -EMSGSIZE; > > > > Thanks for the help! Patch submitted here: http://patchwork.ozlabs.org/patch/774260/
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 02cd44f0953900108701895108b2fdaa9f9980e5..0d6f3b6345de26c329ae1d6f25dde652a5452d4b 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -869,7 +869,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, if (skb->sk && dst_allfrag(skb_dst(skb))) sk_nocaps_add(skb->sk, NETIF_F_GSO_MASK); - skb->dev = skb_dst(skb)->dev; icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu); err = -EMSGSIZE;