Re: [PATCH net-next] staging: octeon: fix build failure with XFRM enabled
From: Florian Westphal
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
> Reported-by: Guenter Roeck
> Fixes: 4165079ba328d ("net: switch secpath to use skb extension
> infrastructure")
> Signed-off-by: Florian Westphal
> ---
> 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!
Re: [PATCH net-next] staging: octeon: fix build failure with XFRM enabled
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
Reported-by: Guenter Roeck
Fixes: 4165079ba328d ("net: switch secpath to use skb extension infrastructure")
Signed-off-by: Florian Westphal
[...]
MBR, Sergei
Re: [PATCH net-next] staging: octeon: fix build failure with XFRM enabled
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
> Cc: Greg Kroah-Hartman
> Reported-by: Guenter Roeck
> Fixes: 4165079ba328d ("net: switch secpath to use skb extension
> infrastructure")
> Signed-off-by: Florian Westphal
> ---
> 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
>
[PATCH net-next] staging: octeon: fix build failure with XFRM enabled
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
Reported-by: Guenter Roeck
Fixes: 4165079ba328d ("net: switch secpath to use skb extension infrastructure")
Signed-off-by: Florian Westphal
---
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
