| Message ID | 20181221205726.2924-1-fw@strlen.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] staging: octeon: fix build failure with XFRM enabled | expand |
Hello! On 21.12.2018 23:57, Florian Westphal wrote: > skb->sp doesn't exist anymore in the next-next tree, so mips defconfig It's net-next. :-) > no longer builds. Use helper instead to reset the secpath. > > Not even compile tested. > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Reported-by: Guenter Roeck <linux@roeck-us.net> > Fixes: 4165079ba328d ("net: switch secpath to use skb extension infrastructure") > Signed-off-by: Florian Westphal <fw@strlen.de> [...] MBR, Sergei
From: Florian Westphal <fw@strlen.de> Date: Fri, 21 Dec 2018 21:57:26 +0100 > skb->sp doesn't exist anymore in the next-next tree, so mips defconfig > no longer builds. Use helper instead to reset the secpath. > > Not even compile tested. > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Reported-by: Guenter Roeck <linux@roeck-us.net> > Fixes: 4165079ba328d ("net: switch secpath to use skb extension infrastructure") > Signed-off-by: Florian Westphal <fw@strlen.de> > --- > Greg, David: > > The patch will not break build for a tree that lacks the 'Fixes' > commit, so this can also go in via staging tree. > OTOH, net-next build is broken for mips/octeon, so I think in > this case net-next might make more sense? Yeah I agree, that net-next is probably the best place for this. Because I know that Linus is sensitive to situations where he is sent a pull request, and then what he pulls doesn't match the pull request shortlog etc. I have asked him how he would let me handle this. That's the only reason I haven't integrated this yet. Just FYI!
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index df3441b815bb..317c9720467c 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -359,8 +359,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) dst_release(skb_dst(skb)); skb_dst_set(skb, NULL); #ifdef CONFIG_XFRM - secpath_put(skb->sp); - skb->sp = NULL; + secpath_reset(skb); #endif nf_reset(skb);
skb->sp doesn't exist anymore in the next-next tree, so mips defconfig no longer builds. Use helper instead to reset the secpath. Not even compile tested. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reported-by: Guenter Roeck <linux@roeck-us.net> Fixes: 4165079ba328d ("net: switch secpath to use skb extension infrastructure") Signed-off-by: Florian Westphal <fw@strlen.de> --- Greg, David: The patch will not break build for a tree that lacks the 'Fixes' commit, so this can also go in via staging tree. OTOH, net-next build is broken for mips/octeon, so I think in this case net-next might make more sense?