summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorConor Dooley2023-04-05 22:20:55 +0100
committerConor Dooley2023-04-05 22:23:17 +0100
commit4cd4beb98fe5ac2c4bcb995ba6e82322be174abb (patch)
tree5f511ff3d23f2c188631bbc8cb7e585de424d944 /include/net
parente77da13b8e3626fc6d01287fba7c1eee4ebfe018 (diff)
parent54baba33392d428a8be4942441a92a9b05cf537e (diff)
Merge branch 'riscv-jh7110_initial_dts' into riscv-dt-for-next
Merge Hal's series adding support for the new StarFive JH7110 SoC. There's a few bindings here for core components that were not picked up by the various maintainers for the subsystems (previously Palmer would pick these up via the RISC-V tree) & the first two commits in the branch are shared with the clk tree, since the dts depends on defines in the dt-binding headers. This is based on -rc2, as the board does not actually boot on -rc1 due to the bug Linus introduced. Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_tproxy.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_tproxy.h b/include/net/netfilter/nf_tproxy.h
index 82d0e41b76f2..faa108b1ba67 100644
--- a/include/net/netfilter/nf_tproxy.h
+++ b/include/net/netfilter/nf_tproxy.h
@@ -17,6 +17,13 @@ static inline bool nf_tproxy_sk_is_transparent(struct sock *sk)
return false;
}
+static inline void nf_tproxy_twsk_deschedule_put(struct inet_timewait_sock *tw)
+{
+ local_bh_disable();
+ inet_twsk_deschedule_put(tw);
+ local_bh_enable();
+}
+
/* assign a socket to the skb -- consumes sk */
static inline void nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk)
{