From 53a1444cee1af2ab6fe24dbeb8ab5da82e578751 Mon Sep 17 00:00:00 2001 From: Rajesh Borundia Date: Tue, 13 Jul 2010 20:33:31 +0000 Subject: [PATCH] --- yaml --- r: 203572 b: refs/heads/master c: 6d181688953465c76c375c665a557c1ff88dcc40 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/qlcnic/qlcnic_ethtool.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f5718edf1418..affc85c746fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cb8d9d1da282d4067a9b2dfbf8f7b0bab0c56e7 +refs/heads/master: 6d181688953465c76c375c665a557c1ff88dcc40 diff --git a/trunk/drivers/net/qlcnic/qlcnic_ethtool.c b/trunk/drivers/net/qlcnic/qlcnic_ethtool.c index baf5a52b2a4b..7d6558e33dca 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_ethtool.c +++ b/trunk/drivers/net/qlcnic/qlcnic_ethtool.c @@ -578,8 +578,12 @@ 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)