aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Schmidt <ross.schm.dev@gmail.com>2020-11-04 21:47:48 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-06 11:05:52 +0100
commit5e364ea5ea9d5127d42d3d085ddd4de58564f3c7 (patch)
tree1a88cde6966db42643f7a811a0ea5554ab2ddb5b
parentstaging: rtl8723bs: use %pM format for MAC addresses (diff)
staging: rtl8723bs: remove IP_FMT macro
Remove unnecessary macro for %pI4 and call it directly. Signed-off-by: Ross Schmidt <ross.schm.dev@gmail.com> Link: https://lore.kernel.org/r/20201105034754.12383-3-ross.schm.dev@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c4
-rw-r--r--drivers/staging/rtl8723bs/include/ieee80211.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
index a6d870d663a4..93c93cdaadaf 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
@@ -416,7 +416,7 @@ static void ConstructARPResponse(
SET_ARP_PKT_TARGET_MAC_ADDR(pARPRspPkt, get_my_bssid(&(pmlmeinfo->network)));
SET_ARP_PKT_TARGET_IP_ADDR(pARPRspPkt, pIPAddress);
DBG_871X("%s Target Mac Addr:%pM\n", __func__, MAC_ARG(get_my_bssid(&(pmlmeinfo->network))));
- DBG_871X("%s Target IP Addr" IP_FMT "\n", __func__, IP_ARG(pIPAddress));
+ DBG_871X("%s Target IP Addr:%pI4\n", __func__, IP_ARG(pIPAddress));
}
*pLength += 28;
@@ -738,7 +738,7 @@ static void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLength
memcpy(pwlanhdr->addr3, bssid, ETH_ALEN);
DBG_871X("%s FW Mac Addr:%pM\n", __func__, MAC_ARG(mac));
- DBG_871X("%s FW IP Addr" IP_FMT "\n", __func__, IP_ARG(StaAddr));
+ DBG_871X("%s FW IP Addr:%pI4\n", __func__, IP_ARG(StaAddr));
SetSeqNum(pwlanhdr, 0);
SetFrameSubType(fctrl, WIFI_PROBERSP);
diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index 902c710c1155..5cd307cb48a5 100644
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -845,7 +845,6 @@ enum ieee80211_state {
#define DEFAULT_MAX_SCAN_AGE (15 * HZ)
#define DEFAULT_FTS 2346
#define MAC_ARG(x) (x)
-#define IP_FMT "%pI4"
#define IP_ARG(x) (x)
static inline int is_multicast_mac_addr(const u8 *addr)