From ab16713868945124e149a3d3ccdc6325dbecbf7c Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Thu, 13 Dec 2001 20:19:16 +0000
Subject: [PATCH] Stuffed Crust Pizza's patch fixing the "netlink disable"
 patch.

---
 CHANGES                        | 3 +++
 THANKS                         | 1 +
 src/p80211/Makefile            | 6 +++++-
 src/p80211/p80211req.c         | 6 ++----
 src/prism2/driver/prism2mgmt.c | 1 +
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index cf28f06..e6637fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,6 +42,9 @@
 *
 * --------------------------------------------------------------------
 0.1.13
+  - Added pizza's patch fixing the "netlink disable" patch.  The 
+    p80211ind_* functions need to be handled individually instead of two
+    giant #if's, but that's a task for another day.
   - Added theBS's patch for making the /etc stuff installation relative and
     installing the FIXINST scripts for USB.
   - Added crankin's SMP deadlock fix patch.
diff --git a/THANKS b/THANKS
index 61e871f..a8208d7 100644
--- a/THANKS
+++ b/THANKS
@@ -62,6 +62,7 @@ Mark Taylor <mt@mp3dev.org>
 Ben Gertzfield <che@debian.org>
 Daniel Lyddy <sprocket@path.berkeley.edu>
 Bryan Smith <b.j.smith@ieee.org>
+Stuffed Crust <pizza@shaftnet.org>
 
 [Many, many more.  If I've overlooked you and you want to be listed here, 
 send me e-mail and I'll fix it.  I _know_ a bunch of linux-wlan contributors
diff --git a/src/p80211/Makefile b/src/p80211/Makefile
index 7312a0e..a0fd2df 100644
--- a/src/p80211/Makefile
+++ b/src/p80211/Makefile
@@ -75,6 +75,10 @@ ifeq ($(WLAN_DEBUG), y)
 WLAN_INCLUDE_DEBUG="-DWLAN_INCLUDE_DEBUG"
 endif
 
+ifeq ($(CONFIG_NETLINK), y)
+WLAN_CS_CONFIG_NETLINK="-DCONFIG_NETLINK=1"
+endif
+
 # Source and obj and target definitions
 P80211_MODULE=p80211.o
 P80211_SRC=	p80211conv.c \
@@ -113,7 +117,7 @@ endif
 # Preprocessor Options
 CPPFLAGS=-D__LINUX_WLAN__ -D__KERNEL__ -DMODULE=1 \
 	-I../include -I$(LINUX_SRC)/include \
-	$(WLAN_INCLUDE_DEBUG)
+	$(WLAN_INCLUDE_DEBUG) $(WLAN_CS_CONFIG_NETLINK)
 
 # Dependency Source List
 DEP_SRC=$(P80211_SRC)
diff --git a/src/p80211/p80211req.c b/src/p80211/p80211req.c
index 7c46b4a..3ebf1fd 100644
--- a/src/p80211/p80211req.c
+++ b/src/p80211/p80211req.c
@@ -100,10 +100,8 @@ typedef void (*timerfunc_t)(unsigned long);
 /*================================================================*/
 /* Local Static Definitions */
 
-#ifdef CONFIG_NETLINK
 /* Netlink interface(s) */
 static struct sock	*nl_indicate = NULL;
-#endif
 
 /*================================================================*/
 /* Local Function Declarations */
@@ -393,7 +391,7 @@ void p80211ind_mlme( wlandevice_t *wlandev, struct sk_buff *skb)
 	return;
 }
 
-
+#endif
 /*----------------------------------------------------------------
 * p80211ind_sniff
 *
@@ -422,7 +420,7 @@ void p80211ind_sniff( wlandevice_t *wlandev, struct sk_buff *skb)
 	return;
 }
 
-
+#ifdef CONFIG_NETLINK
 /*----------------------------------------------------------------
 * p80211ind_distribution
 *
diff --git a/src/prism2/driver/prism2mgmt.c b/src/prism2/driver/prism2mgmt.c
index ea4b4ad..16ad3fd 100644
--- a/src/prism2/driver/prism2mgmt.c
+++ b/src/prism2/driver/prism2mgmt.c
@@ -2273,6 +2273,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 	msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
 	msg->resultcode.data = P80211ENUM_resultcode_not_supported;
 #elif !defined(CONFIG_NETLINK)
+#warning "CONFIG_NETLINK not enabled, not compiling sniffing/indication code"
 	DBFENTER;
 	msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
 	msg->resultcode.data = P80211ENUM_resultcode_not_supported;