SOURCES: wpa_supplicant-0.4.7_dscape-02.patch, wpa_supplicant-OPTC...
arekm
arekm at pld-linux.org
Sat Jul 14 17:35:58 CEST 2007
Author: arekm Date: Sat Jul 14 15:35:58 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 0.6.0
---- Files affected:
SOURCES:
wpa_supplicant-0.4.7_dscape-02.patch (1.1 -> 1.2) , wpa_supplicant-OPTCFLAGS.patch (1.1 -> 1.2) , wpa_supplicant-makefile.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/wpa_supplicant-0.4.7_dscape-02.patch
diff -u SOURCES/wpa_supplicant-0.4.7_dscape-02.patch:1.1 SOURCES/wpa_supplicant-0.4.7_dscape-02.patch:1.2
--- SOURCES/wpa_supplicant-0.4.7_dscape-02.patch:1.1 Tue Dec 20 22:08:38 2005
+++ SOURCES/wpa_supplicant-0.4.7_dscape-02.patch Sat Jul 14 17:35:53 2007
@@ -6,9 +6,9 @@
support in the stack so the "wext" driver can be used and this patch won't
be needed.)
-diff -upN wpa_supplicant-0.4.7/defconfig wpa_supplicant-0.4.7-dev/defconfig
---- wpa_supplicant-0.4.7/defconfig 2005-09-24 20:30:43.000000000 +0200
-+++ wpa_supplicant-0.4.7-dev/defconfig 2005-12-18 12:13:21.000000000 +0100
+diff -upN wpa_supplicant-0.4.7/wpa_supplicant/defconfig wpa_supplicant-0.4.7-dev/wpa_supplicant/defconfig
+--- wpa_supplicant-0.4.7/wpa_supplicant/defconfig 2005-09-24 20:30:43.000000000 +0200
++++ wpa_supplicant-0.4.7-dev/wpa_suplicant/defconfig 2005-12-18 12:13:21.000000000 +0100
@@ -38,6 +38,9 @@
# Driver interface for Host AP driver
CONFIG_DRIVER_HOSTAP=y
@@ -19,9 +19,9 @@
# Driver interface for Agere driver
#CONFIG_DRIVER_HERMES=y
# Change include directories to match with the local setup
-diff -upN wpa_supplicant-0.4.7/driver_dscape.c wpa_supplicant-0.4.7-dev/driver_dscape.c
---- wpa_supplicant-0.4.7/driver_dscape.c 1970-01-01 01:00:00.000000000 +0100
-+++ wpa_supplicant-0.4.7-dev/driver_dscape.c 2005-12-18 12:48:32.000000000 +0100
+diff -upN wpa_supplicant-0.4.7/src/drivers/driver_dscape.c wpa_supplicant-0.4.7-dev/src/drivers/driver_dscape.c
+--- wpa_supplicant-0.4.7/src/drivers/driver_dscape.c 1970-01-01 01:00:00.000000000 +0100
++++ wpa_supplicant-0.4.7-dev/src/drivers/driver_dscape.c 2005-12-18 12:48:32.000000000 +0100
@@ -0,0 +1,466 @@
+/*
+ * WPA Supplicant - driver interaction with Devicescape stack
@@ -40,7 +40,7 @@
+ * See README and COPYING for more details.
+ */
+
-+
++#include "includes.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
@@ -51,11 +51,11 @@
+#include "wireless_copy.h"
+#include "common.h"
+#include "driver.h"
++#include "driver_wext.h"
+#include "eloop.h"
+#include "driver_dscape.h"
-+#include "l2_packet.h"
-+#include "wpa_supplicant.h"
-+#include "driver_wext.h"
++
++
+
+
+struct wpa_driver_dscape_data {
@@ -489,9 +489,9 @@
+ .init = wpa_driver_dscape_init,
+ .deinit = wpa_driver_dscape_deinit,
+};
-diff -upN wpa_supplicant-0.4.7/driver_dscape.h wpa_supplicant-0.4.7-dev/driver_dscape.h
---- wpa_supplicant-0.4.7/driver_dscape.h 1970-01-01 01:00:00.000000000 +0100
-+++ wpa_supplicant-0.4.7-dev/driver_dscape.h 2005-12-18 12:41:32.000000000 +0100
+diff -upN wpa_supplicant-0.4.7/src/drivers/driver_dscape.h wpa_supplicant-0.4.7-dev/src/drivers/driver_dscape.h
+--- wpa_supplicant-0.4.7/src/drivers/driver_dscape.h 1970-01-01 01:00:00.000000000 +0100
++++ wpa_supplicant-0.4.7-dev/src/drivers/driver_dscape.h 2005-12-18 12:41:32.000000000 +0100
@@ -0,0 +1,452 @@
+/*
+ * WPA Supplicant - driver interaction with devicescape stack
@@ -965,7 +965,7 @@
+#define DSCAPE_HOSTAPD_IOCTL_H
+
+#ifndef __KERNEL__
-+#include "ieee80211_shared.h"
++
+#endif /* __KERNEL__ */
+
+#define PRISM2_IOCTL_PRISM2_PARAM (SIOCIWFIRSTPRIV + 0)
@@ -1390,9 +1390,9 @@
+((int) (&((struct prism2_hostapd_param *) 0)->u.set_generic_info_elem.data))
+
+#endif /* DSCAPE_HOSTAPD_IOCTL_H */
-diff -upN wpa_supplicant-0.4.7/drivers.c wpa_supplicant-0.4.7-dev/drivers.c
---- wpa_supplicant-0.4.7/drivers.c 2005-02-20 01:15:54.000000000 +0100
-+++ wpa_supplicant-0.4.7-dev/drivers.c 2005-12-18 12:13:21.000000000 +0100
+diff -upN wpa_supplicant-0.4.7/src/drivers/drivers.c wpa_supplicant-0.4.7-dev/src/drivers/drivers.c
+--- wpa_supplicant-0.4.7/src/drivers/drivers.c 2005-02-20 01:15:54.000000000 +0100
++++ wpa_supplicant-0.4.7-dev/src/drivers/drivers.c 2005-12-18 12:13:21.000000000 +0100
@@ -18,6 +18,9 @@
#ifdef CONFIG_DRIVER_HOSTAP
extern struct wpa_driver_ops wpa_driver_hostap_ops; /* driver_hostap.c */
@@ -1413,9 +1413,9 @@
#ifdef CONFIG_DRIVER_PRISM54
&wpa_driver_prism54_ops,
#endif /* CONFIG_DRIVER_PRISM54 */
-diff -upN wpa_supplicant-0.4.7/ieee80211_shared.h wpa_supplicant-0.4.7-dev/ieee80211_shared.h
---- wpa_supplicant-0.4.7/ieee80211_shared.h 1970-01-01 01:00:00.000000000 +0100
-+++ wpa_supplicant-0.4.7-dev/ieee80211_shared.h 2005-12-18 12:13:21.000000000 +0100
+diff -upN wpa_supplicant-0.4.7/src/drivers/ieee80211_shared.h wpa_supplicant-0.4.7-dev/src/drivers/ieee80211_shared.h
+--- wpa_supplicant-0.4.7/src/drivers/ieee80211_shared.h 1970-01-01 01:00:00.000000000 +0100
++++ wpa_supplicant-0.4.7-dev/src/drivers/ieee80211_shared.h 2005-12-18 12:13:21.000000000 +0100
@@ -0,0 +1,50 @@
+/*
+ * IEEE 802.11 -- shared defines for low-level drivers, 80211.o, and hostapd
@@ -1467,16 +1467,16 @@
+
+
+#endif /* IEEE80211_SHARED_H */
-diff -upN wpa_supplicant-0.4.7/Makefile wpa_supplicant-0.4.7-dev/Makefile
---- wpa_supplicant-0.4.7/Makefile 2005-11-21 02:42:12.000000000 +0100
-+++ wpa_supplicant-0.4.7-dev/Makefile 2005-12-18 12:13:21.000000000 +0100
+diff -upN wpa_supplicant-0.4.7/wpa_supplicant/Makefile wpa_supplicant-0.4.7-dev/wpa_supplicant/Makefile
+--- wpa_supplicant-0.4.7/wpa_supplicant/Makefile 2005-11-21 02:42:12.000000000 +0100
++++ wpa_supplicant-0.4.7-dev/wpa_supplicant/Makefile 2005-12-18 12:13:21.000000000 +0100
@@ -61,6 +61,13 @@ OBJS_d += driver_hostap.o
CONFIG_WIRELESS_EXTENSION=y
endif
+ifdef CONFIG_DRIVER_DSCAPE
+CFLAGS += -DCONFIG_DRIVER_DSCAPE
-+OBJS_d += driver_dscape.o
++OBJS_d += ../src/drivers/driver_dscape.o
+CONFIG_WIRELESS_EXTENSION=y
+endif
+
================================================================
Index: SOURCES/wpa_supplicant-OPTCFLAGS.patch
diff -u SOURCES/wpa_supplicant-OPTCFLAGS.patch:1.1 SOURCES/wpa_supplicant-OPTCFLAGS.patch:1.2
--- SOURCES/wpa_supplicant-OPTCFLAGS.patch:1.1 Thu Aug 3 21:33:43 2006
+++ SOURCES/wpa_supplicant-OPTCFLAGS.patch Sat Jul 14 17:35:53 2007
@@ -1,6 +1,6 @@
-diff -Nur wpa_supplicant-0.5.4/Makefile wpa_supplicant-0.5.4.OPTCFLAGS/Makefile
---- wpa_supplicant-0.5.4/Makefile 2006-08-03 19:30:41.000000000 +0000
-+++ wpa_supplicant-0.5.4.OPTCFLAGS/Makefile 2006-08-03 19:30:42.000000000 +0000
+diff -Nur wpa_supplicant-0.5.4/wpa_supplicant/Makefile wpa_supplicant-0.5.4.OPTCFLAGS/wpa_supplicant/Makefile
+--- wpa_supplicant-0.5.4/wpa_supplicant/Makefile 2006-08-03 19:30:41.000000000 +0000
++++ wpa_supplicant-0.5.4.OPTCFLAGS/wpa_supplicant/Makefile 2006-08-03 19:30:42.000000000 +0000
@@ -3,7 +3,7 @@
endif
================================================================
Index: SOURCES/wpa_supplicant-makefile.patch
diff -u SOURCES/wpa_supplicant-makefile.patch:1.1 SOURCES/wpa_supplicant-makefile.patch:1.2
--- SOURCES/wpa_supplicant-makefile.patch:1.1 Thu Apr 7 22:20:06 2005
+++ SOURCES/wpa_supplicant-makefile.patch Sat Jul 14 17:35:53 2007
@@ -1,7 +1,6 @@
-Wspólne podkatalogi: wpa_supplicant-0.3.8.orig/doc i wpa_supplicant-0.3.8/doc
-diff -u wpa_supplicant-0.3.8.orig/Makefile wpa_supplicant-0.3.8/Makefile
---- wpa_supplicant-0.3.8.orig/Makefile 2005-02-14 02:55:47.000000000 +0100
-+++ wpa_supplicant-0.3.8/Makefile 2005-04-07 21:55:05.803706440 +0200
+diff -u wpa_supplicant-0.3.8.orig/wpa_supplicant/Makefile wpa_supplicant-0.3.8/wpa_supplicant/Makefile
+--- wpa_supplicant-0.3.8.orig/wpa_supplicant/Makefile 2005-02-14 02:55:47.000000000 +0100
++++ wpa_supplicant-0.3.8/wpa_supplicant/Makefile 2005-04-07 21:55:05.803706440 +0200
@@ -32,8 +32,10 @@
echo CONFIG_WIRELESS_EXTENSION=y >> .config
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/wpa_supplicant-0.4.7_dscape-02.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/wpa_supplicant-OPTCFLAGS.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/wpa_supplicant-makefile.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list