Merge pobox.com:/garz/repo/linux-2.6

into pobox.com:/garz/repo/netdev-2.6/r8169

Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/netdev-2.6/r8169
f7e308a3 · Jeff Garzik · 6f60f5cf · 36c32a3a · f7e308a3 · f7e308a3
Commit f7e308a3 authored Oct 25, 2004 by Jeff Garzik
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 646 additions and 218 deletions

drivers/net/Kconfig drivers/net/Kconfig +9 -0

drivers/net/r8169.c drivers/net/r8169.c +637 -218

No files found.
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2061,6 +2061,15 @@ config R8169_NAPI

 	  If in doubt, say N.

+config R8169_VLAN
+	bool "VLAN support"
+	depends on R8169 && VLAN_8021Q
+	---help---
+	  Say Y here for the r8169 driver to support the functions required
+	  by the kernel 802.1Q code.
+	  
+	  If in doubt, say Y.
+
 config SK98LIN
 	tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
 	depends on PCI

--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c