| Message ID | 1279086893-22523-2-git-send-email-amit.salecha@qlogic.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: amit.salecha@qlogic.com Date: Tue, 13 Jul 2010 22:54:49 -0700 > From: Rajesh Borundia <rajesh.borundia@qlogic.com> > > Turning off rx pause param and autoneg param is not supported so > return error in that case. > > Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com> > Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> > --- > drivers/net/qlcnic/qlcnic_ethtool.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c > index baf5a52..8599993 100644 > --- a/drivers/net/qlcnic/qlcnic_ethtool.c > +++ b/drivers/net/qlcnic/qlcnic_ethtool.c > @@ -578,8 +578,13 @@ qlcnic_set_pauseparam(struct net_device *netdev, > } > QLCWR32(adapter, QLCNIC_NIU_GB_PAUSE_CTL, val); > } else if (adapter->ahw.port_type == QLCNIC_XGBE) { > + > + if (!pause->rx_pause || pause->autoneg) > + return -EOPNOTSUPP; There is no reason to add an empty line at the beginning of this code block, please remove it. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c index baf5a52..8599993 100644 --- a/drivers/net/qlcnic/qlcnic_ethtool.c +++ b/drivers/net/qlcnic/qlcnic_ethtool.c @@ -578,8 +578,13 @@ qlcnic_set_pauseparam(struct net_device *netdev, } QLCWR32(adapter, QLCNIC_NIU_GB_PAUSE_CTL, val); } else if (adapter->ahw.port_type == QLCNIC_XGBE) { + + if (!pause->rx_pause || pause->autoneg) + return -EOPNOTSUPP; + if ((port < 0) || (port > QLCNIC_NIU_MAX_XG_PORTS)) return -EIO; + val = QLCRD32(adapter, QLCNIC_NIU_XG_PAUSE_CTL); if (port == 0) { if (pause->tx_pause)