aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-08-02 18:50:50 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-08-02 18:50:50 +0000
commitbad5168e7b1ebe327d5dcc5aef8c52353cbeae5c (patch)
tree36549a600e59554300f8e0c11ac3e6ca3bd4f39d /target/linux
parentbd32ed2b2141e66e1c67dff52ea81ee96667e9d0 (diff)
downloadupstream-bad5168e7b1ebe327d5dcc5aef8c52353cbeae5c.tar.gz
upstream-bad5168e7b1ebe327d5dcc5aef8c52353cbeae5c.tar.bz2
upstream-bad5168e7b1ebe327d5dcc5aef8c52353cbeae5c.zip
kernel: add a small xfrm related performance optimization
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41950 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch13
-rw-r--r--target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch13
2 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch b/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch
new file mode 100644
index 0000000000..a21fec70c6
--- /dev/null
+++ b/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch
@@ -0,0 +1,13 @@
+--- a/net/netfilter/nf_nat_core.c
++++ b/net/netfilter/nf_nat_core.c
+@@ -89,6 +89,9 @@ int nf_xfrm_me_harder(struct sk_buff *sk
+ struct dst_entry *dst;
+ int err;
+
++ if (!dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
++ return 0;
++
+ err = xfrm_decode_session(skb, &fl, family);
+ if (err < 0)
+ return err;
+
diff --git a/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch b/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
new file mode 100644
index 0000000000..088d32d407
--- /dev/null
+++ b/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
@@ -0,0 +1,13 @@
+--- a/net/netfilter/nf_nat_core.c
++++ b/net/netfilter/nf_nat_core.c
+@@ -90,6 +90,9 @@ int nf_xfrm_me_harder(struct sk_buff *sk
+ struct dst_entry *dst;
+ int err;
+
++ if (!dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
++ return 0;
++
+ err = xfrm_decode_session(skb, &fl, family);
+ if (err < 0)
+ return err;
+