Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 7295af0536b7..7babb6acd957 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -27,6 +27,8 @@
  *
  *****************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "wifi.h"
 #include "cam.h"
 
@@ -131,9 +133,9 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
                  ("EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, "
-                  "ulUseDK=%x MacAddr" MAC_FMT "\n",
+                  "ulUseDK=%x MacAddr %pM\n",
                   ul_entry_idx, ul_key_id, ul_enc_alg,
-                  ul_default_key, MAC_ARG(mac_addr)));
+                  ul_default_key, mac_addr));
 
         if (ul_key_id == TOTAL_CAM_ENTRY) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
@@ -347,7 +349,7 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
                         /* Remove from HW Security CAM */
                         memset(rtlpriv->sec.hwsec_cam_sta_addr[i], 0, ETH_ALEN);
                         rtlpriv->sec.hwsec_cam_bitmap &= ~(BIT(0) << i);
-                        printk(KERN_INFO "&&&&&&&&&del entry %d\n", i);
+                        pr_info("&&&&&&&&&del entry %d\n", i);
                 }
         }
         return;