mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: netdev@vger.kernel.org, Johannes Berg <johannes@sipsolutions.net>
Cc: "David S. Miller" <davem@davemloft.net>,
	linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next 13/14] wireless: Use eth_<foo>_addr instead of memset
Date: Mon,  2 Mar 2015 19:54:58 -0800	[thread overview]
Message-ID: <0c710456e4875ff00c1a9fcff9378ed15110dcd3.1425354528.git.joe@perches.com> (raw)
In-Reply-To: <cover.1425354527.git.joe@perches.com>

Use the built-in function instead of memset.

Signed-off-by: Joe Perches <joe@perches.com>
---
 net/wireless/ibss.c     | 2 +-
 net/wireless/nl80211.c  | 4 ++--
 net/wireless/trace.h    | 9 +++++----
 net/wireless/wext-sme.c | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index e24fc58..6309b9c 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -533,7 +533,7 @@ int cfg80211_ibss_wext_giwap(struct net_device *dev,
 	else if (wdev->wext.ibss.bssid)
 		memcpy(ap_addr->sa_data, wdev->wext.ibss.bssid, ETH_ALEN);
 	else
-		memset(ap_addr->sa_data, 0, ETH_ALEN);
+		eth_zero_addr(ap_addr->sa_data);
 
 	wdev_unlock(wdev);
 
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index d78fd8b..96fe328 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5683,8 +5683,8 @@ static int nl80211_parse_random_mac(struct nlattr **attrs,
 	int i;
 
 	if (!attrs[NL80211_ATTR_MAC] && !attrs[NL80211_ATTR_MAC_MASK]) {
-		memset(mac_addr, 0, ETH_ALEN);
-		memset(mac_addr_mask, 0, ETH_ALEN);
+		eth_zero_addr(mac_addr);
+		eth_zero_addr(mac_addr_mask);
 		mac_addr[0] = 0x2;
 		mac_addr_mask[0] = 0x3;
 
diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index b17b369..a00ee88 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -7,6 +7,7 @@
 #include <linux/tracepoint.h>
 
 #include <linux/rtnetlink.h>
+#include <linux/etherdevice.h>
 #include <net/cfg80211.h>
 #include "core.h"
 
@@ -15,7 +16,7 @@
 	if (given_mac)						     \
 		memcpy(__entry->entry_mac, given_mac, ETH_ALEN);     \
 	else							     \
-		memset(__entry->entry_mac, 0, ETH_ALEN);	     \
+		eth_zero_addr(__entry->entry_mac);		     \
 	} while (0)
 #define MAC_PR_FMT "%pM"
 #define MAC_PR_ARG(entry_mac) (__entry->entry_mac)
@@ -1077,7 +1078,7 @@ TRACE_EVENT(rdev_auth,
 		if (req->bss)
 			MAC_ASSIGN(bssid, req->bss->bssid);
 		else
-			memset(__entry->bssid, 0, ETH_ALEN);
+			eth_zero_addr(__entry->bssid);
 		__entry->auth_type = req->auth_type;
 	),
 	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", auth type: %d, bssid: " MAC_PR_FMT,
@@ -1103,7 +1104,7 @@ TRACE_EVENT(rdev_assoc,
 		if (req->bss)
 			MAC_ASSIGN(bssid, req->bss->bssid);
 		else
-			memset(__entry->bssid, 0, ETH_ALEN);
+			eth_zero_addr(__entry->bssid);
 		MAC_ASSIGN(prev_bssid, req->prev_bssid);
 		__entry->use_mfp = req->use_mfp;
 		__entry->flags = req->flags;
@@ -1153,7 +1154,7 @@ TRACE_EVENT(rdev_disassoc,
 		if (req->bss)
 			MAC_ASSIGN(bssid, req->bss->bssid);
 		else
-			memset(__entry->bssid, 0, ETH_ALEN);
+			eth_zero_addr(__entry->bssid);
 		__entry->reason_code = req->reason_code;
 		__entry->local_state_change = req->local_state_change;
 	),
diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index 368611c..a4e8af3 100644
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -322,7 +322,7 @@ int cfg80211_mgd_wext_giwap(struct net_device *dev,
 	if (wdev->current_bss)
 		memcpy(ap_addr->sa_data, wdev->current_bss->pub.bssid, ETH_ALEN);
 	else
-		memset(ap_addr->sa_data, 0, ETH_ALEN);
+		eth_zero_addr(ap_addr->sa_data);
 	wdev_unlock(wdev);
 
 	return 0;
-- 
2.1.2


  parent reply	other threads:[~2015-03-03  3:57 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-03  3:54 [PATCH net-next 00/14] " Joe Perches
2015-03-03  3:54 ` [PATCH net-next 01/14] etherdevice: Add eth_<foo>_addr CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS code Joe Perches
2015-03-03 13:19   ` Eric Dumazet
2015-03-03 18:25     ` Joe Perches
2015-03-03 18:42       ` Eric Dumazet
2015-03-03 19:07         ` Joe Perches
2015-03-03 19:27           ` David Miller
2015-03-03 19:41             ` Joe Perches
2015-03-03 19:56               ` Eric Dumazet
2015-03-03 19:58               ` David Miller
2015-03-03 20:04                 ` Joe Perches
2015-03-03 22:01                   ` David Miller
2015-03-03 19:26         ` David Miller
2015-03-03  3:54 ` [PATCH net-next 02/14] ethernet: Use eth_<foo>_addr instead of memset Joe Perches
2015-03-03  4:09   ` Jeff Kirsher
2015-03-05  5:39   ` Don Fry
2015-03-03  3:54 ` [PATCH net-next 03/14] net: usb: " Joe Perches
2015-03-03  3:54 ` [PATCH net-next 04/14] wireless: " Joe Perches
2015-03-03  3:54 ` [PATCH net-next 05/14] netconsole: " Joe Perches
2015-03-03  3:54 ` [PATCH net-next 06/14] xen: " Joe Perches
2015-03-03 10:05   ` Ian Campbell
2015-03-03 10:13   ` Wei Liu
2015-03-03  3:54 ` [PATCH net-next 07/14] 8021q: " Joe Perches
2015-03-03  3:54 ` [PATCH net-next 08/14] appletalk: " Joe Perches
2015-03-03  3:54 ` [PATCH net-next 09/14] atm: " Joe Perches
2015-03-03  3:54 ` [PATCH net-next 10/14] bluetooth: " Joe Perches
2015-03-03  7:04   ` Marcel Holtmann
2015-03-03  3:54 ` [PATCH net-next 11/14] ethernet: " Joe Perches
2015-03-03  3:54 ` [PATCH net-next 12/14] mac80211: " Joe Perches
2015-03-03  3:54 ` Joe Perches [this message]
2015-03-03  8:16   ` [PATCH net-next 13/14] wireless: " Johannes Berg
2015-03-03  8:37     ` Joe Perches
2015-03-03  8:44       ` Johannes Berg
2015-03-03  8:52         ` Joe Perches
2015-03-03  9:00           ` Johannes Berg
2015-03-03 10:29             ` Joe Perches
2015-03-03 10:34               ` Johannes Berg
2015-03-03 18:57     ` David Miller
2015-03-03 19:03       ` Joe Perches
2015-03-03 19:27         ` David Miller
2015-03-03 19:16       ` Johannes Berg
2015-03-03  3:54 ` [PATCH net-next 14/14] l2tp: " Joe Perches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0c710456e4875ff00c1a9fcff9378ed15110dcd3.1425354528.git.joe@perches.com \
    --to=joe@perches.com \
    --cc=davem@davemloft.net \
    --cc=johannes@sipsolutions.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®