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

Commit 3b8bb472 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] skge: handle out of memory on ring parameter change 

If changing ring parameters is unable to allocate memory, we need
to return an error and take the device down.

Fixes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=5715


Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 2770b517

drivers/net/skge.c

+4 −1
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ static int skge_set_ring_param(struct net_device *dev, 
			       struct ethtool_ringparam *p)

{

	struct skge_port *skge = netdev_priv(dev);

	int err;



	if (p->rx_pending == 0 || p->rx_pending > MAX_RX_RING_SIZE ||

	    p->tx_pending == 0 || p->tx_pending > MAX_TX_RING_SIZE)
@@ -407,7 +408,9 @@ static int skge_set_ring_param(struct net_device *dev, 


	if (netif_running(dev)) {

		skge_down(dev);

		skge_up(dev);

		err = skge_up(dev);

		if (err)

			dev_close(dev);

	}



	return 0;