aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic
diff options
context:
space:
mode:
authorFlavio Leitner <fbl@redhat.com>2012-10-26 10:39:53 -0400
committerDavid S. Miller <davem@davemloft.net>2012-10-31 14:00:14 -0400
commit15111025f68e0ecb6cdc56789805706b3b550912 (patch)
tree48313fe1b33b8051bb474ee4869a8866c565e31e /drivers/net/ethernet/qlogic
parente0683e707c12a431919e1be814e15a4360523533 (diff)
netxen: explicity handle pause autoneg parameter
The hardware doesn't support controlling pause frames autoneg, so report that back correctly to userspace. Signed-off-by: Flavio Leitner <fbl@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r--drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
index 10468e7932dd..6bf73e10d449 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
@@ -488,6 +488,8 @@ netxen_nic_get_pauseparam(struct net_device *dev,
488 __u32 val; 488 __u32 val;
489 int port = adapter->physical_port; 489 int port = adapter->physical_port;
490 490
491 pause->autoneg = 0;
492
491 if (adapter->ahw.port_type == NETXEN_NIC_GBE) { 493 if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
492 if ((port < 0) || (port >= NETXEN_NIU_MAX_GBE_PORTS)) 494 if ((port < 0) || (port >= NETXEN_NIU_MAX_GBE_PORTS))
493 return; 495 return;
@@ -532,6 +534,11 @@ netxen_nic_set_pauseparam(struct net_device *dev,
532 struct netxen_adapter *adapter = netdev_priv(dev); 534 struct netxen_adapter *adapter = netdev_priv(dev);
533 __u32 val; 535 __u32 val;
534 int port = adapter->physical_port; 536 int port = adapter->physical_port;
537
538 /* not supported */
539 if (pause->autoneg)
540 return -EINVAL;
541
535 /* read mode */ 542 /* read mode */
536 if (adapter->ahw.port_type == NETXEN_NIC_GBE) { 543 if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
537 if ((port < 0) || (port >= NETXEN_NIU_MAX_GBE_PORTS)) 544 if ((port < 0) || (port >= NETXEN_NIU_MAX_GBE_PORTS))