diff options
author | Andy Shevchenko <andy.shevchenko@gmail.com> | 2010-10-11 16:58:33 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-12 09:03:29 -0700 |
commit | ba07d0cbc919613ce48acc0a43d6e8ab35cd7748 (patch) | |
tree | d9f5e52e0409928d462f69e7a1ad4293d85d8c53 /drivers/staging/brcm80211/sys | |
parent | 88b3eaa499ddbe5a36c34840117563bd54ec4ec2 (diff) | |
download | op-kernel-dev-ba07d0cbc919613ce48acc0a43d6e8ab35cd7748.zip op-kernel-dev-ba07d0cbc919613ce48acc0a43d6e8ab35cd7748.tar.gz |
staging: brcm80211: remove useless bcm_ether_ntoa()
Since we have '%pM' modifier in the kernel's *printf() we don't need to
convert address to the string beforehand.
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Nohee Ko <noheek@broadcom.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-wireless@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
-rw-r--r-- | drivers/staging/brcm80211/sys/wl_mac80211.c | 7 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index 0e32209..8aec7f1 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -484,11 +484,8 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw, /* Beacon interval changed */ } if (changed & BSS_CHANGED_BSSID) { - /* char eabuf[ETHER_ADDR_STR_LEN]; */ - WL_NONE(("new BSSID:\taid %d bss:%s\n", - info->aid, - bcm_ether_ntoa((struct ether_addr *)info->bssid, - eabuf))); + WL_NONE(("new BSSID:\taid %d bss:%pM\n", info->aid, + info->bssid)); /* BSSID changed, for whatever reason (IBSS and managed mode) */ /* FIXME: need to store bssid in bsscfg */ wlc_set_addrmatch(wl->wlc, RCM_BSSID_OFFSET, diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index f649249..cbd0504 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -7215,9 +7215,6 @@ void BCMFASTPATH wlc_recv(wlc_info_t *wlc, void *p) u16 fc; uint len; bool is_amsdu; -#ifdef BCMDBG - char eabuf[ETHER_ADDR_STR_LEN]; -#endif WL_TRACE(("wl%d: wlc_recv\n", wlc->pub->unit)); @@ -7271,7 +7268,9 @@ void BCMFASTPATH wlc_recv(wlc_info_t *wlc, void *p) /* CTS and ACK CTL frames are w/o a2 */ if (FC_TYPE(fc) == FC_TYPE_DATA || FC_TYPE(fc) == FC_TYPE_MNG) { if ((ETHER_ISNULLADDR(&h->a2) || ETHER_ISMULTI(&h->a2))) { - WL_ERROR(("wl%d: %s: dropping a frame with invalid" " src mac address, a2: %s\n", wlc->pub->unit, __func__, bcm_ether_ntoa(&h->a2, eabuf))); + WL_ERROR(("wl%d: %s: dropping a frame with " + "invalid src mac address, a2: %pM\n", + wlc->pub->unit, __func__, &h->a2)); WLCNTINCR(wlc->pub->_cnt->rxbadsrcmac); goto toss; } |