diff options
| author |   Santosh Nayak <santoshprasadnayak@gmail.com> | 2012-06-19 21:27:39 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-06-25 15:26:26 -0700 |
| commit | d8140b2fa09cceb947ac1ac49e0958eb137d0648 (patch) | |
| tree | 1a6103ce1d53bb8c5f1da6cc141c61018f8e82ca /drivers/net/ethernet/qlogic/netxen | |
| parent | tcp: Fix bug in tcp socket early demux (diff) | |
| download | linux-dev-d8140b2fa09cceb947ac1ac49e0958eb137d0648.tar.xz linux-dev-d8140b2fa09cceb947ac1ac49e0958eb137d0648.zip | |
netxen: Error return off by one in 'netxen_nic_set_pauseparam()'.
There are 'NETXEN_NIU_MAX_GBE_PORTS' GBE ports. Port indexing starts
from zero.
Hence we should also return error for "port == NETXEN_NIU_MAX_GBE_PORTS"
Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com>
Diffstat (limited to 'drivers/net/ethernet/qlogic/netxen')
| -rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c index 39730403782f..d4f179f96dcb 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c @@ -489,7 +489,7 @@ netxen_nic_get_pauseparam(struct net_device *dev, int port = adapter->physical_port; if (adapter->ahw.port_type == NETXEN_NIC_GBE) { - if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS)) + if ((port < 0) || (port >= NETXEN_NIU_MAX_GBE_PORTS)) return; /* get flow control settings */ val = NXRD32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port)); @@ -534,7 +534,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, int port = adapter->physical_port; /* read mode */ if (adapter->ahw.port_type == NETXEN_NIC_GBE) { - if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS)) + if ((port < 0) || (port >= NETXEN_NIU_MAX_GBE_PORTS)) return -EIO; /* set flow control */ val = NXRD32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port)); |