Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a6d54c5 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: remove needless (now buggy) & from dev->dev_addr 



Patch fixes issues with dev->dev_addr changing from array to pointer.
Hopefully there are no others.

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b3521ee

drivers/net/bonding/bond_3ad.c

+3 −2
Original line number Diff line number Diff line
@@ -1847,7 +1847,8 @@ static u16 aggregator_identifier; 
void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution, int lacp_fast)

{

	// check that the bond is not initialized yet

	if (MAC_ADDRESS_COMPARE(&(BOND_AD_INFO(bond).system.sys_mac_addr), &(bond->dev->dev_addr))) {

	if (MAC_ADDRESS_COMPARE(&(BOND_AD_INFO(bond).system.sys_mac_addr),

				bond->dev->dev_addr)) {



		aggregator_identifier = 0;

drivers/net/ibmveth.c

+2 −2
Original line number Diff line number Diff line
@@ -1374,8 +1374,8 @@ static void ibmveth_proc_unregister_driver(void) 
static int ibmveth_show(struct seq_file *seq, void *v)

{

	struct ibmveth_adapter *adapter = seq->private;

	char *current_mac = ((char*) &adapter->netdev->dev_addr);

	char *firmware_mac = ((char*) &adapter->mac_addr) ;

	char *current_mac = (char *) adapter->netdev->dev_addr;

	char *firmware_mac = (char *) &adapter->mac_addr;



	seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version);

drivers/net/wireless/hostap/hostap_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1423,7 +1423,7 @@ static int prism2_hw_init2(struct net_device *dev, int initial) 
		prism2_check_sta_fw_version(local);



		if (hfa384x_get_rid(dev, HFA384X_RID_CNFOWNMACADDR,

				    &dev->dev_addr, 6, 1) < 0) {

				    dev->dev_addr, 6, 1) < 0) {

			printk("%s: could not get own MAC address\n",

			       dev->name);

		}

drivers/net/wireless/ray_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static int ray_dev_init(struct net_device *dev) 
#endif /* RAY_IMMEDIATE_INIT */



	/* copy mac and broadcast addresses to linux device */

	memcpy(&dev->dev_addr, &local->sparm.b4.a_mac_addr, ADDRLEN);

	memcpy(dev->dev_addr, &local->sparm.b4.a_mac_addr, ADDRLEN);

	memset(dev->broadcast, 0xff, ETH_ALEN);



	DEBUG(2, "ray_dev_init ending\n");

net/ipv6/ip6_tunnel.c

+2 −2
Original line number Diff line number Diff line
@@ -1100,8 +1100,8 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) 
	struct ip6_tnl_parm *p = &t->parms;

	struct flowi *fl = &t->fl;



	memcpy(&dev->dev_addr, &p->laddr, sizeof(struct in6_addr));

	memcpy(&dev->broadcast, &p->raddr, sizeof(struct in6_addr));

	memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr));

	memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr));



	/* Set up flowi template */

	ipv6_addr_copy(&fl->fl6_src, &p->laddr);