diff options
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c index 6bf73e10d449..4ca2c196c98a 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c | |||
@@ -218,7 +218,7 @@ skip: | |||
218 | check_sfp_module = netif_running(dev) && | 218 | check_sfp_module = netif_running(dev) && |
219 | adapter->has_link_events; | 219 | adapter->has_link_events; |
220 | } else { | 220 | } else { |
221 | ecmd->supported |= (SUPPORTED_TP |SUPPORTED_Autoneg); | 221 | ecmd->supported |= (SUPPORTED_TP | SUPPORTED_Autoneg); |
222 | ecmd->advertising |= | 222 | ecmd->advertising |= |
223 | (ADVERTISED_TP | ADVERTISED_Autoneg); | 223 | (ADVERTISED_TP | ADVERTISED_Autoneg); |
224 | ecmd->port = PORT_TP; | 224 | ecmd->port = PORT_TP; |
@@ -381,7 +381,7 @@ static u32 netxen_nic_test_link(struct net_device *dev) | |||
381 | 381 | ||
382 | static int | 382 | static int |
383 | netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, | 383 | netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, |
384 | u8 * bytes) | 384 | u8 *bytes) |
385 | { | 385 | { |
386 | struct netxen_adapter *adapter = netdev_priv(dev); | 386 | struct netxen_adapter *adapter = netdev_priv(dev); |
387 | int offset; | 387 | int offset; |
@@ -498,19 +498,19 @@ netxen_nic_get_pauseparam(struct net_device *dev, | |||
498 | pause->rx_pause = netxen_gb_get_rx_flowctl(val); | 498 | pause->rx_pause = netxen_gb_get_rx_flowctl(val); |
499 | val = NXRD32(adapter, NETXEN_NIU_GB_PAUSE_CTL); | 499 | val = NXRD32(adapter, NETXEN_NIU_GB_PAUSE_CTL); |
500 | switch (port) { | 500 | switch (port) { |
501 | case 0: | 501 | case 0: |
502 | pause->tx_pause = !(netxen_gb_get_gb0_mask(val)); | 502 | pause->tx_pause = !(netxen_gb_get_gb0_mask(val)); |
503 | break; | 503 | break; |
504 | case 1: | 504 | case 1: |
505 | pause->tx_pause = !(netxen_gb_get_gb1_mask(val)); | 505 | pause->tx_pause = !(netxen_gb_get_gb1_mask(val)); |
506 | break; | 506 | break; |
507 | case 2: | 507 | case 2: |
508 | pause->tx_pause = !(netxen_gb_get_gb2_mask(val)); | 508 | pause->tx_pause = !(netxen_gb_get_gb2_mask(val)); |
509 | break; | 509 | break; |
510 | case 3: | 510 | case 3: |
511 | default: | 511 | default: |
512 | pause->tx_pause = !(netxen_gb_get_gb3_mask(val)); | 512 | pause->tx_pause = !(netxen_gb_get_gb3_mask(val)); |
513 | break; | 513 | break; |
514 | } | 514 | } |
515 | } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) { | 515 | } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) { |
516 | if ((port < 0) || (port >= NETXEN_NIU_MAX_XG_PORTS)) | 516 | if ((port < 0) || (port >= NETXEN_NIU_MAX_XG_PORTS)) |
@@ -556,31 +556,31 @@ netxen_nic_set_pauseparam(struct net_device *dev, | |||
556 | /* set autoneg */ | 556 | /* set autoneg */ |
557 | val = NXRD32(adapter, NETXEN_NIU_GB_PAUSE_CTL); | 557 | val = NXRD32(adapter, NETXEN_NIU_GB_PAUSE_CTL); |
558 | switch (port) { | 558 | switch (port) { |
559 | case 0: | 559 | case 0: |
560 | if (pause->tx_pause) | 560 | if (pause->tx_pause) |
561 | netxen_gb_unset_gb0_mask(val); | 561 | netxen_gb_unset_gb0_mask(val); |
562 | else | 562 | else |
563 | netxen_gb_set_gb0_mask(val); | 563 | netxen_gb_set_gb0_mask(val); |
564 | break; | 564 | break; |
565 | case 1: | 565 | case 1: |
566 | if (pause->tx_pause) | 566 | if (pause->tx_pause) |
567 | netxen_gb_unset_gb1_mask(val); | 567 | netxen_gb_unset_gb1_mask(val); |
568 | else | 568 | else |
569 | netxen_gb_set_gb1_mask(val); | 569 | netxen_gb_set_gb1_mask(val); |
570 | break; | 570 | break; |
571 | case 2: | 571 | case 2: |
572 | if (pause->tx_pause) | 572 | if (pause->tx_pause) |
573 | netxen_gb_unset_gb2_mask(val); | 573 | netxen_gb_unset_gb2_mask(val); |
574 | else | 574 | else |
575 | netxen_gb_set_gb2_mask(val); | 575 | netxen_gb_set_gb2_mask(val); |
576 | break; | 576 | break; |
577 | case 3: | 577 | case 3: |
578 | default: | 578 | default: |
579 | if (pause->tx_pause) | 579 | if (pause->tx_pause) |
580 | netxen_gb_unset_gb3_mask(val); | 580 | netxen_gb_unset_gb3_mask(val); |
581 | else | 581 | else |
582 | netxen_gb_set_gb3_mask(val); | 582 | netxen_gb_set_gb3_mask(val); |
583 | break; | 583 | break; |
584 | } | 584 | } |
585 | NXWR32(adapter, NETXEN_NIU_GB_PAUSE_CTL, val); | 585 | NXWR32(adapter, NETXEN_NIU_GB_PAUSE_CTL, val); |
586 | } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) { | 586 | } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) { |
@@ -643,7 +643,7 @@ static int netxen_get_sset_count(struct net_device *dev, int sset) | |||
643 | 643 | ||
644 | static void | 644 | static void |
645 | netxen_nic_diag_test(struct net_device *dev, struct ethtool_test *eth_test, | 645 | netxen_nic_diag_test(struct net_device *dev, struct ethtool_test *eth_test, |
646 | u64 * data) | 646 | u64 *data) |
647 | { | 647 | { |
648 | memset(data, 0, sizeof(uint64_t) * NETXEN_NIC_TEST_LEN); | 648 | memset(data, 0, sizeof(uint64_t) * NETXEN_NIC_TEST_LEN); |
649 | if ((data[0] = netxen_nic_reg_test(dev))) | 649 | if ((data[0] = netxen_nic_reg_test(dev))) |
@@ -654,7 +654,7 @@ netxen_nic_diag_test(struct net_device *dev, struct ethtool_test *eth_test, | |||
654 | } | 654 | } |
655 | 655 | ||
656 | static void | 656 | static void |
657 | netxen_nic_get_strings(struct net_device *dev, u32 stringset, u8 * data) | 657 | netxen_nic_get_strings(struct net_device *dev, u32 stringset, u8 *data) |
658 | { | 658 | { |
659 | int index; | 659 | int index; |
660 | 660 | ||
@@ -675,7 +675,7 @@ netxen_nic_get_strings(struct net_device *dev, u32 stringset, u8 * data) | |||
675 | 675 | ||
676 | static void | 676 | static void |
677 | netxen_nic_get_ethtool_stats(struct net_device *dev, | 677 | netxen_nic_get_ethtool_stats(struct net_device *dev, |
678 | struct ethtool_stats *stats, u64 * data) | 678 | struct ethtool_stats *stats, u64 *data) |
679 | { | 679 | { |
680 | struct netxen_adapter *adapter = netdev_priv(dev); | 680 | struct netxen_adapter *adapter = netdev_priv(dev); |
681 | int index; | 681 | int index; |