redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity
alistair23-linux/drivers/staging/octeon
History
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
..
Kconfig staging/octeon: Fix build error without CONFIG_NETDEVICES 2019-07-31 09:07:05 -07:00
Makefile
…
TODO
…
ethernet-defines.h staging/octeon: Allow test build on !MIPS 2019-07-29 10:35:41 -07:00
ethernet-mdio.c staging: octeon: repair "fixed-link" support 2020-11-05 11:43:37 +01:00
ethernet-mdio.h
…
ethernet-mem.c staging/octeon: Allow test build on !MIPS 2019-07-29 10:35:41 -07:00
ethernet-mem.h
…
ethernet-rgmii.c staging/octeon: Allow test build on !MIPS 2019-07-29 10:35:41 -07:00
ethernet-rx.c staging: octeon: Drop on uncorrectable alignment or FCS error 2020-11-05 11:43:38 +01:00
ethernet-rx.h staging/octeon: Allow test build on !MIPS 2019-07-29 10:35:41 -07:00
ethernet-sgmii.c staging/octeon: Allow test build on !MIPS 2019-07-29 10:35:41 -07:00
ethernet-spi.c staging/octeon: Allow test build on !MIPS 2019-07-29 10:35:41 -07:00
ethernet-tx.c staging/octeon: fix up merge error 2020-12-08 10:40:24 +01:00
ethernet-tx.h
…
ethernet-util.h staging/octeon: Allow test build on !MIPS 2019-07-29 10:35:41 -07:00
ethernet.c staging: octeon: repair "fixed-link" support 2020-11-05 11:43:37 +01:00
octeon-ethernet.h staging/octeon: Use stubs for MIPS && !CAVIUM_OCTEON_SOC 2019-12-13 08:42:19 +01:00
octeon-stubs.h staging/octeon: Use stubs for MIPS && !CAVIUM_OCTEON_SOC 2019-12-13 08:42:19 +01:00