From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hin-Tak Leung Subject: Re: [PATCH net-next 4/8] wireless: Use eth_random_addr Date: Fri, 13 Jul 2012 06:54:16 +0100 (BST) Message-ID: <1342158856.63052.YahooMailClassic@web29403.mail.ird.yahoo.com> References: <93ab9a323e85d1b0d8c7eac4db7ab7835e61efe6.1342157022.git.joe@perches.com> Reply-To: htl10@users.sourceforge.net Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: "John W. Linville" , Herton Ronaldo Krzesinski , Larry Finger , Joe Perches Return-path: In-Reply-To: <93ab9a323e85d1b0d8c7eac4db7ab7835e61efe6.1342157022.git.joe@perches.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org --- On Fri, 13/7/12, Joe Perches wrote: > From: Joe Perches > Subject: [PATCH net-next 4/8] wireless: Use eth_random_addr > To: "David Miller" , "John W. Linville" , "Christian Lamparter" , "Ivo= van Doorn" , "Gertjan van Wingerde" , "Helmut Schaa" , "Herton Ronaldo K= rzesinski" , "Hin-Tak Leung" , "Larry Finger" > Cc: "Johannes Berg" , linux-wireless@vger.= kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, users= @rt2x00.serialmonkey.com > Date: Friday, 13 July, 2012, 6:33 > Convert the existing uses of > random_ether_addr to > the new eth_random_addr. >=20 > Signed-off-by: Joe Perches Acked-by: Hin-Tak Leung Would it make sense to have a "check & set" macro?=20 > --- > drivers/net/wireless/adm8211.c=A0 =A0 =A0 =A0 > =A0 =A0=A0=A0|=A0 =A0 2 +- > drivers/net/wireless/p54/eeprom.c=A0 =A0 =A0 > =A0 =A0 |=A0 =A0 2 +- > drivers/net/wireless/rt2x00/rt2400pci.c=A0 =A0 > |=A0 =A0 2 +- > drivers/net/wireless/rt2x00/rt2500pci.c=A0 =A0 > |=A0 =A0 2 +- > drivers/net/wireless/rt2x00/rt2500usb.c=A0 =A0 > |=A0 =A0 2 +- > drivers/net/wireless/rt2x00/rt2800lib.c=A0 =A0 > |=A0 =A0 2 +- > drivers/net/wireless/rt2x00/rt61pci.c=A0 =A0 =A0 > |=A0 =A0 2 +- > drivers/net/wireless/rt2x00/rt73usb.c=A0 =A0 =A0 > |=A0 =A0 2 +- > drivers/net/wireless/rtl818x/rtl8180/dev.c |=A0 =A0 2 > +- > drivers/net/wireless/rtl818x/rtl8187/dev.c |=A0 =A0 2 > +- > 10 files changed, 10 insertions(+), 10 deletions(-) >=20 > diff --git a/drivers/net/wireless/adm8211.c > b/drivers/net/wireless/adm8211.c > index 97afcec..689a71c 100644 > --- a/drivers/net/wireless/adm8211.c > +++ b/drivers/net/wireless/adm8211.c > @@ -1854,7 +1854,7 @@ static int __devinit > adm8211_probe(struct pci_dev *pdev, > =A0=A0=A0 if (!is_valid_ether_addr(perm_addr)) { > =A0=A0=A0 =A0=A0=A0 printk(KERN_WARNING > "%s (adm8211): Invalid hwaddr in EEPROM!\n", > =A0=A0=A0 =A0=A0=A0 =A0 =A0 > =A0=A0=A0pci_name(pdev)); > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(perm_addr); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(perm_addr); > =A0=A0=A0 } > =A0=A0=A0 SET_IEEE80211_PERM_ADDR(dev, > perm_addr); > =20 > diff --git a/drivers/net/wireless/p54/eeprom.c > b/drivers/net/wireless/p54/eeprom.c > index 636daf2..1403709 100644 > --- a/drivers/net/wireless/p54/eeprom.c > +++ b/drivers/net/wireless/p54/eeprom.c > @@ -857,7 +857,7 @@ good_eeprom: > =20 > =A0=A0=A0 =A0=A0=A0 > wiphy_warn(dev->wiphy, > =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 > =A0=A0=A0"Invalid hwaddr! Using randomly generated > MAC addr\n"); > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(perm_addr); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(perm_addr); > =A0=A0=A0 =A0=A0=A0 > SET_IEEE80211_PERM_ADDR(dev, perm_addr); > =A0=A0=A0 } > =20 > diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c > b/drivers/net/wireless/rt2x00/rt2400pci.c > index 5e6b501..8b9dbd7 100644 > --- a/drivers/net/wireless/rt2x00/rt2400pci.c > +++ b/drivers/net/wireless/rt2x00/rt2400pci.c > @@ -1455,7 +1455,7 @@ static int > rt2400pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) > =A0=A0=A0=A0=A0*/ > =A0=A0=A0 mac =3D rt2x00_eeprom_addr(rt2x00dev, > EEPROM_MAC_ADDR_0); > =A0=A0=A0 if (!is_valid_ether_addr(mac)) { > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(mac); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(mac); > =A0=A0=A0 =A0=A0=A0 EEPROM(rt2x00dev, > "MAC: %pM\n", mac); > =A0=A0=A0 } > =20 > diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c > b/drivers/net/wireless/rt2x00/rt2500pci.c > index 136b849..d2cf8a4 100644 > --- a/drivers/net/wireless/rt2x00/rt2500pci.c > +++ b/drivers/net/wireless/rt2x00/rt2500pci.c > @@ -1585,7 +1585,7 @@ static int > rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) > =A0=A0=A0=A0=A0*/ > =A0=A0=A0 mac =3D rt2x00_eeprom_addr(rt2x00dev, > EEPROM_MAC_ADDR_0); > =A0=A0=A0 if (!is_valid_ether_addr(mac)) { > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(mac); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(mac); > =A0=A0=A0 =A0=A0=A0 EEPROM(rt2x00dev, > "MAC: %pM\n", mac); > =A0=A0=A0 } > =20 > diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c > b/drivers/net/wireless/rt2x00/rt2500usb.c > index 669aecd..3aae36b 100644 > --- a/drivers/net/wireless/rt2x00/rt2500usb.c > +++ b/drivers/net/wireless/rt2x00/rt2500usb.c > @@ -1352,7 +1352,7 @@ static int > rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) > =A0=A0=A0=A0=A0*/ > =A0=A0=A0 mac =3D rt2x00_eeprom_addr(rt2x00dev, > EEPROM_MAC_ADDR_0); > =A0=A0=A0 if (!is_valid_ether_addr(mac)) { > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(mac); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(mac); > =A0=A0=A0 =A0=A0=A0 EEPROM(rt2x00dev, > "MAC: %pM\n", mac); > =A0=A0=A0 } > =20 > diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c > b/drivers/net/wireless/rt2x00/rt2800lib.c > index 068276e..d857d55 100644 > --- a/drivers/net/wireless/rt2x00/rt2800lib.c > +++ b/drivers/net/wireless/rt2x00/rt2800lib.c > @@ -4340,7 +4340,7 @@ int rt2800_validate_eeprom(struct > rt2x00_dev *rt2x00dev) > =A0=A0=A0=A0=A0*/ > =A0=A0=A0 mac =3D rt2x00_eeprom_addr(rt2x00dev, > EEPROM_MAC_ADDR_0); > =A0=A0=A0 if (!is_valid_ether_addr(mac)) { > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(mac); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(mac); > =A0=A0=A0 =A0=A0=A0 EEPROM(rt2x00dev, > "MAC: %pM\n", mac); > =A0=A0=A0 } > =20 > diff --git a/drivers/net/wireless/rt2x00/rt61pci.c > b/drivers/net/wireless/rt2x00/rt61pci.c > index ee22bd7..f322596 100644 > --- a/drivers/net/wireless/rt2x00/rt61pci.c > +++ b/drivers/net/wireless/rt2x00/rt61pci.c > @@ -2415,7 +2415,7 @@ static int > rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) > =A0=A0=A0=A0=A0*/ > =A0=A0=A0 mac =3D rt2x00_eeprom_addr(rt2x00dev, > EEPROM_MAC_ADDR_0); > =A0=A0=A0 if (!is_valid_ether_addr(mac)) { > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(mac); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(mac); > =A0=A0=A0 =A0=A0=A0 EEPROM(rt2x00dev, > "MAC: %pM\n", mac); > =A0=A0=A0 } > =20 > diff --git a/drivers/net/wireless/rt2x00/rt73usb.c > b/drivers/net/wireless/rt2x00/rt73usb.c > index 77ccbbc..ba6e434 100644 > --- a/drivers/net/wireless/rt2x00/rt73usb.c > +++ b/drivers/net/wireless/rt2x00/rt73usb.c > @@ -1770,7 +1770,7 @@ static int > rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) > =A0=A0=A0=A0=A0*/ > =A0=A0=A0 mac =3D rt2x00_eeprom_addr(rt2x00dev, > EEPROM_MAC_ADDR_0); > =A0=A0=A0 if (!is_valid_ether_addr(mac)) { > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(mac); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(mac); > =A0=A0=A0 =A0=A0=A0 EEPROM(rt2x00dev, > "MAC: %pM\n", mac); > =A0=A0=A0 } > =20 > diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c > b/drivers/net/wireless/rtl818x/rtl8180/dev.c > index 3b50539..aceaf68 100644 > --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c > +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c > @@ -1078,7 +1078,7 @@ static int __devinit > rtl8180_probe(struct pci_dev *pdev, > =A0=A0=A0 if (!is_valid_ether_addr(mac_addr)) { > =A0=A0=A0 =A0=A0=A0 printk(KERN_WARNING > "%s (rtl8180): Invalid hwaddr! Using" > =A0=A0=A0 =A0=A0=A0 =A0 =A0 > =A0=A0=A0" randomly generated MAC addr\n", > pci_name(pdev)); > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(mac_addr); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(mac_addr); > =A0=A0=A0 } > =A0=A0=A0 SET_IEEE80211_PERM_ADDR(dev, mac_addr); > =20 > diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c > b/drivers/net/wireless/rtl818x/rtl8187/dev.c > index 4fb1ca1..71a30b0 100644 > --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c > +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c > @@ -1486,7 +1486,7 @@ static int __devinit > rtl8187_probe(struct usb_interface *intf, > =A0=A0=A0 if (!is_valid_ether_addr(mac_addr)) { > =A0=A0=A0 =A0=A0=A0 printk(KERN_WARNING > "rtl8187: Invalid hwaddr! Using randomly " > =A0=A0=A0 =A0=A0=A0 =A0 =A0 > =A0=A0=A0"generated MAC address\n"); > -=A0=A0=A0 =A0=A0=A0 > random_ether_addr(mac_addr); > +=A0=A0=A0 =A0=A0=A0 > eth_random_addr(mac_addr); > =A0=A0=A0 } > =A0=A0=A0 SET_IEEE80211_PERM_ADDR(dev, mac_addr); > =20 > --=20 > 1.7.8.111.gad25c.dirty >=20 >=20