---

yaml --- r: 215348 b: refs/heads/master c: 40bbfd4 h: refs/heads/master v: v3
git-mirror · Oct 14, 2010 · 3a7f61d · 3a7f61d
1 parent 3ed7f47
commit 3a7f61d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 657e11a47dede79cae1d2f72084f6f7303aec725
+refs/heads/master: 40bbfd4c1b336b8841bef9933b6e09252ace56b8
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -385,6 +385,8 @@ static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
 				sizeof(frame->u) - sizeof(*tx_beacon_cmd));
 	if (WARN_ON_ONCE(frame_size > MAX_MPDU_SIZE))
 		return 0;
+	if (!frame_size)
+		return 0;
 
 	/* Set up TX command fields */
 	tx_beacon_cmd->tx.len = cpu_to_le16((u16)frame_size);