diff options
| author | Randy Dunlap <[email protected]> | 2020-03-29 16:12:31 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-03-31 00:22:01 +0000 |
| commit | 673b41e04a035d760bc0aff83fa9ee24fd9c2779 (patch) | |
| tree | 518c552dee1ddc1835d66161f09f5b3e8fb171bf /drivers/clocksource/hyperv_timer.c | |
| parent | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | kernel-673b41e04a035d760bc0aff83fa9ee24fd9c2779.tar.gz kernel-673b41e04a035d760bc0aff83fa9ee24fd9c2779.zip | |
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 <[email protected]>
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'drivers/clocksource/hyperv_timer.c')
0 files changed, 0 insertions, 0 deletions