aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb4
diff options
context:
space:
mode:
authorDimitris Michailidis <dm@chelsio.com>2010-08-02 09:19:20 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-02 19:26:42 -0400
commit35d35682041686572d5158993dede90bc73dc1d9 (patch)
tree8622129e6d72d20caef9e0edb1ad37815e8dc3fe /drivers/net/cxgb4
parent1ae970e0c047fbb1050865c6cf3ac68c7ca67dba (diff)
cxgb4: advertise NETIF_F_TSO_ECN
The device supports TSO+ECN. Signed-off-by: Dimitris Michailidis <dm@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb4')
-rw-r--r--drivers/net/cxgb4/cxgb4_main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 47e8936e69c3..e80d4a5e9faa 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -1808,12 +1808,14 @@ static int set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
1808 return err; 1808 return err;
1809} 1809}
1810 1810
1811#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
1812
1811static int set_tso(struct net_device *dev, u32 value) 1813static int set_tso(struct net_device *dev, u32 value)
1812{ 1814{
1813 if (value) 1815 if (value)
1814 dev->features |= NETIF_F_TSO | NETIF_F_TSO6; 1816 dev->features |= TSO_FLAGS;
1815 else 1817 else
1816 dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6); 1818 dev->features &= ~TSO_FLAGS;
1817 return 0; 1819 return 0;
1818} 1820}
1819 1821
@@ -3539,7 +3541,7 @@ static void free_some_resources(struct adapter *adapter)
3539 t4_fw_bye(adapter, 0); 3541 t4_fw_bye(adapter, 0);
3540} 3542}
3541 3543
3542#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO | NETIF_F_TSO6 |\ 3544#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
3543 NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA) 3545 NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
3544 3546
3545static int __devinit init_one(struct pci_dev *pdev, 3547static int __devinit init_one(struct pci_dev *pdev,
@@ -3645,7 +3647,7 @@ static int __devinit init_one(struct pci_dev *pdev,
3645 netif_tx_stop_all_queues(netdev); 3647 netif_tx_stop_all_queues(netdev);
3646 netdev->irq = pdev->irq; 3648 netdev->irq = pdev->irq;
3647 3649
3648 netdev->features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6; 3650 netdev->features |= NETIF_F_SG | TSO_FLAGS;
3649 netdev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; 3651 netdev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
3650 netdev->features |= NETIF_F_GRO | NETIF_F_RXHASH | highdma; 3652 netdev->features |= NETIF_F_GRO | NETIF_F_RXHASH | highdma;
3651 netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; 3653 netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;