From d658d52dea36a6223c35a88642475b7071c01740 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Sat, 11 Sep 2010 17:17:11 +0300 Subject: [PATCH] --- yaml --- r: 219857 b: refs/heads/master c: 0ce53f3d153ca0bbec99e1980a6617f192ef69a9 h: refs/heads/master i: 219855: 0c0e7c892be484aeb760a1f2b11ea5ba89b3d35a v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8712/osdep_service.h | 3 --- trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d57cac0107e4..c329c8679ff8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff5cb20b7b3a58122207e14f23f508d2e3b4b25d +refs/heads/master: 0ce53f3d153ca0bbec99e1980a6617f192ef69a9 diff --git a/trunk/drivers/staging/rtl8712/osdep_service.h b/trunk/drivers/staging/rtl8712/osdep_service.h index 73509dad2107..7fca42c7c0d4 100644 --- a/trunk/drivers/staging/rtl8712/osdep_service.h +++ b/trunk/drivers/staging/rtl8712/osdep_service.h @@ -251,9 +251,6 @@ static inline u32 _RND512(u32 sz) return val; } -#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5] -#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x" - #define STRUCT_PACKED __attribute__ ((packed)) #endif diff --git a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index eac049b12d53..a54e25dc3fc1 100644 --- a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -1917,8 +1917,7 @@ static int r871x_get_ap_info(struct net_device *dev, irqL); return -EINVAL; } - printk(KERN_INFO "r8712u: BSSID:" MACSTR "\n", - MAC2STR(bssid)); + printk(KERN_INFO "r8712u: BSSID:%pM\n", &bssid[0]); if (!memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN)) { /* BSSID match, then check if supporting wpa/wpa2 */ pbuf = r8712_get_wpa_ie(&pnetwork->network.IEs[12],