hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Stephen Hemminger 2005-12-14 15:47:48 -08:00 committed by Jeff Garzik
parent 2770b5172e
commit 3b8bb472ad
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/skge.c
View File

@ -397,6 +397,7 @@ static int skge_set_ring_param(struct net_device *dev,
struct ethtool_ringparam *p) struct ethtool_ringparam *p)
{ {
struct skge_port *skge = netdev_priv(dev); struct skge_port *skge = netdev_priv(dev);
int err;
if (p->rx_pending == 0 || p->rx_pending > MAX_RX_RING_SIZE || if (p->rx_pending == 0 || p->rx_pending > MAX_RX_RING_SIZE ||
p->tx_pending == 0 || p->tx_pending > MAX_TX_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)) { if (netif_running(dev)) {
skge_down(dev); skge_down(dev);
skge_up(dev); err = skge_up(dev);
if (err)
dev_close(dev);
} }
return 0; return 0;