* [PATCH net-next 1/8] etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
@ 2012-07-13 5:33 ` Joe Perches
2012-07-13 5:33 ` [PATCH net-next 2/8] ethernet: Use eth_random_addr Joe Perches
` (8 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Joe Perches @ 2012-07-13 5:33 UTC (permalink / raw)
To: David Miller, linux-kernel; +Cc: Johannes Berg, netdev
Add some API symmetry to eth_broadcast_addr and
add a #define to the old name for backward compatibility.
Signed-off-by: Joe Perches <joe@perches.com>
---
include/linux/etherdevice.h | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 98a27cc..d426336 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -124,19 +124,21 @@ static inline bool is_valid_ether_addr(const u8 *addr)
}
/**
- * random_ether_addr - Generate software assigned random Ethernet address
+ * eth_random_addr - Generate software assigned random Ethernet address
* @addr: Pointer to a six-byte array containing the Ethernet address
*
* Generate a random Ethernet address (MAC) that is not multicast
* and has the local assigned bit set.
*/
-static inline void random_ether_addr(u8 *addr)
+static inline void eth_random_addr(u8 *addr)
{
- get_random_bytes (addr, ETH_ALEN);
- addr [0] &= 0xfe; /* clear multicast bit */
- addr [0] |= 0x02; /* set local assignment bit (IEEE802) */
+ get_random_bytes(addr, ETH_ALEN);
+ addr[0] &= 0xfe; /* clear multicast bit */
+ addr[0] |= 0x02; /* set local assignment bit (IEEE802) */
}
+#define random_ether_addr(addr) eth_random_addr(addr)
+
/**
* eth_broadcast_addr - Assign broadcast address
* @addr: Pointer to a six-byte array containing the Ethernet address
@@ -160,7 +162,7 @@ static inline void eth_broadcast_addr(u8 *addr)
static inline void eth_hw_addr_random(struct net_device *dev)
{
dev->addr_assign_type |= NET_ADDR_RANDOM;
- random_ether_addr(dev->dev_addr);
+ eth_random_addr(dev->dev_addr);
}
/**
--
1.7.8.111.gad25c.dirty
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH net-next 2/8] ethernet: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
2012-07-13 5:33 ` [PATCH net-next 1/8] " Joe Perches
@ 2012-07-13 5:33 ` Joe Perches
2012-07-13 5:33 ` [PATCH net-next 3/8] net: usb: " Joe Perches
` (7 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Joe Perches @ 2012-07-13 5:33 UTC (permalink / raw)
To: David Miller, Steve Glendinning, Chris Metcalf, Anirudha Sarangi,
John Linn
Cc: Johannes Berg, Jay Cliburn, Chris Snook, Jeff Kirsher,
Jesse Brandeburg, Bruce Allan, Carolyn Wyborny, Don Skidmore,
Greg Rose, Peter P Waskiewicz Jr, Alex Duyck, John Ronciak,
netdev, linux-kernel, e1000-devel
Convert the existing uses of random_ether_addr to
the new eth_random_addr.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +-
drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
drivers/net/ethernet/ethoc.c | 2 +-
drivers/net/ethernet/intel/igb/igb_main.c | 4 ++--
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +-
drivers/net/ethernet/lantiq_etop.c | 2 +-
drivers/net/ethernet/micrel/ks8851.c | 2 +-
drivers/net/ethernet/micrel/ks8851_mll.c | 2 +-
drivers/net/ethernet/smsc/smsc911x.c | 2 +-
drivers/net/ethernet/ti/cpsw.c | 2 +-
drivers/net/ethernet/tile/tilegx.c | 2 +-
drivers/net/ethernet/wiznet/w5100.c | 2 +-
drivers/net/ethernet/wiznet/w5300.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
index 801f012..21e261f 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
@@ -199,7 +199,7 @@ int atl1c_read_mac_addr(struct atl1c_hw *hw)
err = atl1c_get_permanent_address(hw);
if (err)
- random_ether_addr(hw->perm_mac_addr);
+ eth_random_addr(hw->perm_mac_addr);
memcpy(hw->mac_addr, hw->perm_mac_addr, sizeof(hw->perm_mac_addr));
return err;
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index f2402f3..7bae2ad 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -538,7 +538,7 @@ static s32 atl1_read_mac_addr(struct atl1_hw *hw)
u16 i;
if (atl1_get_permanent_address(hw)) {
- random_ether_addr(hw->perm_mac_addr);
+ eth_random_addr(hw->perm_mac_addr);
ret = 1;
}
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 7c0b7e2..57d64b8 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -2346,7 +2346,7 @@ static s32 atl2_read_mac_addr(struct atl2_hw *hw)
{
if (get_permanent_address(hw)) {
/* for test */
- /* FIXME: shouldn't we use random_ether_addr() here? */
+ /* FIXME: shouldn't we use eth_random_addr() here? */
hw->perm_mac_addr[0] = 0x00;
hw->perm_mac_addr[1] = 0x13;
hw->perm_mac_addr[2] = 0x74;
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index 2029788..94b7bfc 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -1057,7 +1057,7 @@ static int __devinit ethoc_probe(struct platform_device *pdev)
/* Check the MAC again for validity, if it still isn't choose and
* program a random one. */
if (!is_valid_ether_addr(netdev->dev_addr)) {
- random_ether_addr(netdev->dev_addr);
+ eth_random_addr(netdev->dev_addr);
random_mac = true;
}
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 60e3075..8adeca9 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -5008,7 +5008,7 @@ static int igb_vf_configure(struct igb_adapter *adapter, int vf)
unsigned int device_id;
u16 thisvf_devfn;
- random_ether_addr(mac_addr);
+ eth_random_addr(mac_addr);
igb_set_vf_mac(adapter, vf, mac_addr);
switch (adapter->hw.mac.type) {
@@ -5417,7 +5417,7 @@ static void igb_vf_reset_event(struct igb_adapter *adapter, u32 vf)
/* generate a new mac address as we were hotplug removed/added */
if (!(adapter->vf_data[vf].flags & IGB_VF_FLAG_PF_SET_MAC))
- random_ether_addr(vf_mac);
+ eth_random_addr(vf_mac);
/* process remaining reset events */
igb_vf_reset(adapter, vf);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 2d971d1..eb3f67c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -467,7 +467,7 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)
bool enable = ((event_mask & 0x10000000U) != 0);
if (enable) {
- random_ether_addr(vf_mac_addr);
+ eth_random_addr(vf_mac_addr);
e_info(probe, "IOV: VF %d is enabled MAC %pM\n",
vfn, vf_mac_addr);
/*
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 9fa39eb..003c5bc 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -645,7 +645,7 @@ ltq_etop_init(struct net_device *dev)
memcpy(&mac, &priv->pldata->mac, sizeof(struct sockaddr));
if (!is_valid_ether_addr(mac.sa_data)) {
pr_warn("etop: invalid MAC, using random\n");
- random_ether_addr(mac.sa_data);
+ eth_random_addr(mac.sa_data);
random_mac = true;
}
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 5e313e9..1540ebe 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -422,7 +422,7 @@ static void ks8851_read_mac_addr(struct net_device *dev)
*
* Get or create the initial mac address for the device and then set that
* into the station address register. If there is an EEPROM present, then
- * we try that. If no valid mac address is found we use random_ether_addr()
+ * we try that. If no valid mac address is found we use eth_random_addr()
* to create a new one.
*/
static void ks8851_init_mac(struct ks8851_net *ks)
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 59ef568..38529ed 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -1609,7 +1609,7 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
memcpy(ks->mac_addr, pdata->mac_addr, 6);
if (!is_valid_ether_addr(ks->mac_addr)) {
/* Use random MAC address if none passed */
- random_ether_addr(ks->mac_addr);
+ eth_random_addr(ks->mac_addr);
netdev_info(netdev, "Using random mac address\n");
}
netdev_info(netdev, "Mac address is: %pM\n", ks->mac_addr);
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 54ca99d..62d1baf 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2488,7 +2488,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
eth_hw_addr_random(dev);
smsc911x_set_hw_mac_address(pdata, dev->dev_addr);
SMSC_TRACE(pdata, probe,
- "MAC Address is set to random_ether_addr");
+ "MAC Address is set to eth_random_addr");
}
}
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 6685bbb..ca381d3 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -748,7 +748,7 @@ static int __devinit cpsw_probe(struct platform_device *pdev)
memcpy(priv->mac_addr, data->slave_data[0].mac_addr, ETH_ALEN);
pr_info("Detected MACID = %pM", priv->mac_addr);
} else {
- random_ether_addr(priv->mac_addr);
+ eth_random_addr(priv->mac_addr);
pr_info("Random MACID = %pM", priv->mac_addr);
}
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
index 83b4b38..7f50028 100644
--- a/drivers/net/ethernet/tile/tilegx.c
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -1844,7 +1844,7 @@ static void tile_net_dev_init(const char *name, const uint8_t *mac)
memcpy(dev->dev_addr, mac, 6);
dev->addr_len = 6;
} else {
- random_ether_addr(dev->dev_addr);
+ eth_random_addr(dev->dev_addr);
}
/* Register the network device. */
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index a75e9ef..a5826a3 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -637,7 +637,7 @@ static int __devinit w5100_hw_probe(struct platform_device *pdev)
if (data && is_valid_ether_addr(data->mac_addr)) {
memcpy(ndev->dev_addr, data->mac_addr, ETH_ALEN);
} else {
- random_ether_addr(ndev->dev_addr);
+ eth_random_addr(ndev->dev_addr);
ndev->addr_assign_type |= NET_ADDR_RANDOM;
}
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 3306a20..bdd8891 100644
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -557,7 +557,7 @@ static int __devinit w5300_hw_probe(struct platform_device *pdev)
if (data && is_valid_ether_addr(data->mac_addr)) {
memcpy(ndev->dev_addr, data->mac_addr, ETH_ALEN);
} else {
- random_ether_addr(ndev->dev_addr);
+ eth_random_addr(ndev->dev_addr);
ndev->addr_assign_type |= NET_ADDR_RANDOM;
}
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 9c365e1..0793299 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -312,7 +312,7 @@ static void axienet_set_mac_address(struct net_device *ndev, void *address)
if (address)
memcpy(ndev->dev_addr, address, ETH_ALEN);
if (!is_valid_ether_addr(ndev->dev_addr))
- random_ether_addr(ndev->dev_addr);
+ eth_random_addr(ndev->dev_addr);
/* Set up unicast MAC address filter set its mac address */
axienet_iow(lp, XAE_UAW0_OFFSET,
--
1.7.8.111.gad25c.dirty
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH net-next 3/8] net: usb: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
2012-07-13 5:33 ` [PATCH net-next 1/8] " Joe Perches
2012-07-13 5:33 ` [PATCH net-next 2/8] ethernet: Use eth_random_addr Joe Perches
@ 2012-07-13 5:33 ` Joe Perches
2012-07-13 5:33 ` [PATCH net-next 4/8] wireless: " Joe Perches
` (6 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Joe Perches @ 2012-07-13 5:33 UTC (permalink / raw)
To: David Miller, Greg Kroah-Hartman, Steve Glendinning,
Oliver Neukum
Cc: Johannes Berg, linux-usb, netdev, linux-kernel
Convert the existing uses of random_ether_addr to
the new eth_random_addr.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/usb/smsc75xx.c | 2 +-
drivers/net/usb/smsc95xx.c | 2 +-
drivers/net/usb/usbnet.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 1c6e515..6c0c5b7 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -616,7 +616,7 @@ static void smsc75xx_init_mac_address(struct usbnet *dev)
/* no eeprom, or eeprom values are invalid. generate random MAC */
eth_hw_addr_random(dev->net);
- netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr");
+ netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr");
}
static int smsc75xx_set_mac_address(struct usbnet *dev)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index bd7cbaa..25cc3a1 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -647,7 +647,7 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
/* no eeprom, or eeprom values are invalid. generate random MAC */
eth_hw_addr_random(dev->net);
- netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n");
+ netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
}
static int smsc95xx_set_mac_address(struct usbnet *dev)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index e92c057..8531c1c 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1593,7 +1593,7 @@ static int __init usbnet_init(void)
BUILD_BUG_ON(
FIELD_SIZEOF(struct sk_buff, cb) < sizeof(struct skb_data));
- random_ether_addr(node_id);
+ eth_random_addr(node_id);
return 0;
}
module_init(usbnet_init);
--
1.7.8.111.gad25c.dirty
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH net-next 4/8] wireless: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
` (2 preceding siblings ...)
2012-07-13 5:33 ` [PATCH net-next 3/8] net: usb: " Joe Perches
@ 2012-07-13 5:33 ` Joe Perches
2012-07-13 5:54 ` Hin-Tak Leung
2012-07-13 7:15 ` Gertjan van Wingerde
2012-07-13 5:33 ` [PATCH net-next 5/8] drivers/net: " Joe Perches
` (5 subsequent siblings)
9 siblings, 2 replies; 20+ messages in thread
From: Joe Perches @ 2012-07-13 5:33 UTC (permalink / raw)
To: David Miller, John W. Linville, Christian Lamparter,
Ivo van Doorn, Gertjan van Wingerde, Helmut Schaa,
Herton Ronaldo Krzesinski, Hin-Tak Leung, Larry Finger
Cc: Johannes Berg, linux-wireless, netdev, linux-kernel, users
Convert the existing uses of random_ether_addr to
the new eth_random_addr.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/adm8211.c | 2 +-
drivers/net/wireless/p54/eeprom.c | 2 +-
drivers/net/wireless/rt2x00/rt2400pci.c | 2 +-
drivers/net/wireless/rt2x00/rt2500pci.c | 2 +-
drivers/net/wireless/rt2x00/rt2500usb.c | 2 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
drivers/net/wireless/rt2x00/rt61pci.c | 2 +-
drivers/net/wireless/rt2x00/rt73usb.c | 2 +-
drivers/net/wireless/rtl818x/rtl8180/dev.c | 2 +-
drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
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,
if (!is_valid_ether_addr(perm_addr)) {
printk(KERN_WARNING "%s (adm8211): Invalid hwaddr in EEPROM!\n",
pci_name(pdev));
- random_ether_addr(perm_addr);
+ eth_random_addr(perm_addr);
}
SET_IEEE80211_PERM_ADDR(dev, perm_addr);
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:
wiphy_warn(dev->wiphy,
"Invalid hwaddr! Using randomly generated MAC addr\n");
- random_ether_addr(perm_addr);
+ eth_random_addr(perm_addr);
SET_IEEE80211_PERM_ADDR(dev, perm_addr);
}
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)
*/
mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
if (!is_valid_ether_addr(mac)) {
- random_ether_addr(mac);
+ eth_random_addr(mac);
EEPROM(rt2x00dev, "MAC: %pM\n", mac);
}
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)
*/
mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
if (!is_valid_ether_addr(mac)) {
- random_ether_addr(mac);
+ eth_random_addr(mac);
EEPROM(rt2x00dev, "MAC: %pM\n", mac);
}
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)
*/
mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
if (!is_valid_ether_addr(mac)) {
- random_ether_addr(mac);
+ eth_random_addr(mac);
EEPROM(rt2x00dev, "MAC: %pM\n", mac);
}
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)
*/
mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
if (!is_valid_ether_addr(mac)) {
- random_ether_addr(mac);
+ eth_random_addr(mac);
EEPROM(rt2x00dev, "MAC: %pM\n", mac);
}
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)
*/
mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
if (!is_valid_ether_addr(mac)) {
- random_ether_addr(mac);
+ eth_random_addr(mac);
EEPROM(rt2x00dev, "MAC: %pM\n", mac);
}
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)
*/
mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
if (!is_valid_ether_addr(mac)) {
- random_ether_addr(mac);
+ eth_random_addr(mac);
EEPROM(rt2x00dev, "MAC: %pM\n", mac);
}
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,
if (!is_valid_ether_addr(mac_addr)) {
printk(KERN_WARNING "%s (rtl8180): Invalid hwaddr! Using"
" randomly generated MAC addr\n", pci_name(pdev));
- random_ether_addr(mac_addr);
+ eth_random_addr(mac_addr);
}
SET_IEEE80211_PERM_ADDR(dev, mac_addr);
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,
if (!is_valid_ether_addr(mac_addr)) {
printk(KERN_WARNING "rtl8187: Invalid hwaddr! Using randomly "
"generated MAC address\n");
- random_ether_addr(mac_addr);
+ eth_random_addr(mac_addr);
}
SET_IEEE80211_PERM_ADDR(dev, mac_addr);
--
1.7.8.111.gad25c.dirty
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH net-next 4/8] wireless: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 4/8] wireless: " Joe Perches
@ 2012-07-13 5:54 ` Hin-Tak Leung
2012-07-13 7:15 ` Gertjan van Wingerde
1 sibling, 0 replies; 20+ messages in thread
From: Hin-Tak Leung @ 2012-07-13 5:54 UTC (permalink / raw)
To: John W. Linville, Herton Ronaldo Krzesinski, Larry Finger,
Joe Perches
Cc: linux-wireless, netdev, linux-kernel
--- On Fri, 13/7/12, Joe Perches <joe@perches.com> wrote:
> From: Joe Perches <joe@perches.com>
> Subject: [PATCH net-next 4/8] wireless: Use eth_random_addr
> To: "David Miller" <davem@davemloft.net>, "John W. Linville" <linville@tuxdriver.com>, "Christian Lamparter" <chunkeey@googlemail.com>, "Ivo van Doorn" <IvDoorn@gmail.com>, "Gertjan van Wingerde" <gwingerde@gmail.com>, "Helmut Schaa" <helmut.schaa@googlemail.com>, "Herton Ronaldo Krzesinski" <herton@canonical.com>, "Hin-Tak Leung" <htl10@users.sourceforge.net>, "Larry Finger" <Larry.Finger@lwfinger.net>
> Cc: "Johannes Berg" <johannes@sipsolutions.net>, 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.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Would it make sense to have a "check & set" macro?
> ---
> drivers/net/wireless/adm8211.c
> | 2 +-
> drivers/net/wireless/p54/eeprom.c
> | 2 +-
> drivers/net/wireless/rt2x00/rt2400pci.c
> | 2 +-
> drivers/net/wireless/rt2x00/rt2500pci.c
> | 2 +-
> drivers/net/wireless/rt2x00/rt2500usb.c
> | 2 +-
> drivers/net/wireless/rt2x00/rt2800lib.c
> | 2 +-
> drivers/net/wireless/rt2x00/rt61pci.c
> | 2 +-
> drivers/net/wireless/rt2x00/rt73usb.c
> | 2 +-
> drivers/net/wireless/rtl818x/rtl8180/dev.c | 2
> +-
> drivers/net/wireless/rtl818x/rtl8187/dev.c | 2
> +-
> 10 files changed, 10 insertions(+), 10 deletions(-)
>
> 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,
> if (!is_valid_ether_addr(perm_addr)) {
> printk(KERN_WARNING
> "%s (adm8211): Invalid hwaddr in EEPROM!\n",
>
> pci_name(pdev));
> -
> random_ether_addr(perm_addr);
> +
> eth_random_addr(perm_addr);
> }
> SET_IEEE80211_PERM_ADDR(dev,
> perm_addr);
>
> 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:
>
>
> wiphy_warn(dev->wiphy,
>
> "Invalid hwaddr! Using randomly generated
> MAC addr\n");
> -
> random_ether_addr(perm_addr);
> +
> eth_random_addr(perm_addr);
>
> SET_IEEE80211_PERM_ADDR(dev, perm_addr);
> }
>
> 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)
> */
> mac = rt2x00_eeprom_addr(rt2x00dev,
> EEPROM_MAC_ADDR_0);
> if (!is_valid_ether_addr(mac)) {
> -
> random_ether_addr(mac);
> +
> eth_random_addr(mac);
> EEPROM(rt2x00dev,
> "MAC: %pM\n", mac);
> }
>
> 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)
> */
> mac = rt2x00_eeprom_addr(rt2x00dev,
> EEPROM_MAC_ADDR_0);
> if (!is_valid_ether_addr(mac)) {
> -
> random_ether_addr(mac);
> +
> eth_random_addr(mac);
> EEPROM(rt2x00dev,
> "MAC: %pM\n", mac);
> }
>
> 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)
> */
> mac = rt2x00_eeprom_addr(rt2x00dev,
> EEPROM_MAC_ADDR_0);
> if (!is_valid_ether_addr(mac)) {
> -
> random_ether_addr(mac);
> +
> eth_random_addr(mac);
> EEPROM(rt2x00dev,
> "MAC: %pM\n", mac);
> }
>
> 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)
> */
> mac = rt2x00_eeprom_addr(rt2x00dev,
> EEPROM_MAC_ADDR_0);
> if (!is_valid_ether_addr(mac)) {
> -
> random_ether_addr(mac);
> +
> eth_random_addr(mac);
> EEPROM(rt2x00dev,
> "MAC: %pM\n", mac);
> }
>
> 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)
> */
> mac = rt2x00_eeprom_addr(rt2x00dev,
> EEPROM_MAC_ADDR_0);
> if (!is_valid_ether_addr(mac)) {
> -
> random_ether_addr(mac);
> +
> eth_random_addr(mac);
> EEPROM(rt2x00dev,
> "MAC: %pM\n", mac);
> }
>
> 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)
> */
> mac = rt2x00_eeprom_addr(rt2x00dev,
> EEPROM_MAC_ADDR_0);
> if (!is_valid_ether_addr(mac)) {
> -
> random_ether_addr(mac);
> +
> eth_random_addr(mac);
> EEPROM(rt2x00dev,
> "MAC: %pM\n", mac);
> }
>
> 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,
> if (!is_valid_ether_addr(mac_addr)) {
> printk(KERN_WARNING
> "%s (rtl8180): Invalid hwaddr! Using"
>
> " randomly generated MAC addr\n",
> pci_name(pdev));
> -
> random_ether_addr(mac_addr);
> +
> eth_random_addr(mac_addr);
> }
> SET_IEEE80211_PERM_ADDR(dev, mac_addr);
>
> 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,
> if (!is_valid_ether_addr(mac_addr)) {
> printk(KERN_WARNING
> "rtl8187: Invalid hwaddr! Using randomly "
>
> "generated MAC address\n");
> -
> random_ether_addr(mac_addr);
> +
> eth_random_addr(mac_addr);
> }
> SET_IEEE80211_PERM_ADDR(dev, mac_addr);
>
> --
> 1.7.8.111.gad25c.dirty
>
>
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH net-next 4/8] wireless: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 4/8] wireless: " Joe Perches
2012-07-13 5:54 ` Hin-Tak Leung
@ 2012-07-13 7:15 ` Gertjan van Wingerde
1 sibling, 0 replies; 20+ messages in thread
From: Gertjan van Wingerde @ 2012-07-13 7:15 UTC (permalink / raw)
To: Joe Perches
Cc: David Miller, John W. Linville, Christian Lamparter,
Ivo van Doorn, Helmut Schaa, Herton Ronaldo Krzesinski,
Hin-Tak Leung, Larry Finger, Johannes Berg, linux-wireless,
netdev, linux-kernel, users
On Fri, Jul 13, 2012 at 7:33 AM, Joe Perches <joe@perches.com> wrote:
> Convert the existing uses of random_ether_addr to
> the new eth_random_addr.
>
> Signed-off-by: Joe Perches <joe@perches.com>
For the rt2x00 parts:
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
> ---
> drivers/net/wireless/adm8211.c | 2 +-
> drivers/net/wireless/p54/eeprom.c | 2 +-
> drivers/net/wireless/rt2x00/rt2400pci.c | 2 +-
> drivers/net/wireless/rt2x00/rt2500pci.c | 2 +-
> drivers/net/wireless/rt2x00/rt2500usb.c | 2 +-
> drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
> drivers/net/wireless/rt2x00/rt61pci.c | 2 +-
> drivers/net/wireless/rt2x00/rt73usb.c | 2 +-
> drivers/net/wireless/rtl818x/rtl8180/dev.c | 2 +-
> drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
> 10 files changed, 10 insertions(+), 10 deletions(-)
>
---
Gertjan
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH net-next 5/8] drivers/net: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
` (3 preceding siblings ...)
2012-07-13 5:33 ` [PATCH net-next 4/8] wireless: " Joe Perches
@ 2012-07-13 5:33 ` Joe Perches
2012-07-13 5:33 ` [PATCH net-next 6/8] s390: " Joe Perches
` (4 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Joe Perches @ 2012-07-13 5:33 UTC (permalink / raw)
To: David Miller, Inaky Perez-Gonzalez, linux-wimax
Cc: Johannes Berg, netdev, linux-kernel, wimax
Convert the existing uses of random_ether_addr to
the new eth_random_addr.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tun.c | 2 +-
drivers/net/wimax/i2400m/driver.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 987aeef..961fad1 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -22,7 +22,7 @@
* Add TUNSETLINK ioctl to set the link encapsulation
*
* Mark Smith <markzzzsmith@yahoo.com.au>
- * Use random_ether_addr() for tap MAC address.
+ * Use eth_random_addr() for tap MAC address.
*
* Harald Roelle <harald.roelle@ifi.lmu.de> 2004/04/20
* Fixes in packet dropping, queue length setting and queue wakeup.
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index 47cae71..01d400d 100644
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
@@ -897,7 +897,7 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags)
result = i2400m_read_mac_addr(i2400m);
if (result < 0)
goto error_read_mac_addr;
- random_ether_addr(i2400m->src_mac_addr);
+ eth_random_addr(i2400m->src_mac_addr);
i2400m->pm_notifier.notifier_call = i2400m_pm_notifier;
register_pm_notifier(&i2400m->pm_notifier);
--
1.7.8.111.gad25c.dirty
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH net-next 6/8] s390: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
` (4 preceding siblings ...)
2012-07-13 5:33 ` [PATCH net-next 5/8] drivers/net: " Joe Perches
@ 2012-07-13 5:33 ` Joe Perches
2012-07-13 5:33 ` [PATCH net-next 7/8] usb: " Joe Perches
` (3 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Joe Perches @ 2012-07-13 5:33 UTC (permalink / raw)
To: David Miller, Ursula Braun, Frank Blaschka, linux390
Cc: Johannes Berg, Martin Schwidefsky, Heiko Carstens, linux-s390,
linux-kernel
Convert the existing uses of random_ether_addr to
the new eth_random_addr.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/s390/net/qeth_l2_main.c | 2 +-
drivers/s390/net/qeth_l3_main.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 4269865..b09355c 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -647,7 +647,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)
}
QETH_DBF_HEX(SETUP, 2, card->dev->dev_addr, OSA_ADDR_LEN);
} else {
- random_ether_addr(card->dev->dev_addr);
+ eth_random_addr(card->dev->dev_addr);
memcpy(card->dev->dev_addr, vendor_pre, 3);
}
return 0;
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 73ac63d..bada7f6 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1473,7 +1473,7 @@ static int qeth_l3_iqd_read_initial_mac_cb(struct qeth_card *card,
memcpy(card->dev->dev_addr,
cmd->data.create_destroy_addr.unique_id, ETH_ALEN);
else
- random_ether_addr(card->dev->dev_addr);
+ eth_random_addr(card->dev->dev_addr);
return 0;
}
--
1.7.8.111.gad25c.dirty
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH net-next 7/8] usb: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
` (5 preceding siblings ...)
2012-07-13 5:33 ` [PATCH net-next 6/8] s390: " Joe Perches
@ 2012-07-13 5:33 ` Joe Perches
2012-07-16 11:15 ` Felipe Balbi
2012-07-13 5:33 ` [PATCH net-next 8/8] arch: " Joe Perches
` (2 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Joe Perches @ 2012-07-13 5:33 UTC (permalink / raw)
To: David Miller, Felipe Balbi
Cc: Johannes Berg, Greg Kroah-Hartman, linux-usb, linux-kernel
Convert the existing uses of random_ether_addr to
the new eth_random_addr.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/usb/atm/xusbatm.c | 4 ++--
drivers/usb/gadget/u_ether.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
index 14ec9f0..b3b1bb7 100644
--- a/drivers/usb/atm/xusbatm.c
+++ b/drivers/usb/atm/xusbatm.c
@@ -20,7 +20,7 @@
******************************************************************************/
#include <linux/module.h>
-#include <linux/etherdevice.h> /* for random_ether_addr() */
+#include <linux/etherdevice.h> /* for eth_random_addr() */
#include "usbatm.h"
@@ -163,7 +163,7 @@ static int xusbatm_atm_start(struct usbatm_data *usbatm,
atm_dbg(usbatm, "%s entered\n", __func__);
/* use random MAC as we've no way to get it from the device */
- random_ether_addr(atm_dev->esi);
+ eth_random_addr(atm_dev->esi);
return 0;
}
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index 47cf48b..b9e1925 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -724,7 +724,7 @@ static int get_ether_addr(const char *str, u8 *dev_addr)
if (is_valid_ether_addr(dev_addr))
return 0;
}
- random_ether_addr(dev_addr);
+ eth_random_addr(dev_addr);
return 1;
}
--
1.7.8.111.gad25c.dirty
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH net-next 7/8] usb: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 7/8] usb: " Joe Perches
@ 2012-07-16 11:15 ` Felipe Balbi
0 siblings, 0 replies; 20+ messages in thread
From: Felipe Balbi @ 2012-07-16 11:15 UTC (permalink / raw)
To: Joe Perches
Cc: David Miller, Felipe Balbi, Johannes Berg, Greg Kroah-Hartman,
linux-usb, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1669 bytes --]
On Thu, Jul 12, 2012 at 10:33:11PM -0700, Joe Perches wrote:
> Convert the existing uses of random_ether_addr to
> the new eth_random_addr.
>
> Signed-off-by: Joe Perches <joe@perches.com>
for drivers/usb/gadget:
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> drivers/usb/atm/xusbatm.c | 4 ++--
> drivers/usb/gadget/u_ether.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
> index 14ec9f0..b3b1bb7 100644
> --- a/drivers/usb/atm/xusbatm.c
> +++ b/drivers/usb/atm/xusbatm.c
> @@ -20,7 +20,7 @@
> ******************************************************************************/
>
> #include <linux/module.h>
> -#include <linux/etherdevice.h> /* for random_ether_addr() */
> +#include <linux/etherdevice.h> /* for eth_random_addr() */
>
> #include "usbatm.h"
>
> @@ -163,7 +163,7 @@ static int xusbatm_atm_start(struct usbatm_data *usbatm,
> atm_dbg(usbatm, "%s entered\n", __func__);
>
> /* use random MAC as we've no way to get it from the device */
> - random_ether_addr(atm_dev->esi);
> + eth_random_addr(atm_dev->esi);
>
> return 0;
> }
> diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
> index 47cf48b..b9e1925 100644
> --- a/drivers/usb/gadget/u_ether.c
> +++ b/drivers/usb/gadget/u_ether.c
> @@ -724,7 +724,7 @@ static int get_ether_addr(const char *str, u8 *dev_addr)
> if (is_valid_ether_addr(dev_addr))
> return 0;
> }
> - random_ether_addr(dev_addr);
> + eth_random_addr(dev_addr);
> return 1;
> }
>
> --
> 1.7.8.111.gad25c.dirty
>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH net-next 8/8] arch: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
` (6 preceding siblings ...)
2012-07-13 5:33 ` [PATCH net-next 7/8] usb: " Joe Perches
@ 2012-07-13 5:33 ` Joe Perches
2012-07-15 21:51 ` Mike Frysinger
` (2 more replies)
2012-07-16 10:14 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Felipe Balbi
2012-07-17 5:39 ` David Miller
9 siblings, 3 replies; 20+ messages in thread
From: Joe Perches @ 2012-07-13 5:33 UTC (permalink / raw)
To: David Miller, linux-kernel
Cc: Johannes Berg, Mike Frysinger, Mark Salter, Aurelien Jacquiot,
Ralf Baechle, Jeff Dike, Richard Weinberger, uclinux-dist-devel,
linux-c6x-dev, linux-mips, user-mode-linux-devel,
user-mode-linux-user
Convert the existing uses of random_ether_addr to
the new eth_random_addr.
Signed-off-by: Joe Perches <joe@perches.com>
---
arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
arch/c6x/kernel/soc.c | 2 +-
arch/mips/ar7/platform.c | 4 ++--
arch/mips/powertv/powertv_setup.c | 6 +++---
arch/um/drivers/net_kern.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index c9d9473..5ed654a 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -873,7 +873,7 @@ static struct adf702x_platform_data adf7021_platform_data = {
};
static inline void adf702x_mac_init(void)
{
- random_ether_addr(adf7021_platform_data.mac_addr);
+ eth_random_addr(adf7021_platform_data.mac_addr);
}
#else
static inline void adf702x_mac_init(void) {}
diff --git a/arch/c6x/kernel/soc.c b/arch/c6x/kernel/soc.c
index 0748c94..3ac7408 100644
--- a/arch/c6x/kernel/soc.c
+++ b/arch/c6x/kernel/soc.c
@@ -80,7 +80,7 @@ int soc_mac_addr(unsigned int index, u8 *addr)
if (have_fuse_mac)
memcpy(addr, c6x_fuse_mac, 6);
else
- random_ether_addr(addr);
+ eth_random_addr(addr);
}
/* adjust for specific EMAC device */
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 1a24d31..1bbc24b 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -310,10 +310,10 @@ static void __init cpmac_get_mac(int instance, unsigned char *dev_addr)
&dev_addr[4], &dev_addr[5]) != 6) {
pr_warning("cannot parse mac address, "
"using random address\n");
- random_ether_addr(dev_addr);
+ eth_random_addr(dev_addr);
}
} else
- random_ether_addr(dev_addr);
+ eth_random_addr(dev_addr);
}
/*****************************************************************************
diff --git a/arch/mips/powertv/powertv_setup.c b/arch/mips/powertv/powertv_setup.c
index 3933c37..820b848 100644
--- a/arch/mips/powertv/powertv_setup.c
+++ b/arch/mips/powertv/powertv_setup.c
@@ -254,7 +254,7 @@ early_param("rfmac", rfmac_param);
* Generates an Ethernet MAC address that is highly likely to be unique for
* this particular system on a network with other systems of the same type.
*
- * The problem we are solving is that, when random_ether_addr() is used to
+ * The problem we are solving is that, when eth_random_addr() is used to
* generate MAC addresses at startup, there isn't much entropy for the random
* number generator to use and the addresses it produces are fairly likely to
* be the same as those of other identical systems on the same local network.
@@ -269,7 +269,7 @@ early_param("rfmac", rfmac_param);
* Still, this does give us something to work with.
*
* The approach we take is:
- * 1. If we can't get the RF MAC Address, just call random_ether_addr.
+ * 1. If we can't get the RF MAC Address, just call eth_random_addr.
* 2. Use the 24-bit NIC-specific bits of the RF MAC address as the last 24
* bits of the new address. This is very likely to be unique, except for
* the current box.
@@ -299,7 +299,7 @@ void platform_random_ether_addr(u8 addr[ETH_ALEN])
if (!have_rfmac) {
pr_warning("rfmac not available on command line; "
"generating random MAC address\n");
- random_ether_addr(addr);
+ eth_random_addr(addr);
}
else {
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 0d60c56..458d324 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -339,7 +339,7 @@ static int setup_etheraddr(char *str, unsigned char *addr, char *name)
random:
printk(KERN_INFO
"Choosing a random ethernet address for device %s\n", name);
- random_ether_addr(addr);
+ eth_random_addr(addr);
return 1;
}
--
1.7.8.111.gad25c.dirty
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH net-next 8/8] arch: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 8/8] arch: " Joe Perches
@ 2012-07-15 21:51 ` Mike Frysinger
2012-07-16 12:56 ` Mark Salter
2012-07-16 14:20 ` Ralf Baechle
2 siblings, 0 replies; 20+ messages in thread
From: Mike Frysinger @ 2012-07-15 21:51 UTC (permalink / raw)
To: Joe Perches
Cc: David Miller, linux-kernel, Johannes Berg, Mark Salter,
Aurelien Jacquiot, Ralf Baechle, Jeff Dike, Richard Weinberger,
uclinux-dist-devel, linux-c6x-dev, linux-mips,
user-mode-linux-devel, user-mode-linux-user
[-- Attachment #1: Type: Text/Plain, Size: 301 bytes --]
On Friday 13 July 2012 01:33:12 Joe Perches wrote:
> Convert the existing uses of random_ether_addr to
> the new eth_random_addr.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH net-next 8/8] arch: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 8/8] arch: " Joe Perches
2012-07-15 21:51 ` Mike Frysinger
@ 2012-07-16 12:56 ` Mark Salter
2012-07-16 14:20 ` Ralf Baechle
2 siblings, 0 replies; 20+ messages in thread
From: Mark Salter @ 2012-07-16 12:56 UTC (permalink / raw)
To: Joe Perches
Cc: David Miller, linux-kernel, Johannes Berg, Mike Frysinger,
Aurelien Jacquiot, Ralf Baechle, Jeff Dike, Richard Weinberger,
uclinux-dist-devel, linux-c6x-dev, linux-mips,
user-mode-linux-devel, user-mode-linux-user
On Thu, 2012-07-12 at 22:33 -0700, Joe Perches wrote:
> Convert the existing uses of random_ether_addr to
> the new eth_random_addr.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
> arch/c6x/kernel/soc.c | 2 +-
Acked-by: Mark Salter <msalter@redhat.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH net-next 8/8] arch: Use eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 8/8] arch: " Joe Perches
2012-07-15 21:51 ` Mike Frysinger
2012-07-16 12:56 ` Mark Salter
@ 2012-07-16 14:20 ` Ralf Baechle
2 siblings, 0 replies; 20+ messages in thread
From: Ralf Baechle @ 2012-07-16 14:20 UTC (permalink / raw)
To: Joe Perches
Cc: David Miller, linux-kernel, Johannes Berg, Mike Frysinger,
Mark Salter, Aurelien Jacquiot, Jeff Dike, Richard Weinberger,
uclinux-dist-devel, linux-c6x-dev, linux-mips,
user-mode-linux-devel, user-mode-linux-user
On Thu, Jul 12, 2012 at 10:33:12PM -0700, Joe Perches wrote:
> Convert the existing uses of random_ether_addr to
> the new eth_random_addr.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
> arch/c6x/kernel/soc.c | 2 +-
> arch/mips/ar7/platform.c | 4 ++--
> arch/mips/powertv/powertv_setup.c | 6 +++---
> arch/um/drivers/net_kern.c | 2 +-
> 5 files changed, 8 insertions(+), 8 deletions(-)
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Thanks,
Ralf
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
` (7 preceding siblings ...)
2012-07-13 5:33 ` [PATCH net-next 8/8] arch: " Joe Perches
@ 2012-07-16 10:14 ` Felipe Balbi
2012-07-16 10:29 ` David Miller
2012-07-17 5:39 ` David Miller
9 siblings, 1 reply; 20+ messages in thread
From: Felipe Balbi @ 2012-07-16 10:14 UTC (permalink / raw)
To: Joe Perches
Cc: David Miller, netdev, linux-usb, wimax, linux-wireless, users,
linux-s390, Johannes Berg, uclinux-dist-devel, linux-kernel,
linux-c6x-dev, linux-mips, user-mode-linux-devel,
user-mode-linux-user, e1000-devel
[-- Attachment #1: Type: text/plain, Size: 3669 bytes --]
On Thu, Jul 12, 2012 at 10:33:04PM -0700, Joe Perches wrote:
> net-next commit ad7eee98be ("etherdevice: introduce eth_broadcast_addr")
> added a new style API. Rename random_ether_addr to eth_random_addr to
> create some API symmetry.
>
> Joe Perches (8):
> etherdevice: Rename random_ether_addr to eth_random_addr
if you're really renaming the function, then this patch alone will break
all of the below users. That should all be a single patch, I'm afraid.
> ethernet: Use eth_random_addr
> net: usb: Use eth_random_addr
> wireless: Use eth_random_addr
> drivers/net: Use eth_random_addr
> s390: Use eth_random_addr
> usb: Use eth_random_addr
> arch: Use eth_random_addr
>
> arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
> arch/c6x/kernel/soc.c | 2 +-
> arch/mips/ar7/platform.c | 4 ++--
> arch/mips/powertv/powertv_setup.c | 6 +++---
> arch/um/drivers/net_kern.c | 2 +-
> drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +-
> drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
> drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
> drivers/net/ethernet/ethoc.c | 2 +-
> drivers/net/ethernet/intel/igb/igb_main.c | 4 ++--
> drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +-
> drivers/net/ethernet/lantiq_etop.c | 2 +-
> drivers/net/ethernet/micrel/ks8851.c | 2 +-
> drivers/net/ethernet/micrel/ks8851_mll.c | 2 +-
> drivers/net/ethernet/smsc/smsc911x.c | 2 +-
> drivers/net/ethernet/ti/cpsw.c | 2 +-
> drivers/net/ethernet/tile/tilegx.c | 2 +-
> drivers/net/ethernet/wiznet/w5100.c | 2 +-
> drivers/net/ethernet/wiznet/w5300.c | 2 +-
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
> drivers/net/tun.c | 2 +-
> drivers/net/usb/smsc75xx.c | 2 +-
> drivers/net/usb/smsc95xx.c | 2 +-
> drivers/net/usb/usbnet.c | 2 +-
> drivers/net/wimax/i2400m/driver.c | 2 +-
> drivers/net/wireless/adm8211.c | 2 +-
> drivers/net/wireless/p54/eeprom.c | 2 +-
> drivers/net/wireless/rt2x00/rt2400pci.c | 2 +-
> drivers/net/wireless/rt2x00/rt2500pci.c | 2 +-
> drivers/net/wireless/rt2x00/rt2500usb.c | 2 +-
> drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
> drivers/net/wireless/rt2x00/rt61pci.c | 2 +-
> drivers/net/wireless/rt2x00/rt73usb.c | 2 +-
> drivers/net/wireless/rtl818x/rtl8180/dev.c | 2 +-
> drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
> drivers/s390/net/qeth_l2_main.c | 2 +-
> drivers/s390/net/qeth_l3_main.c | 2 +-
> drivers/usb/atm/xusbatm.c | 4 ++--
> drivers/usb/gadget/u_ether.c | 2 +-
> include/linux/etherdevice.h | 14 ++++++++------
> 40 files changed, 52 insertions(+), 50 deletions(-)
>
> --
> 1.7.8.111.gad25c.dirty
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-16 10:14 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Felipe Balbi
@ 2012-07-16 10:29 ` David Miller
2012-07-16 11:12 ` Felipe Balbi
0 siblings, 1 reply; 20+ messages in thread
From: David Miller @ 2012-07-16 10:29 UTC (permalink / raw)
To: balbi
Cc: joe, netdev, linux-usb, wimax, linux-wireless, users, linux-s390,
johannes, uclinux-dist-devel, linux-kernel, linux-c6x-dev,
linux-mips, user-mode-linux-devel, user-mode-linux-user,
e1000-devel
From: Felipe Balbi <balbi@ti.com>
Date: Mon, 16 Jul 2012 13:14:38 +0300
> if you're really renaming the function, then this patch alone will break
> all of the below users. That should all be a single patch, I'm afraid.
It would help if you actually read his patches before saying what they
might or might not do.
He provides a macro in the first patch that provides the old name,
and this will get removed at the end.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-16 10:29 ` David Miller
@ 2012-07-16 11:12 ` Felipe Balbi
2012-07-16 11:17 ` David Miller
0 siblings, 1 reply; 20+ messages in thread
From: Felipe Balbi @ 2012-07-16 11:12 UTC (permalink / raw)
To: David Miller
Cc: balbi, joe, netdev, linux-usb, wimax, linux-wireless, users,
linux-s390, johannes, uclinux-dist-devel, linux-kernel,
linux-c6x-dev, linux-mips, user-mode-linux-devel,
user-mode-linux-user, e1000-devel
[-- Attachment #1: Type: text/plain, Size: 788 bytes --]
Hi,
On Mon, Jul 16, 2012 at 03:29:01AM -0700, David Miller wrote:
> From: Felipe Balbi <balbi@ti.com>
> Date: Mon, 16 Jul 2012 13:14:38 +0300
>
> > if you're really renaming the function, then this patch alone will break
> > all of the below users. That should all be a single patch, I'm afraid.
>
> It would help if you actually read his patches before saying what they
> might or might not do.
>
> He provides a macro in the first patch that provides the old name,
> and this will get removed at the end.
that's why I put an "if" there. The subject was misleading and I really
couldn't bother going search for the patch on the mail archives.
Anyway, if nothing will be broken then for drivers/usb/gadget/:
Acked-by: Felipe Balbi <balbi@ti.com>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-16 11:12 ` Felipe Balbi
@ 2012-07-16 11:17 ` David Miller
0 siblings, 0 replies; 20+ messages in thread
From: David Miller @ 2012-07-16 11:17 UTC (permalink / raw)
To: balbi
Cc: joe, netdev, linux-usb, wimax, linux-wireless, users, linux-s390,
johannes, uclinux-dist-devel, linux-kernel, linux-c6x-dev,
linux-mips, user-mode-linux-devel, user-mode-linux-user,
e1000-devel
From: Felipe Balbi <balbi@ti.com>
Date: Mon, 16 Jul 2012 14:12:19 +0300
> Acked-by: Felipe Balbi <balbi@ti.com>
You need to provide this in a reply to the patch you actually want
to ACK, so that the patch tracking system attaches your ACK to
the proper patch.
Thank you.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-13 5:33 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Joe Perches
` (8 preceding siblings ...)
2012-07-16 10:14 ` [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr Felipe Balbi
@ 2012-07-17 5:39 ` David Miller
9 siblings, 0 replies; 20+ messages in thread
From: David Miller @ 2012-07-17 5:39 UTC (permalink / raw)
To: joe
Cc: netdev, linux-usb, wimax, linux-wireless, users, linux-s390,
johannes, uclinux-dist-devel, linux-kernel, linux-c6x-dev,
linux-mips, user-mode-linux-devel, user-mode-linux-user,
e1000-devel
From: Joe Perches <joe@perches.com>
Date: Thu, 12 Jul 2012 22:33:04 -0700
> net-next commit ad7eee98be ("etherdevice: introduce eth_broadcast_addr")
> added a new style API. Rename random_ether_addr to eth_random_addr to
> create some API symmetry.
Series applied, thanks Joe.
^ permalink raw reply [flat|nested] 20+ messages in thread