On Fri, Dec 21, 2018 at 09:57:26PM +0100, Florian Westphal wrote:
> 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.
>
It does fix the build error.
Tested-by: Guenter Roeck <li...@roeck-us.net>
> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
> Reported-by: Guenter Roeck <li...@roeck-us.net>
> Fixes: 4165079ba328d ("net: switch secpath to use skb extension
> infrastructure")
> Signed-off-by: Florian Westphal <f...@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?
>
> 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);
>
> --
> 2.19.2
>
