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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

1 files changed, 0 insertions, 73 deletions

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
deleted file mode 100644
index 94ed7d3cd9da..000000000000
--- a/net/ieee80211/Kconfig
+++ /dev/null
@@ -1,73 +0,0 @@
-config IEEE80211
-        tristate "Generic IEEE 802.11 Networking Stack (DEPRECATED)"
-        ---help---
-        This option enables the hardware independent IEEE 802.11
-        networking stack.  This component is deprecated in favor of the
-        mac80211 component.
-
-config IEEE80211_DEBUG
-        bool "Enable full debugging output"
-        depends on IEEE80211
-        ---help---
-          This option will enable debug tracing output for the
-          ieee80211 network stack.
-
-          This will result in the kernel module being ~70k larger.  You
-          can control which debug output is sent to the kernel log by
-          setting the value in
-
-          /proc/net/ieee80211/debug_level
-
-          For example:
-
-          % echo 0x00000FFO > /proc/net/ieee80211/debug_level
-
-          For a list of values you can assign to debug_level, you
-          can look at the bit mask values in <net/ieee80211.h>
-
-          If you are not trying to debug or develop the ieee80211
-          subsystem, you most likely want to say N here.
-
-config IEEE80211_CRYPT_WEP
-        tristate "IEEE 802.11 WEP encryption (802.1x)"
-        depends on IEEE80211
-        select CRYPTO
-        select CRYPTO_ARC4
-        select CRYPTO_ECB
-        select CRC32
-        ---help---
-        Include software based cipher suites in support of IEEE
-        802.11's WEP.  This is needed for WEP as well as 802.1x.
-
-        This can be compiled as a module and it will be called
-        "ieee80211_crypt_wep".
-
-config IEEE80211_CRYPT_CCMP
-        tristate "IEEE 802.11i CCMP support"
-        depends on IEEE80211
-        select CRYPTO
-        select CRYPTO_AES
-        ---help---
-        Include software based cipher suites in support of IEEE 802.11i
-        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled
-        networks.
-
-        This can be compiled as a module and it will be called
-        "ieee80211_crypt_ccmp".
-
-config IEEE80211_CRYPT_TKIP
-        tristate "IEEE 802.11i TKIP encryption"
-        depends on IEEE80211
-        select WIRELESS_EXT
-        select CRYPTO
-        select CRYPTO_MICHAEL_MIC
-        select CRYPTO_ECB
-        select CRC32
-        ---help---
-        Include software based cipher suites in support of IEEE 802.11i
-        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
-        networks.
-
-        This can be compiled as a module and it will be called
-        "ieee80211_crypt_tkip".
-