---

yaml --- r: 183289 b: refs/heads/master c: e54be4e h: refs/heads/master i: 183287: 66aab09 v: v3
git-mirror · Dec 21, 2009 · 4dfbd24 · 4dfbd24
1 parent ee2ab1b
commit 4dfbd24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5de42f9eeafa7d54ffb833e0526d4828e194fddb
+refs/heads/master: e54be4e7356c0612b48407d3b0647a29cb82e254
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c b/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -180,7 +180,7 @@ void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int header_length)
 	unsigned int payload_length = skb->len - header_length;
 	unsigned int header_align = ALIGN_SIZE(skb, 0);
 	unsigned int payload_align = ALIGN_SIZE(skb, header_length);
-	unsigned int l2pad = L2PAD_SIZE(header_length);
+	unsigned int l2pad = payload_length ? L2PAD_SIZE(header_length) : 0;
 
 	/*
 	 * Adjust the header alignment if the payload needs to be moved more