KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ralink: use random generate mac address instead of default one.

Browse source 
Signed-off-by: michael lee <igvtee@gmail.com>

SVN-Revision: 44740
This commit is contained in:
John Crispin 2015-03-13 08:38:01 +00:00
parent 800da5a02e
commit 2c94eef5df
6 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c
View file

@ -1228,9 +1228,12 @@ static int __init fe_init(struct net_device *dev)
priv->soc->switch_init(priv); priv->soc->switch_init(priv);
of_get_mac_address_mtd(priv->device->of_node, dev->dev_addr); of_get_mac_address_mtd(priv->device->of_node, dev->dev_addr);
/*If the mac address is invalid, use default mac address */ /*If the mac address is invalid, use random mac address */
if (!is_valid_ether_addr(dev->dev_addr)) if (!is_valid_ether_addr(dev->dev_addr)) {
memcpy(dev->dev_addr, priv->soc->mac, ETH_ALEN); random_ether_addr(dev->dev_addr);
dev_err(priv->device, "generated random MAC address %pM\n",
dev->dev_addr);
}
err = fe_mdio_init(priv); err = fe_mdio_init(priv);
if (err) if (err)

1
target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h
View file

@ -386,7 +386,6 @@ struct fe_phy {
struct fe_soc_data struct fe_soc_data
{ {
unsigned char mac[6];
const u32 *reg_table; const u32 *reg_table;
void (*init_data)(struct fe_soc_data *data, struct net_device *netdev); void (*init_data)(struct fe_soc_data *data, struct net_device *netdev);

2
target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
View file

@ -229,7 +229,6 @@ static void mt7621_set_mac(struct fe_priv *priv, unsigned char *mac)
} }
static struct fe_soc_data mt7620_data = { static struct fe_soc_data mt7620_data = {
.mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 },
.init_data = mt7620_init_data, .init_data = mt7620_init_data,
.reset_fe = mt7620_fe_reset, .reset_fe = mt7620_fe_reset,
.set_mac = mt7620_set_mac, .set_mac = mt7620_set_mac,
@ -251,7 +250,6 @@ static struct fe_soc_data mt7620_data = {
}; };
static struct fe_soc_data mt7621_data = { static struct fe_soc_data mt7621_data = {
.mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 },
.init_data = mt7621_init_data, .init_data = mt7621_init_data,
.reset_fe = mt7621_fe_reset, .reset_fe = mt7621_fe_reset,
.set_mac = mt7621_set_mac, .set_mac = mt7621_set_mac,

1
target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c
View file

@ -57,7 +57,6 @@ static int rt2880_fwd_config(struct fe_priv *priv)
} }
struct fe_soc_data rt2880_data = { struct fe_soc_data rt2880_data = {
.mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 },
.init_data = rt2880_init_data, .init_data = rt2880_init_data,
.reset_fe = rt2880_fe_reset, .reset_fe = rt2880_fe_reset,
.fwd_config = rt2880_fwd_config, .fwd_config = rt2880_fwd_config,

2
target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c
View file

@ -125,7 +125,6 @@ static void rt5350_fe_reset(void)
} }
static struct fe_soc_data rt3050_data = { static struct fe_soc_data rt3050_data = {
.mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 },
.init_data = rt305x_init_data, .init_data = rt305x_init_data,
.reset_fe = rt305x_fe_reset, .reset_fe = rt305x_fe_reset,
.fwd_config = rt3050_fwd_config, .fwd_config = rt3050_fwd_config,
@ -137,7 +136,6 @@ static struct fe_soc_data rt3050_data = {
}; };
static struct fe_soc_data rt5350_data = { static struct fe_soc_data rt5350_data = {
.mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 },
.init_data = rt5350_init_data, .init_data = rt5350_init_data,
.reg_table = rt5350_reg_table, .reg_table = rt5350_reg_table,
.reset_fe = rt5350_fe_reset, .reset_fe = rt5350_fe_reset,

1
target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt3883.c
View file

@ -56,7 +56,6 @@ static void rt3883_init_data(struct fe_soc_data *data,
} }
static struct fe_soc_data rt3883_data = { static struct fe_soc_data rt3883_data = {
.mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 },
.init_data = rt3883_init_data, .init_data = rt3883_init_data,
.reset_fe = rt3883_fe_reset, .reset_fe = rt3883_fe_reset,
.fwd_config = rt3883_fwd_config, .fwd_config = rt3883_fwd_config,