Commit 589acce5 authored by Linus Torvalds's avatar Linus Torvalds

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.
parents 1efd325f f3073ac7
...@@ -1047,6 +1047,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev, ...@@ -1047,6 +1047,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
netdev->features |= NETIF_F_LLTX; 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); adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw);
/* initialize eeprom parameters */ /* initialize eeprom parameters */
......
...@@ -722,6 +722,9 @@ static void smc911x_phy_detect(struct net_device *dev) ...@@ -722,6 +722,9 @@ static void smc911x_phy_detect(struct net_device *dev)
break; break;
} }
} }
if (phyaddr < 32)
/* Found an external PHY */
break;
} }
default: default:
/* Internal media only */ /* Internal media only */
......
...@@ -1345,7 +1345,7 @@ static int ipgre_tap_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -1345,7 +1345,7 @@ static int ipgre_tap_validate(struct nlattr *tb[], struct nlattr *data[])
static void ipgre_netlink_parms(struct nlattr *data[], static void ipgre_netlink_parms(struct nlattr *data[],
struct ip_tunnel_parm *parms) struct ip_tunnel_parm *parms)
{ {
memset(parms, 0, sizeof(parms)); memset(parms, 0, sizeof(*parms));
parms->iph.protocol = IPPROTO_GRE; parms->iph.protocol = IPPROTO_GRE;
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# IP Virtual Server configuration # IP Virtual Server configuration
# #
menuconfig IP_VS menuconfig IP_VS
tristate "IP virtual server support (EXPERIMENTAL)" tristate "IP virtual server support"
depends on NETFILTER depends on NET && INET && NETFILTER
---help--- ---help---
IP Virtual Server support will let you build a high-performance IP Virtual Server support will let you build a high-performance
virtual server based on cluster of two or more real servers. This virtual server based on cluster of two or more real servers. This
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment