Commit 673b41e0 authored Mar 29, 2020 by Randy Dunlap Committed by Linus Torvalds Mar 30, 2020

staging/octeon: fix up merge error



There's a semantic conflict in the Octeon staging network driver, which
used the skb_reset_tc() function to reset skb state when re-using an
skb.  But that inline helper function was removed in mainline by commit
2c64605b ("net: Fix CONFIG_NET_CLS_ACT=n and
CONFIG_NFT_FWD_NETDEV={y, m} build").

Fix it by using skb_reset_redirect() instead.  Also move it out of the

This code path only ends up triggering if REUSE_SKBUFFS_WITHOUT_FREE is
enabled, which in turn only happens if you don't have CONFIG_NETFILTER
configured.  Which was how this wasn't caught by the usual allmodconfig
builds.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 642e53ea

drivers/staging/octeon/ethernet-tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -352,10 +352,10 @@ int cvm_oct_xmit(struct sk_buff skb, struct net_device dev)
		skb_dst_set(skb, NULL);
		skb_ext_reset(skb);
		nf_reset_ct(skb);
		skb_reset_redirect(skb);

		#ifdef CONFIG_NET_SCHED
		skb->tc_index = 0;
		skb_reset_tc(skb);
		#endif /* CONFIG_NET_SCHED */
		#endif /* REUSE_SKBUFFS_WITHOUT_FREE */

Admin message