74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
27 lines
613 B
Diff
27 lines
613 B
Diff
--- a/net/netlink/af_netlink.c
|
|
+++ b/net/netlink/af_netlink.c
|
|
@@ -1187,24 +1187,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);
|
|
- 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;
|
|
}
|
|
|