588acc2cba
Update kernel sources and refresh some patches. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 45761
30 lines
664 B
Diff
30 lines
664 B
Diff
--- a/net/netlink/af_netlink.c
|
|
+++ b/net/netlink/af_netlink.c
|
|
@@ -1710,27 +1710,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;
|
|
}
|
|
|