linux/drivers/staging/octeon
Randy Dunlap 673b41e04a 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
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>
2020-03-30 17:22:01 -07:00
..
Kconfig Revert "staging/octeon: Mark Ethernet driver as BROKEN" 2020-02-12 13:50:33 -08:00
Makefile Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
TODO Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-defines.h Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-mdio.c Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-mdio.h Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-mem.c Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-mem.h Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-rgmii.c Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-rx.c Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-rx.h Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-sgmii.c Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-spi.c Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-tx.c staging/octeon: fix up merge error 2020-03-30 17:22:01 -07:00
ethernet-tx.h Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet-util.h Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
ethernet.c Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
octeon-ethernet.h Revert "staging: octeon: delete driver" 2020-02-12 13:50:32 -08:00
octeon-stubs.h staging: octeon: match parentheses alignment 2020-02-23 19:20:49 +01:00