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

Commit 00aaea2f authored by Jan-Bernd Themann's avatar Jan-Bernd Themann Committed by Jeff Garzik
Browse files

ehea: set mac address fix 



eHEA has to call firmware functions in order to change the mac address
of a logical port. This patch checks if the logical port is up
when calling the register / deregister mac address calls. If the port
is down these firmware calls would fail and are therefore not executed.

Signed-off-by: default avatarJan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 23bdfdd3

drivers/net/ehea/ehea_main.c

+10 −6
Original line number Diff line number Diff line
@@ -1766,16 +1766,20 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa) 
	mutex_lock(&ehea_bcmc_regs.lock);



	/* Deregister old MAC in pHYP */

	if (port->state == EHEA_PORT_UP) {

		ret = ehea_broadcast_reg_helper(port, H_DEREG_BCMC);

		if (ret)

			goto out_upregs;

	}



	port->mac_addr = cb0->port_mac_addr << 16;



	/* Register new MAC in pHYP */

	if (port->state == EHEA_PORT_UP) {

		ret = ehea_broadcast_reg_helper(port, H_REG_BCMC);

		if (ret)

			goto out_upregs;

	}



	ret = 0;