[PATCH] hostapd: rename driver_devicescape to driver_nl80211

[Johannes Berg]

This patch renames driver_devicescape to driver_nl80211 in the hope that
we'll at some point be able to use it with non-mac80211 chipsets too.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
---
Jouni, this patch requires that you *first* do

  git mv hostapd/driver_devicescape.c hostapd/driver_nl80211.c

because I didn't want to send a huge patch again. If there's a problem
with that let me know.

--- hostap.orig/hostapd/Makefile	2007-12-24 11:46:23.000000000 +0100
+++ hostap/hostapd/Makefile	2007-12-24 11:46:56.000000000 +0100
@@ -116,9 +116,9 @@ CFLAGS += -DCONFIG_DRIVER_PRISM54
 OBJS += driver_prism54.o
 endif
 
-ifdef CONFIG_DRIVER_DEVICESCAPE
-CFLAGS += -DCONFIG_DRIVER_DEVICESCAPE
-OBJS += driver_devicescape.o
+ifdef CONFIG_DRIVER_NL80211
+CFLAGS += -DCONFIG_DRIVER_NL80211
+OBJS += driver_nl80211.o
 LIBS += -lnl
 endif
 
--- hostap.orig/hostapd/defconfig	2007-12-24 11:45:40.000000000 +0100
+++ hostap/hostapd/defconfig	2007-12-24 11:46:56.000000000 +0100
@@ -22,19 +22,8 @@ CONFIG_DRIVER_HOSTAP=y
 # Driver interface for Prism54 driver
 #CONFIG_DRIVER_PRISM54=y
 
-# Driver interface for drivers using Devicescape IEEE 802.11 stack
-#CONFIG_DRIVER_DEVICESCAPE=y
-# Currently, driver_devicescape.c build requires some additional parameters
-# to be able to include some of the kernel header files. Following lines can
-# be used to set these (WIRELESS_DEV must point to the root directory of the
-# wireless-dev.git tree).
-#WIRELESS_DEV=/usr/src/wireless-dev
-#CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
-# driver_devicescape.c requires a rather new libnl, probably not
-# shipped with your distribution yet
-#LIBNL=/usr/src/libnl
-#CFLAGS += -I$(LIBNL)/include
-#LIBS += -L$(LIBNL)/lib
+# Driver interface for drivers using the nl80211 kernel interface
+#CONFIG_DRIVER_NL80211=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y
--- hostap.orig/hostapd/drivers.c	2007-12-24 11:45:40.000000000 +0100
+++ hostap/hostapd/drivers.c	2007-12-24 11:46:56.000000000 +0100
@@ -18,10 +18,9 @@
 #ifdef CONFIG_DRIVER_HOSTAP
 extern struct wpa_driver_ops wpa_driver_hostap_ops; /* driver_hostap.c */
 #endif /* CONFIG_DRIVER_HOSTAP */
-#ifdef CONFIG_DRIVER_DEVICESCAPE
-/* driver_devicescape.c */
-extern struct wpa_driver_ops wpa_driver_devicescape_ops;
-#endif /* CONFIG_DRIVER_DEVICESCAPE */
+#ifdef CONFIG_DRIVER_NL80211
+extern struct wpa_driver_ops wpa_driver_nl80211_ops; /* driver_nl80211.c */
+#endif /* CONFIG_DRIVER_NL80211 */
 #ifdef CONFIG_DRIVER_PRISM54
 extern struct wpa_driver_ops wpa_driver_prism54_ops; /* driver_prism54.c */
 #endif /* CONFIG_DRIVER_PRISM54 */
@@ -44,9 +43,9 @@ struct wpa_driver_ops *hostapd_drivers[]
 #ifdef CONFIG_DRIVER_HOSTAP
 	&wpa_driver_hostap_ops,
 #endif /* CONFIG_DRIVER_HOSTAP */
-#ifdef CONFIG_DRIVER_DEVICESCAPE
-	&wpa_driver_devicescape_ops,
-#endif /* CONFIG_DRIVER_DEVICESCAPE */
+#ifdef CONFIG_DRIVER_NL80211
+	&wpa_driver_nl80211_ops,
+#endif /* CONFIG_DRIVER_NL80211 */
 #ifdef CONFIG_DRIVER_PRISM54
 	&wpa_driver_prism54_ops,
 #endif /* CONFIG_DRIVER_PRISM54 */
--- hostap.orig/hostapd/hostapd.conf	2007-12-24 11:46:24.000000000 +0100
+++ hostap/hostapd/hostapd.conf	2007-12-24 11:46:56.000000000 +0100
@@ -160,7 +160,7 @@ fragm_threshold=2346
 # Station MAC address -based authentication
 # Please note that this kind of access control requires a driver that uses
 # hostapd to take care of management frame processing and as such, this can be
-# used with driver=hostap or driver=devicescape, but not with driver=madwifi.
+# used with driver=hostap or driver=nl80211, but not with driver=madwifi.
 # 0 = accept unless in deny list
 # 1 = deny unless in accept list
 # 2 = use external RADIUS server (accept/deny lists are searched first)
--- hostap.orig/hostapd/driver_nl80211.c	2007-12-24 11:46:23.000000000 +0100
+++ hostap/hostapd/driver_nl80211.c	2007-12-24 11:51:55.000000000 +0100
@@ -1,5 +1,6 @@
 /*
- * hostapd / Kernel driver communication with Devicescape IEEE 802.11 stack
+ * hostapd / Kernel driver communication via nl80211
+ *
  * Copyright (c) 2002-2007, Jouni Malinen <j at w1.fi>
  * Copyright (c) 2003-2004, Instant802 Networks, Inc.
  * Copyright (c) 2005-2006, Devicescape Software, Inc.
@@ -2169,8 +2170,8 @@
 }
 
 
-const struct wpa_driver_ops wpa_driver_devicescape_ops = {
-	.name = "devicescape",
+const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+	.name = "nl80211",
 	.init = i802_init,
 	.init_bssid = i802_init_bssid,
 	.deinit = i802_deinit,