diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-09-16 16:41:48 -0700 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-09-18 02:08:18 +0300 |
| commit | bb83c9dcca9d7080a704e8a04a58ef37e11681fd (patch) | |
| tree | 0b6f2bace2bed4b442c6b16fc206458715288257 /target/linux/generic/pending-3.18/653-disable_netlink_trim.patch | |
| parent | 2375e279a7cb462d62fd6028cb3fbd56217222de (diff) | |
| download | upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.gz upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.bz2 upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.zip | |
kernel: update to 3.18.71
Delete a bunch of fixes that are already included.
Refresh patches.
Compile-tested on malta/mipsel
Runtime-tested on malta/mipsel
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-3.18/653-disable_netlink_trim.patch')
| -rw-r--r-- | target/linux/generic/pending-3.18/653-disable_netlink_trim.patch | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/target/linux/generic/pending-3.18/653-disable_netlink_trim.patch b/target/linux/generic/pending-3.18/653-disable_netlink_trim.patch index b38b87b48f..fe62110f06 100644 --- a/target/linux/generic/pending-3.18/653-disable_netlink_trim.patch +++ b/target/linux/generic/pending-3.18/653-disable_netlink_trim.patch @@ -1,15 +1,12 @@ --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -1721,27 +1721,7 @@ void netlink_detachskb(struct sock *sk, +@@ -1107,23 +1107,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 (is_vmalloc_addr(skb->head) || delta * 2 < skb->truesize) - return skb; @@ -24,7 +21,6 @@ - - if (!pskb_expand_head(skb, 0, -delta, allocation)) - skb->truesize -= delta; -- + return skb; } - |