Merge remote-tracking branch 'origin/master' into bmork-current

3 files changed, 21 insertions, 32 deletions

diff --git a/fwdl.c b/fwdl.c
index e955fef..a3fb84f 100644
--- a/fwdl.c
+++ b/fwdl.c
@@ -88,7 +88,7 @@ int mwl_fwdl_download_firmware(struct ieee80211_hw *hw)
 	 * reside on its respective blocks such as ITCM, DTCM, SQRAM,
 	 * (or even DDR, AFTER DDR is init'd before fw download
 	 */
-	wiphy_info(hw->wiphy, "fw download start 88\n");
+	wiphy_debug(hw->wiphy, "fw download start\n");
 
 	/* Disable PFU before FWDL */
 	writel(0x100, priv->iobase1 + 0xE0E4);
@@ -149,9 +149,9 @@ int mwl_fwdl_download_firmware(struct ieee80211_hw *hw)
 		size_fw_downloaded += len;
 	}
 
-	wiphy_info(hw->wiphy,
-		   "FwSize = %d downloaded Size = %d curr_iteration %d\n",
-		   (int)fw->size, size_fw_downloaded, curr_iteration);
+	wiphy_debug(hw->wiphy,
+		    "FwSize = %d downloaded Size = %d curr_iteration %d\n",
+		    (int)fw->size, size_fw_downloaded, curr_iteration);
 
 	/* Now firware is downloaded successfully, so this part is to check
 	 * whether fw can properly execute to an extent that write back
@@ -175,7 +175,7 @@ int mwl_fwdl_download_firmware(struct ieee80211_hw *hw)
 			mdelay(FW_CHECK_MSECS);
 			int_code = readl(priv->iobase1 + 0xc44);
 		}
-		if (!(curr_iteration % 0xff))
+		if (!(curr_iteration % 0xff) && (int_code != 0))
 			wiphy_err(hw->wiphy, "%x;", int_code);
 	} while ((curr_iteration) &&
 		 (int_code != fwreadysignature));
@@ -186,7 +186,7 @@ int mwl_fwdl_download_firmware(struct ieee80211_hw *hw)
 		goto err_download;
 	}
 
-	wiphy_info(hw->wiphy, "complete\n");
+	wiphy_debug(hw->wiphy, "fw download complete\n");
 	writel(0x00, priv->iobase1 + MACREG_REG_INT_CODE);
 
 	return 0;
diff --git a/main.c b/main.c
index 1698a2b..76a9a98 100644
--- a/main.c
+++ b/main.c
@@ -342,8 +342,7 @@ static void mwl_reg_notifier(struct wiphy *wiphy,
 			}
 
 			/* Dump loaded power tabel */
-			wiphy_info(hw->wiphy, "%s: %s\n", dev_name(&wiphy->dev),
-				   prop->name);
+			wiphy_debug(hw->wiphy, "regdomain: %s\n", prop->name);
 			for (i = 0; i < SYSADPT_MAX_NUM_CHANNELS; i++) {
 				struct mwl_tx_pwr_tbl *pwr_tbl;
 				char disp_buf[64];
@@ -352,12 +351,12 @@ static void mwl_reg_notifier(struct wiphy *wiphy,
 				pwr_tbl = &priv->tx_pwr_tbl[i];
 				if (pwr_tbl->channel == 0)
 					break;
-				wiphy_info(hw->wiphy,
-					   "Channel: %d: 0x%x 0x%x 0x%x\n",
-					   pwr_tbl->channel,
-					   pwr_tbl->setcap,
-					   pwr_tbl->cdd,
-					   pwr_tbl->txantenna2);
+				wiphy_debug(hw->wiphy,
+					    "Channel: %d: 0x%x 0x%x 0x%x\n",
+					    pwr_tbl->channel,
+					    pwr_tbl->setcap,
+					    pwr_tbl->cdd,
+					    pwr_tbl->txantenna2);
 				disp_ptr = disp_buf;
 				for (j = 0; j < SYSADPT_TX_POWER_LEVEL_TOTAL;
 				     j++) {
@@ -365,7 +364,7 @@ static void mwl_reg_notifier(struct wiphy *wiphy,
 						sprintf(disp_ptr, "%x ",
 							pwr_tbl->tx_power[j]);
 				}
-				wiphy_info(hw->wiphy, "%s\n", disp_buf);
+				wiphy_debug(hw->wiphy, "%s\n", disp_buf);
 			}
 		}
 	}
@@ -803,23 +802,13 @@ static int mwl_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 		goto err_wl_init;
 	}
 
-	wiphy_info(priv->hw->wiphy,
-		   "2G: %s\n", priv->disable_2g ? "disable" : "enable");
-	wiphy_info(priv->hw->wiphy,
-		   "5G: %s\n", priv->disable_5g ? "disable" : "enable");
+	wiphy_info(priv->hw->wiphy, "2G %s, 5G %s\n",
+		   priv->disable_2g ? "disabled" : "enabled",
+		   priv->disable_5g ? "disabled" : "enabled");
 
-	if (priv->antenna_tx == ANTENNA_TX_4_AUTO)
-		wiphy_info(priv->hw->wiphy, "TX: 4 antennas\n");
-	else if (priv->antenna_tx == ANTENNA_TX_2)
-		wiphy_info(priv->hw->wiphy, "TX: 2 antennas\n");
-	else
-		wiphy_info(priv->hw->wiphy, "TX: unknown\n");
-	if (priv->antenna_rx == ANTENNA_RX_4_AUTO)
-		wiphy_info(priv->hw->wiphy, "RX: 4 antennas\n");
-	else if (priv->antenna_rx == ANTENNA_RX_2)
-		wiphy_info(priv->hw->wiphy, "RX: 2 antennas\n");
-	else
-		wiphy_info(priv->hw->wiphy, "RX: unknown\n");
+	wiphy_info(priv->hw->wiphy, "%s TX antennas, %s RX antennas\n",
+		   (priv->antenna_tx == ANTENNA_TX_4_AUTO) ? "4" : "2",
+		   (priv->antenna_rx == ANTENNA_RX_4_AUTO) ? "4" : "2");
 
 #ifdef CONFIG_DEBUG_FS
 	mwl_debugfs_init(hw);
diff --git a/tx.c b/tx.c
index 6f74c33..75ccff7 100644
--- a/tx.c
+++ b/tx.c
@@ -564,7 +564,7 @@ static inline struct sk_buff *mwl_tx_do_amsdu(struct mwl_priv *priv,
 		struct sk_buff *newskb;
 
 		amsdu_pkts = (struct sk_buff_head *)
-			kmalloc(sizeof(*amsdu_pkts), GFP_KERNEL);
+			kmalloc(sizeof(*amsdu_pkts), GFP_ATOMIC);
 		if (!amsdu_pkts) {
 			spin_unlock_bh(&sta_info->amsdu_lock);
 			return tx_skb;