Randy Dunlap 733729d3e0 staging/octeon: fix up merge error ... commit 673b41e04a upstream. 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 2c64605b59 ("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> Cc: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2020-12-08 10:40:24 +01:00
..
ethernet-defines.h
ethernet-mdio.c
ethernet-mdio.h
ethernet-mem.c
ethernet-mem.h
ethernet-rgmii.c
ethernet-rx.c
ethernet-rx.h
ethernet-sgmii.c
ethernet-spi.c
ethernet-tx.c	staging/octeon: fix up merge error	2020-12-08 10:40:24 +01:00
ethernet-tx.h
ethernet-util.h
ethernet.c
Kconfig
Makefile
octeon-ethernet.h
octeon-stubs.h
TODO