[PATCH 1/2] wl12xx: switch to %pM to print the mac address

[PATCH 1/2] wl12xx: switch to %pM to print the mac address

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/wireless/wl12xx/wl1271_main.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index d9169b4..f6f8895 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw,
 {
 	struct wl1271 *wl = hw->priv;
 	struct sk_buff *beacon;
-	DECLARE_MAC_BUF(mac);
 	int ret;
 
 	wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s",
-		     print_mac(mac, conf->bssid));
+		     printf("%pM", conf->bssid);
 	wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid,
 			  conf->ssid_len);
 
-- 
1.6.4

[PATCH 2/2] net: remove print_mac as it's not anymore used

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 include/linux/if_ether.h |    8 --------
 net/ethernet/eth.c       |    7 -------
 2 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 580b600..b1a19a7 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -136,14 +136,6 @@ extern struct ctl_table ether_table[];
 
 extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
 
-/*
- *	Display a 6 byte device address (MAC) in a readable format.
- */
-extern char *print_mac(char *buf, const unsigned char *addr) __deprecated;
-#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_BUF_SIZE	18
-#define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE]
-
 #endif
 
 #endif	/* _LINUX_IF_ETHER_H */
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 5a883af..dd3db88 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -393,10 +393,3 @@ ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)
 	return ((ssize_t) l);
 }
 EXPORT_SYMBOL(sysfs_format_mac);
-
-char *print_mac(char *buf, const unsigned char *addr)
-{
-	_format_mac_addr(buf, MAC_BUF_SIZE, addr, ETH_ALEN);
-	return buf;
-}
-EXPORT_SYMBOL(print_mac);
-- 
1.6.4

Re: [PATCH 2/2] net: remove print_mac as it's not anymore used

[David Miller]

From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Thu, 17 Sep 2009 02:07:39 +0200

> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Applied.

Re: [PATCH 2/2] net: remove print_mac as it's not anymore used

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Wed, 16 Sep 2009 20:51:59 -0700 (PDT)

> From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Date: Thu, 17 Sep 2009 02:07:39 +0200
> 
>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> 
> Applied.

Actually I had to revert.  It's still used by the FCOE stack in
the scsi layer.

Did you actually run grep on the entire tree to see if it's still used
anywhere or did you only check drivers/net/ and net/ or something
equally lazy?

Re: [PATCH 2/2] net: remove print_mac as it's not anymore used

[Jean-Christophe PLAGNIOL-VILLARD]

On 20:54 Wed 16 Sep     , David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Wed, 16 Sep 2009 20:51:59 -0700 (PDT)
> 
> > From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > Date: Thu, 17 Sep 2009 02:07:39 +0200
> > 
> >> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > 
> > Applied.
> 
> Actually I had to revert.  It's still used by the FCOE stack in
> the scsi layer.
> 
> Did you actually run grep on the entire tree to see if it's still used
> anywhere or did you only check drivers/net/ and net/ or something
> equally lazy?
Yes I've done a git grep print_mac + cscope on the current Linus tree and
see no more use of print_mac

Best Regards,
J.

Re: [PATCH 2/2] net: remove print_mac as it's not anymore used

[Jean-Christophe PLAGNIOL-VILLARD]

On 20:54 Wed 16 Sep     , David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Wed, 16 Sep 2009 20:51:59 -0700 (PDT)
> 
> > From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > Date: Thu, 17 Sep 2009 02:07:39 +0200
> > 
> >> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > 
> > Applied.
> 
> Actually I had to revert.  It's still used by the FCOE stack in
> the scsi layer.
> 
> Did you actually run grep on the entire tree to see if it's still used
> anywhere or did you only check drivers/net/ and net/ or something
> equally lazy?
I've download the next tree
and noone use use it anymore except the wl12xx which I'll fix
If you can point me in while file or tree I can fous the remaining code I'll
fix it

arch/m68k/kernel/head.S:mmu_print_machine_cpu_types:
arch/m68k/kernel/head.S:        jbsr    mmu_print_machine_cpu_types
drivers/infiniband/hw/amso1100/c2.c:static void c2_print_macaddr(struct net_device *netdev)
drivers/infiniband/hw/amso1100/c2.c:            c2_print_macaddr(netdev);
drivers/infiniband/hw/amso1100/c2.c:    c2_print_macaddr(netdev);
drivers/infiniband/hw/nes/nes.c: * nes_print_macaddr
drivers/infiniband/hw/nes/nes.c:static void nes_print_macaddr(struct net_device *netdev)
drivers/infiniband/hw/nes/nes.c:                nes_print_macaddr(netdev);
drivers/net/r8169.c:static void rtl8169_print_mac_version(struct rtl8169_private *tp)
drivers/net/r8169.c:    rtl8169_print_mac_version(tp);
drivers/net/r8169.c:    rtl8169_print_mac_version(tp);
drivers/net/wireless/wl12xx/wl1271_main.c:                   print_mac(mac, conf->bssid));
drivers/net/wireless/zd1211rw/zd_chip.c:static int scnprint_mac_oui(struct zd_chip *chip, char *buffer, size_t size)
drivers/net/wireless/zd1211rw/zd_chip.c:        i += scnprint_mac_oui(chip, buffer+i, size-i);
include/linux/if_ether.h:extern char *print_mac(char *buf, const unsigned char *addr) __deprecated;
net/ethernet/eth.c:char *print_mac(char *buf, const unsigned char *addr)
net/ethernet/eth.c:EXPORT_SYMBOL(print_mac);

Best Regards,
J.

Re: [PATCH 2/2] net: remove print_mac as it's not anymore used

[Jean-Christophe PLAGNIOL-VILLARD]

On 20:54 Wed 16 Sep     , David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Wed, 16 Sep 2009 20:51:59 -0700 (PDT)
> 
> > From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > Date: Thu, 17 Sep 2009 02:07:39 +0200
> > 
> >> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > 
> > Applied.
> 
> Actually I had to revert.  It's still used by the FCOE stack in
> the scsi layer.
I've found the commit that already fix it

commit 66d6faec2f874cf6bf9bd4900966584ea9feae3d
Refs: v2.6.31-rc7-23-g66d6fae
Author:     Johannes Berg <johannes@sipsolutions.net>
AuthorDate: Wed Jul 15 17:21:14 2009 +0200
Commit:     James Bottomley <James.Bottomley@suse.de>
CommitDate: Sat Aug 22 17:51:56 2009 -0500

[SCSI] fcoe: convert to %pM

Best Regards,
J.

Re: [PATCH 1/2] wl12xx: switch to %pM to print the mac address

[John W. Linville]

On Thu, Sep 17, 2009 at 02:07:38AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  drivers/net/wireless/wl12xx/wl1271_main.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
> index d9169b4..f6f8895 100644
> --- a/drivers/net/wireless/wl12xx/wl1271_main.c
> +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
> @@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw,
>  {
>  	struct wl1271 *wl = hw->priv;
>  	struct sk_buff *beacon;
> -	DECLARE_MAC_BUF(mac);
>  	int ret;
>  
>  	wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s",
> -		     print_mac(mac, conf->bssid));
> +		     printf("%pM", conf->bssid);
>  	wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid,
>  			  conf->ssid_len);
>  

ACK

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH 1/2] wl12xx: switch to %pM to print the mac address

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 16 Sep 2009 20:28:52 -0400

> On Thu, Sep 17, 2009 at 02:07:38AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 ...
> 
> ACK

Applied.

Re: [PATCH 1/2] wl12xx: switch to %pM to print the mac address

[Ben Hutchings]

On Thu, 2009-09-17 at 02:07 +0200, Jean-Christophe PLAGNIOL-VILLARD
wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  drivers/net/wireless/wl12xx/wl1271_main.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
> index d9169b4..f6f8895 100644
> --- a/drivers/net/wireless/wl12xx/wl1271_main.c
> +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
> @@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw,
>  {
>  	struct wl1271 *wl = hw->priv;
>  	struct sk_buff *beacon;
> -	DECLARE_MAC_BUF(mac);
>  	int ret;
>  
>  	wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s",
> -		     print_mac(mac, conf->bssid));
> +		     printf("%pM", conf->bssid);
>  	wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid,
>  			  conf->ssid_len);
>  

That isn't even syntactically valid, let alone correct.

Ben.

-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

Re: [PATCH 1/2] wl12xx: switch to %pM to print the mac address

[John W. Linville]

On Thu, Sep 17, 2009 at 02:22:51AM +0100, Ben Hutchings wrote:
> On Thu, 2009-09-17 at 02:07 +0200, Jean-Christophe PLAGNIOL-VILLARD
> wrote:
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> >  drivers/net/wireless/wl12xx/wl1271_main.c |    3 +--
> >  1 files changed, 1 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
> > index d9169b4..f6f8895 100644
> > --- a/drivers/net/wireless/wl12xx/wl1271_main.c
> > +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
> > @@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw,
> >  {
> >  	struct wl1271 *wl = hw->priv;
> >  	struct sk_buff *beacon;
> > -	DECLARE_MAC_BUF(mac);
> >  	int ret;
> >  
> >  	wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s",
> > -		     print_mac(mac, conf->bssid));
> > +		     printf("%pM", conf->bssid);
> >  	wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid,
> >  			  conf->ssid_len);
> >  
> 
> That isn't even syntactically valid, let alone correct.

Ugh, you're right -- remind me not to ACK things before bed...

Jean-Christophe posted a new patch that looked better, although it
probably needs to be rebased on this one since I think Dave applied
it after my (misguided) ACK.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH 1/2] wl12xx: switch to %pM to print the mac address

[Jean-Christophe PLAGNIOL-VILLARD]

On 08:55 Thu 17 Sep     , John W. Linville wrote:
> On Thu, Sep 17, 2009 at 02:22:51AM +0100, Ben Hutchings wrote:
> > On Thu, 2009-09-17 at 02:07 +0200, Jean-Christophe PLAGNIOL-VILLARD
> > wrote:
> > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > > ---
> > >  drivers/net/wireless/wl12xx/wl1271_main.c |    3 +--
> > >  1 files changed, 1 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
> > > index d9169b4..f6f8895 100644
> > > --- a/drivers/net/wireless/wl12xx/wl1271_main.c
> > > +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
> > > @@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw,
> > >  {
> > >  	struct wl1271 *wl = hw->priv;
> > >  	struct sk_buff *beacon;
> > > -	DECLARE_MAC_BUF(mac);
> > >  	int ret;
> > >  
> > >  	wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s",
> > > -		     print_mac(mac, conf->bssid));
> > > +		     printf("%pM", conf->bssid);
> > >  	wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid,
> > >  			  conf->ssid_len);
> > >  
> > 
> > That isn't even syntactically valid, let alone correct.
> 
> Ugh, you're right -- remind me not to ACK things before bed...
> 
> Jean-Christophe posted a new patch that looked better, although it
> probably needs to be rebased on this one since I think Dave applied
> it after my (misguided) ACK.
ok I'll do asap really sorry

Best Regards,
J.

Re: [PATCH 1/2] wl12xx: switch to %pM to print the mac address

[David Miller]

From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Thu, 17 Sep 2009 16:42:08 +0200

> On 08:55 Thu 17 Sep     , John W. Linville wrote:
>> Ugh, you're right -- remind me not to ACK things before bed...
>> 
>> Jean-Christophe posted a new patch that looked better, although it
>> probably needs to be rebased on this one since I think Dave applied
>> it after my (misguided) ACK.
> ok I'll do asap really sorry

I've already fixed this in my tree.

Re: [PATCH 1/2] wl12xx: switch to %pM to print the mac address

[Jean-Christophe PLAGNIOL-VILLARD]

On 10:19 Thu 17 Sep     , David Miller wrote:
> From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Date: Thu, 17 Sep 2009 16:42:08 +0200
> 
> > On 08:55 Thu 17 Sep     , John W. Linville wrote:
> >> Ugh, you're right -- remind me not to ACK things before bed...
> >> 
> >> Jean-Christophe posted a new patch that looked better, although it
> >> probably needs to be rebased on this one since I think Dave applied
> >> it after my (misguided) ACK.
> > ok I'll do asap really sorry
> 
> I've already fixed this in my tree.
Tks

Best Regards,
J/

[PATCH 1/2 v2] wl12xx: switch to %pM to print the mac address

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/wireless/wl12xx/wl1271_main.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

v2:
Fix correctly
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index d9169b4..27298b1 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw,
 {
 	struct wl1271 *wl = hw->priv;
 	struct sk_buff *beacon;
-	DECLARE_MAC_BUF(mac);
 	int ret;
 
-	wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s",
-		     print_mac(mac, conf->bssid));
+	wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %pM",
+		     conf->bssid);
 	wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid,
 			  conf->ssid_len);
 
-- 
1.6.4