From 502302f2a872330381d8aa5159fea49007fc43d5 Mon Sep 17 00:00:00 2001 From: "alex.bluesman.smirnov@gmail.com" Date: Tue, 10 Jul 2012 21:22:45 +0000 Subject: [PATCH] --- yaml --- r: 315146 b: refs/heads/master c: 79ff1db6d9661974186d51c1ef14d1cab521df49 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ieee802154/6lowpan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d26402376a30..e3e3953d5025 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e885a47a474fe53ed7d952af4b6e9a5cf86d9a07 +refs/heads/master: 79ff1db6d9661974186d51c1ef14d1cab521df49 diff --git a/trunk/net/ieee802154/6lowpan.c b/trunk/net/ieee802154/6lowpan.c index b872515f2137..ae3f4eb02064 100644 --- a/trunk/net/ieee802154/6lowpan.c +++ b/trunk/net/ieee802154/6lowpan.c @@ -661,8 +661,8 @@ lowpan_alloc_new_frame(struct sk_buff *skb, u8 iphc0, u8 len, u8 tag) frame->tag = tag; /* allocate buffer for frame assembling */ - frame->skb = alloc_skb(frame->length + - sizeof(struct ipv6hdr), GFP_ATOMIC); + frame->skb = netdev_alloc_skb_ip_align(skb->dev, frame->length + + sizeof(struct ipv6hdr)); if (!frame->skb) goto skb_err;