diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2006-12-12 08:06:23 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-05 16:58:45 -0500 |
commit | 1d39ed565cfcc7c4fe586de621aef495c4f94ffb (patch) | |
tree | af3280a25eb796385c851dc7b83e82f0ff38f1ac /drivers/net/s2io.c | |
parent | 6d24998f07588ca83ce04e60af5a79e805df7532 (diff) |
remove NETIF_F_TSO ifdefery
Remove the NETIF_F_TSO #ifdef-ery in drivers/net; this was
for old-old-2.4 compat (even current 2.4 has NETIF_F_TSO)
but it's time to get rid of it by now.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 1dd66b8ea0fa..36937cb1fd66 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -3887,12 +3887,10 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
3887 | } | 3887 | } |
3888 | 3888 | ||
3889 | offload_type = s2io_offload_type(skb); | 3889 | offload_type = s2io_offload_type(skb); |
3890 | #ifdef NETIF_F_TSO | ||
3891 | if (offload_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) { | 3890 | if (offload_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) { |
3892 | txdp->Control_1 |= TXD_TCP_LSO_EN; | 3891 | txdp->Control_1 |= TXD_TCP_LSO_EN; |
3893 | txdp->Control_1 |= TXD_TCP_LSO_MSS(s2io_tcp_mss(skb)); | 3892 | txdp->Control_1 |= TXD_TCP_LSO_MSS(s2io_tcp_mss(skb)); |
3894 | } | 3893 | } |
3895 | #endif | ||
3896 | if (skb->ip_summed == CHECKSUM_PARTIAL) { | 3894 | if (skb->ip_summed == CHECKSUM_PARTIAL) { |
3897 | txdp->Control_2 |= | 3895 | txdp->Control_2 |= |
3898 | (TXD_TX_CKO_IPV4_EN | TXD_TX_CKO_TCP_EN | | 3896 | (TXD_TX_CKO_IPV4_EN | TXD_TX_CKO_TCP_EN | |
@@ -5750,10 +5748,8 @@ static const struct ethtool_ops netdev_ethtool_ops = { | |||
5750 | .set_tx_csum = s2io_ethtool_op_set_tx_csum, | 5748 | .set_tx_csum = s2io_ethtool_op_set_tx_csum, |
5751 | .get_sg = ethtool_op_get_sg, | 5749 | .get_sg = ethtool_op_get_sg, |
5752 | .set_sg = ethtool_op_set_sg, | 5750 | .set_sg = ethtool_op_set_sg, |
5753 | #ifdef NETIF_F_TSO | ||
5754 | .get_tso = s2io_ethtool_op_get_tso, | 5751 | .get_tso = s2io_ethtool_op_get_tso, |
5755 | .set_tso = s2io_ethtool_op_set_tso, | 5752 | .set_tso = s2io_ethtool_op_set_tso, |
5756 | #endif | ||
5757 | .get_ufo = ethtool_op_get_ufo, | 5753 | .get_ufo = ethtool_op_get_ufo, |
5758 | .set_ufo = ethtool_op_set_ufo, | 5754 | .set_ufo = ethtool_op_set_ufo, |
5759 | .self_test_count = s2io_ethtool_self_test_count, | 5755 | .self_test_count = s2io_ethtool_self_test_count, |
@@ -6978,12 +6974,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) | |||
6978 | dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM; | 6974 | dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM; |
6979 | if (sp->high_dma_flag == TRUE) | 6975 | if (sp->high_dma_flag == TRUE) |
6980 | dev->features |= NETIF_F_HIGHDMA; | 6976 | dev->features |= NETIF_F_HIGHDMA; |
6981 | #ifdef NETIF_F_TSO | ||
6982 | dev->features |= NETIF_F_TSO; | 6977 | dev->features |= NETIF_F_TSO; |
6983 | #endif | ||
6984 | #ifdef NETIF_F_TSO6 | ||
6985 | dev->features |= NETIF_F_TSO6; | 6978 | dev->features |= NETIF_F_TSO6; |
6986 | #endif | ||
6987 | if (sp->device_type & XFRAME_II_DEVICE) { | 6979 | if (sp->device_type & XFRAME_II_DEVICE) { |
6988 | dev->features |= NETIF_F_UFO; | 6980 | dev->features |= NETIF_F_UFO; |
6989 | dev->features |= NETIF_F_HW_CSUM; | 6981 | dev->features |= NETIF_F_HW_CSUM; |