add 3.7-rc6 support (patch 820 still has to be fixed)

SVN-Revision: 34247
This commit is contained in:
Imre Kaloz
2012-11-18 18:52:38 +00:00
parent d0226aff1d
commit 935ca3f3eb
152 changed files with 26445 additions and 3 deletions

View File

@@ -0,0 +1,28 @@
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -895,25 +895,7 @@ void netlink_detachskb(struct sock *sk,
static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
{
- int delta;
-
skb_orphan(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;
}