aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-05-19 18:36:15 +0000
committerJonas Gorski <jogo@openwrt.org>2013-05-19 18:36:15 +0000
commit3c5635a3aa3dd00eb47cf0191588ed64f6d10f29 (patch)
tree6b6bd393ef7dac1fdb3f9503f6bfc07e09b2ad25 /target/linux/generic/patches-3.10/653-disable_netlink_trim.patch
parent8ef2514fb69dce5191f3e967a68663d9baa5f6d0 (diff)
downloadmaster-187ad058-3c5635a3aa3dd00eb47cf0191588ed64f6d10f29.tar.gz
master-187ad058-3c5635a3aa3dd00eb47cf0191588ed64f6d10f29.tar.bz2
master-187ad058-3c5635a3aa3dd00eb47cf0191588ed64f6d10f29.zip
kernel: generic: add 3.10-rc1 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36663 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/653-disable_netlink_trim.patch')
-rw-r--r--target/linux/generic/patches-3.10/653-disable_netlink_trim.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch b/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch
new file mode 100644
index 0000000000..b3a6597a57
--- /dev/null
+++ b/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch
@@ -0,0 +1,30 @@
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -1503,27 +1503,7 @@ void netlink_detachskb(struct sock *sk,
+
+ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
+ {
+- int delta;
+-
+ WARN_ON(skb->sk != NULL);
+- if (netlink_skb_is_mmaped(skb))
+- return skb;
+-
+- delta = skb->end - skb->tail;
+- if (delta * 2 < skb->truesize)
+- return skb;
+-
+- if (skb_shared(skb)) {
+- struct sk_buff *nskb = skb_clone(skb, allocation);
+- if (!nskb)
+- return skb;
+- consume_skb(skb);
+- skb = nskb;
+- }
+-
+- if (!pskb_expand_head(skb, 0, -delta, allocation))
+- skb->truesize -= delta;
+-
+ return skb;
+ }
+