aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-12 11:40:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-12 11:40:34 -0700
commit589acce53e235055806e81e330af1e8f115bfcc2 (patch)
tree3a525461f60d5449eb6b95f03e3a7c3f1c25a77b /drivers
parent1efd325fbadc02c1338e0ef676f0a6669b251c7a (diff)
parentf3073ac76755abd63b1d4c3d145f4c15b65b5355 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: smc911x: Fix external PHY detection e1000: allow VLAN devices to use TSO and CSUM offload gre: Initialise rtnl_link tunnel parameters properly ipvs: Add proper dependencies on IP_VS, and fix description header line.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/e1000/e1000_main.c5
-rw-r--r--drivers/net/smc911x.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 3bafaede791..fac82152e4c 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1047,6 +1047,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
netdev->features |= NETIF_F_LLTX;
+ netdev->vlan_features |= NETIF_F_TSO;
+ netdev->vlan_features |= NETIF_F_TSO6;
+ netdev->vlan_features |= NETIF_F_HW_CSUM;
+ netdev->vlan_features |= NETIF_F_SG;
+
adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw);
/* initialize eeprom parameters */
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 02cc064c2c8..3d19d00e8ee 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -722,6 +722,9 @@ static void smc911x_phy_detect(struct net_device *dev)
break;
}
}
+ if (phyaddr < 32)
+ /* Found an external PHY */
+ break;
}
default:
/* Internal media only */