From 8470f71485dde9623b227532e6b72a2b095ce146 Mon Sep 17 00:00:00 2001
From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date: Tue, 23 Dec 2008 16:18:24 -0800
Subject: [PATCH] --- yaml --- r: 127308 b: refs/heads/master c:
 b0c83ae1de01880075955c7224e751440688ec74 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/Documentation/DocBook/networking.tmpl |  8 +++++
 trunk/net/Kconfig                           |  2 ++
 trunk/net/Makefile                          |  1 +
 trunk/net/wimax/Kconfig                     | 38 +++++++++++++++++++++
 trunk/net/wimax/Makefile                    | 13 +++++++
 6 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 trunk/net/wimax/Kconfig
 create mode 100644 trunk/net/wimax/Makefile

diff --git a/[refs] b/[refs]
index 495de295aa8e..b3a4216c1fa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 617209ccf73b571953cf4c76519c65a5e52d15fd
+refs/heads/master: b0c83ae1de01880075955c7224e751440688ec74
diff --git a/trunk/Documentation/DocBook/networking.tmpl b/trunk/Documentation/DocBook/networking.tmpl
index 627707a3cb9d..59ad69a9d777 100644
--- a/trunk/Documentation/DocBook/networking.tmpl
+++ b/trunk/Documentation/DocBook/networking.tmpl
@@ -74,6 +74,14 @@
 !Enet/sunrpc/rpcb_clnt.c
 !Enet/sunrpc/clnt.c
      </sect1>
+     <sect1><title>WiMAX</title>
+!Enet/wimax/op-msg.c
+!Enet/wimax/op-reset.c
+!Enet/wimax/op-rfkill.c
+!Enet/wimax/stack.c
+!Iinclude/net/wimax.h
+!Iinclude/linux/wimax.h
+     </sect1>
   </chapter>
 
   <chapter id="netdev">
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
index 6ec2cce7c167..bf2776018f71 100644
--- a/trunk/net/Kconfig
+++ b/trunk/net/Kconfig
@@ -254,6 +254,8 @@ source "net/mac80211/Kconfig"
 
 endif # WIRELESS
 
+source "net/wimax/Kconfig"
+
 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"
 
diff --git a/trunk/net/Makefile b/trunk/net/Makefile
index ba4460432b7c..0fcce89d7169 100644
--- a/trunk/net/Makefile
+++ b/trunk/net/Makefile
@@ -63,3 +63,4 @@ endif
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)		+= sysctl_net.o
 endif
+obj-$(CONFIG_WIMAX)		+= wimax/
diff --git a/trunk/net/wimax/Kconfig b/trunk/net/wimax/Kconfig
new file mode 100644
index 000000000000..0bdbb6928205
--- /dev/null
+++ b/trunk/net/wimax/Kconfig
@@ -0,0 +1,38 @@
+#
+# WiMAX LAN device configuration
+#
+
+menuconfig WIMAX
+	tristate "WiMAX Wireless Broadband support"
+	help
+
+	  Select to configure support for devices that provide
+	  wireless broadband connectivity using the WiMAX protocol
+	  (IEEE 802.16).
+
+	  Please note that most of these devices require signing up
+	  for a service plan with a provider.
+
+	  The different WiMAX drivers can be enabled in the menu entry
+
+	  Device Drivers > Network device support > WiMAX Wireless
+	  Broadband devices
+
+	  If unsure, it is safe to select M (module).
+
+config WIMAX_DEBUG_LEVEL
+	int "WiMAX debug level"
+	depends on WIMAX
+	default 8
+	help
+
+	  Select the maximum debug verbosity level to be compiled into
+	  the WiMAX stack code.
+
+	  By default, debug messages are disabled at runtime and can
+	  be selectively enabled for different parts of the code using
+	  the sysfs debug-levels file.
+
+	  If set at zero, this will compile out all the debug code.
+
+	  It is recommended that it is left at 8.
diff --git a/trunk/net/wimax/Makefile b/trunk/net/wimax/Makefile
new file mode 100644
index 000000000000..5b80b941c2c9
--- /dev/null
+++ b/trunk/net/wimax/Makefile
@@ -0,0 +1,13 @@
+
+obj-$(CONFIG_WIMAX)		+= wimax.o
+
+wimax-y :=		\
+	id-table.o	\
+	op-msg.o	\
+	op-reset.o	\
+	op-rfkill.o	\
+	stack.o
+
+wimax-$(CONFIG_DEBUG_FS) += debugfs.o
+
+