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/forcedeth.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/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 93f2b7a22160..60441e5638fe 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -1576,12 +1576,10 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1576 | 1576 | ||
1577 | np->tx_skbuff[nr] = skb; | 1577 | np->tx_skbuff[nr] = skb; |
1578 | 1578 | ||
1579 | #ifdef NETIF_F_TSO | ||
1580 | if (skb_is_gso(skb)) | 1579 | if (skb_is_gso(skb)) |
1581 | tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT); | 1580 | tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT); |
1582 | else | 1581 | else |
1583 | #endif | 1582 | tx_flags_extra = skb->ip_summed == CHECKSUM_PARTIAL ? |
1584 | tx_flags_extra = skb->ip_summed == CHECKSUM_PARTIAL ? | ||
1585 | NV_TX2_CHECKSUM_L3 | NV_TX2_CHECKSUM_L4 : 0; | 1583 | NV_TX2_CHECKSUM_L3 | NV_TX2_CHECKSUM_L4 : 0; |
1586 | 1584 | ||
1587 | /* vlan tag */ | 1585 | /* vlan tag */ |
@@ -4475,9 +4473,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
4475 | np->rx_csum = 1; | 4473 | np->rx_csum = 1; |
4476 | np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK; | 4474 | np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK; |
4477 | dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG; | 4475 | dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG; |
4478 | #ifdef NETIF_F_TSO | ||
4479 | dev->features |= NETIF_F_TSO; | 4476 | dev->features |= NETIF_F_TSO; |
4480 | #endif | ||
4481 | } | 4477 | } |
4482 | 4478 | ||
4483 | np->vlanctl_bits = 0; | 4479 | np->vlanctl_bits = 0; |