diff options
| author | Randy Dunlap <rdunlap@infradead.org> | 2020-03-29 19:12:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 03:22:01 +0300 |
| commit | 673b41e04a035d760bc0aff83fa9ee24fd9c2779 (patch) | |
| tree | 518c552dee1ddc1835d66161f09f5b3e8fb171bf /arch/alpha/kernel/sys_miata.c | |
| parent | 642e53ead6aea8740a219ede509a5d138fd4f780 (diff) | |
| download | linux-673b41e04a035d760bc0aff83fa9ee24fd9c2779.tar.xz | |
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
2c64605b590e ("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>
Diffstat (limited to 'arch/alpha/kernel/sys_miata.c')
0 files changed, 0 insertions, 0 deletions