[GIT]: Networking

[GIT]: Networking

[David Miller]

This includes:

1) The bad IP_VS dependency randconfig build failure.

2) GRE tunnel rtnl_link initialization (bad memset size),
   from Herbert Xu.

3) External PHY detection fix in smc911x from Guennadi Liakhovetski.

4) E1000 VLAN feature flags should include TSO and CSUM offloads,
   from Patrick McHardy and ACK'd by Intel folks.

Please pull, thanks a lot!

The following changes since commit bf6f51e3a46f6a602853d3cbacd05864bc6e2a37:
  Linus Torvalds (1):
        Merge phase #3 (IOMMU) of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

David S. Miller (1):
      ipvs: Add proper dependencies on IP_VS, and fix description header line.

Guennadi Liakhovetski (1):
      smc911x: Fix external PHY detection

Herbert Xu (1):
      gre: Initialise rtnl_link tunnel parameters properly

Patrick McHardy (1):
      e1000: allow VLAN devices to use TSO and CSUM offload

 drivers/net/e1000/e1000_main.c |    5 +++++
 drivers/net/smc911x.c          |    3 +++
 net/ipv4/ip_gre.c              |    2 +-
 net/netfilter/ipvs/Kconfig     |    4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)

[PATCH net-2.6] cifs: Fix compile error without CONFIG_KEYS selected.

[Guo-Fu Tseng]

Hi Steve, David:

  I'm not sure where should this patch goes, since I see the error
in David's net-2.6 git, I submit it to netdev.

cifs: Fix compile error without CONFIG_KEYS selected.

fs/cifs/sess.c: In function "CIFS_SessSetup":
fs/cifs/sess.c:628: error: implicit declaration of function "key_revoke"

Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
---
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fs/Kconfig b/fs/Kconfig
index abccb5d..717245f 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1863,6 +1863,7 @@ config CIFS
 	tristate "CIFS support (advanced network filesystem, SMBFS successor)"
 	depends on INET
 	select NLS
+	select KEYS
 	help
 	  This is the client VFS module for the Common Internet File System
 	  (CIFS) protocol which is the successor to the Server Message Block