diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-29 23:06:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 23:06:00 -0700 |
| commit | b171e19ed08c8ba832e5325fadf1be493f56665d (patch) | |
| tree | 017208f9fcc4ef2cc3fe5cc3f262d2455eda9f61 /drivers/net/atlx/atl1.c | |
| parent | 143b11c03cd42f2284efe5128afc057d8fc86c78 (diff) | |
| parent | 7c19a3d280297d43ef5ff7c6b205dc208a16d3d1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'drivers/net/atlx/atl1.c')
| -rw-r--r-- | drivers/net/atlx/atl1.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index e6a7bb79d4d..e23ce77712f 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -3022,7 +3022,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev, netdev->features = NETIF_F_HW_CSUM; netdev->features |= NETIF_F_SG; netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); - netdev->features |= NETIF_F_TSO; netdev->features |= NETIF_F_LLTX; /* |