dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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.
This commit is contained in:
Linus Torvalds 2008-10-12 11:40:34 -07:00
parent 1efd325fba f3073ac767
commit 589acce53e
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/e1000/e1000_main.c
View File

@ -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 */

3
drivers/net/smc911x.c
View File

@ -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 */

2
net/ipv4/ip_gre.c
View File

@ -1345,7 +1345,7 @@ out:
static void ipgre_netlink_parms(struct nlattr *data[],
struct ip_tunnel_parm *parms)
{
memset(parms, 0, sizeof(parms));
memset(parms, 0, sizeof(*parms));
parms->iph.protocol = IPPROTO_GRE;

4
net/netfilter/ipvs/Kconfig
View File

@ -2,8 +2,8 @@
# IP Virtual Server configuration
#
menuconfig IP_VS
tristate "IP virtual server support (EXPERIMENTAL)"
depends on NETFILTER
tristate "IP virtual server support"
depends on NET && INET && NETFILTER
---help---
IP Virtual Server support will let you build a high-performance
virtual server based on cluster of two or more real servers. This