openwrt/target/linux/generic/patches-3.18/653-disable_netlink_trim.patch
Jonas Gorski 0dfba24e9a kernel: refresh generic patches
Refresh patches to remove the trailing whitespaces caused by an old
diffutils version on osx.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 45506
2015-04-19 11:38:46 +00:00

31 lines
664 B
Diff

--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1695,27 +1695,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;
-
- 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;
}