---

yaml --- r: 315146 b: refs/heads/master c: 79ff1db h: refs/heads/master v: v3
git-mirror · Jul 12, 2012 · 502302f · 502302f
1 parent 7bfbfed
commit 502302f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;