The following commit has been merged in the linux branch: commit 0358bc293e4aceac51e0e09837830898e90d2552 Author: Bjorn Helgaas bjorn.helgaas@hp.com Date: Mon Oct 5 11:37:01 2009 -0600

iwlwifi: use %pM for formatted MAC addresses

User-visible messages should use formatted MAC addresses ("00:01:...") rather than raw ("0001...") so they match other parts of the system.

Signed-off-by: Bjorn Helgaas bjorn.helgaas@hp.com CC: ilw@linux.intel.com CC: linux-wireless@vger.kernel.org Acked-by: Reinette Chatre reinette.chatre@intel.com Signed-off-by: John W. Linville linville@tuxdriver.com

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c index a16bd41..cbb0585 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c @@ -702,7 +702,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, u8 sta_id = iwl_find_station(priv, hdr->addr1);

if (sta_id == IWL_INVALID_STATION) { - IWL_DEBUG_RATE(priv, "LQ: ADD station %pm\n", + IWL_DEBUG_RATE(priv, "LQ: ADD station %pM\n", hdr->addr1); sta_id = iwl_add_station(priv, hdr->addr1, false, CMD_ASYNC, NULL);