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

Commit 35bb5cad authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

via-velocity: Give RX descriptors to the NIC later on open or MTU change 

velocity_open() calls velocity_give_many_rx_descs(), which gives RX
descriptors to the NIC, before installing an interrupt handler or
calling velocity_init_registers().  I think this is very unsafe and it
appears to explain the bug report <http://bugs.debian.org/508527

>.

On MTU change, velocity_give_many_rx_descs() is again called before
velocity_init_registers().  I'm not sure whether this is unsafe but
it does look wrong.

Therefore, move the calls to velocity_give_many_rx_descs() after
request_irq() and velocity_init_registers().

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Tested-by: default avatarJan Ceuleers <jan.ceuleers@computer.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b3319b10

drivers/net/via-velocity.c

+4 −4
Original line number Diff line number Diff line
@@ -2237,8 +2237,6 @@ static int velocity_open(struct net_device *dev) 
	/* Ensure chip is running */

	pci_set_power_state(vptr->pdev, PCI_D0);



	velocity_give_many_rx_descs(vptr);



	velocity_init_registers(vptr, VELOCITY_INIT_COLD);



	ret = request_irq(vptr->pdev->irq, velocity_intr, IRQF_SHARED,
@@ -2250,6 +2248,8 @@ static int velocity_open(struct net_device *dev) 
		goto out;

	}



	velocity_give_many_rx_descs(vptr);



	mac_enable_int(vptr->mac_regs);

	netif_start_queue(dev);

	napi_enable(&vptr->napi);
@@ -2339,10 +2339,10 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu) 


		dev->mtu = new_mtu;



		velocity_give_many_rx_descs(vptr);



		velocity_init_registers(vptr, VELOCITY_INIT_COLD);



		velocity_give_many_rx_descs(vptr);



		mac_enable_int(vptr->mac_regs);

		netif_start_queue(dev);