patch_wpa_supplicant-0.5.7-msi-1-gum.patch

补丁:为wpa_supplicant-0.5.7增加对marvell芯片的支持

Index: wpa_supplicant-0.5.7/ChangeLog
===================================================================
--- wpa_supplicant-0.5.7.orig/ChangeLog
+++ wpa_supplicant-0.5.7/ChangeLog
@@ -1,5 +1,11 @@
 ChangeLog for wpa_supplicant
-
[phone] - v0.5.7-MSI-1
+  	* Added support for Marvell Cards by adding/porting the
+    	driver_marvell.c from v0.4.7-MSI-3 and by modifying drivers.c and
+    	the Makefile.
+	* Also modified driver_wext.c,eapol_sm.c,version.h,WPA_supplicant.c
+	  wpa_supplicant.h,events.c.
+	* Remove IOCTL_WLANSPECIFICSCAN and IOCTL_SET_EAP_AUTH_ALGS
 2006-12-31 - v0.5.7
 	* updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48
 	* updated EAP-PSK to use the IANA-allocated EAP type 47
Index: wpa_supplicant-0.5.7/Makefile
===================================================================
--- wpa_supplicant-0.5.7.orig/Makefile
+++ wpa_supplicant-0.5.7/Makefile
@@ -1,3 +1,5 @@
+VER=0.5.7-MSI-1
+
 ifndef CC
 CC=gcc
 endif
@@ -27,10 +29,27 @@ mkconfig:
 		echo '.config exists - did not replace it'; \
 		exit 1; \
 	fi
-	echo CONFIG_DRIVER_HOSTAP=y >> .config
+	echo CONFIG_DRIVER_MARVELL=y >> .config
 	echo CONFIG_DRIVER_WEXT=y >> .config
 	echo CONFIG_WIRELESS_EXTENSION=y >> .config
-
+	echo CONFIG_EAP_TLS=y >> .config
+	echo CONFIG_EAP_TTLS=y >> .config
+	echo CONFIG_EAP_LEAP=y >> .config
+	echo CONFIG_EAP_PEAP=y >> .config
+	echo CONFIG_CTRL_IFACE=y >> .config
+	echo CONFIG_EAP_SIM=y >> .config
+	@if [ "$(ARCH)" == "ARM" ]; then \
+		echo "BINDIR=wpa_supplicant-linux-arm-$(VER)-bin" >> .config; \
+		echo CONFIG_ARM=y >>.config; \
+	elif [ "$(ARCH)" == "SCMA11" ]; then \
+		echo "BINDIR=wpa_supplicant-linux-scma11-$(VER)-bin" >> .config; \
+		echo CONFIG_SCMA11=y >>.config; \
+	elif [ "$(ARCH)" == "FEDORA" ]; then \
+		echo CONFIG_FEDORA=y >>.config; \
+		echo "BINDIR=wpa_supplicant-linux-fedora-$(VER)-bin" >> .config; \
+	else \
+		echo "BINDIR=wpa_supplicant-linux-x86-$(VER)-bin"  >> .config; \
+	fi		
 install: all
 	mkdir -p $(DESTDIR)/usr/local/sbin/
 	for i in $(ALL); do cp $$i $(DESTDIR)/usr/local/sbin/$$i; done
@@ -44,6 +63,20 @@ OBJS_c = wpa_cli.o wpa_ctrl.o
 
 -include .config
 
+ifeq ($(CONFIG_ARM), y)
+TOOLPATH=	/usr/local/arm-linux/bin
+CROSS=		$(TOOLPATH)/arm-linux
+OPENSSLDIR=	/usr/local/arm-linux/openssl
+endif
+
+ifeq ($(CONFIG_SCMA11), y)
+TOOLPATH=	/usr/local/arm/3.4.3/v6_vfp_le
+CROSS=		$(TOOLPATH)/bin/arm_v6_vfp_le
+OPENSSLDIR=	$(TOOLPATH)/lib
+INCPATH=	$(TOOLPATH)/target/usr/include
+endif
+
+
 ifndef CONFIG_OS
 ifdef CONFIG_NATIVE_WINDOWS
 CONFIG_OS=win32
@@ -122,6 +155,23 @@ OBJS_d += driver_atmel.o
 CONFIG_WIRELESS_EXTENSION=y
 endif
 
+ifdef CONFIG_DRIVER_MARVELL
+ifeq ($(CONFIG_ARM),y)
+CC= $(CROSS)gcc
+#CFLAGS+= -s -static
+LIBS+= -L$(OPENSSLDIR)
+LIBS_p+= -L$(OPENSSLDIR)
+endif
+ifeq ($(CONFIG_SCMA11),y)
+CC= $(CROSS)-gcc
+CFLAGS+= -s -static -I$(INCPATH)
+LIBS+= -L$(OPENSSLDIR)
+LIBS_p+= -L$(OPENSSLDIR)
+endif
+CFLAGS += -DCONFIG_DRIVER_MARVELL
+OBJS_d += driver_marvell.o
+CONFIG_WIRELESS_EXTENSION=y
+endif
 ifdef CONFIG_DRIVER_NDISWRAPPER
 CFLAGS += -DCONFIG_DRIVER_NDISWRAPPER
 OBJS_d += driver_ndiswrapper.o
@@ -468,6 +518,17 @@ OBJS += tls_openssl.o
 LIBS += -lssl -lcrypto
 LIBS_p += -lcrypto
 endif
+ifdef CONFIG_DRIVER_MARVELL
+ifeq ($(CONFIG_ARM),y)
+#LIBS += -s -static
+endif
+ifeq ($(CONFIG_SCMA11),y)
+LIBS += -s -static
+endif 
+ifeq ($(CONFIG_FEDORA),y)
+LIBS += -s -static
+endif
+endif
 ifeq ($(CONFIG_TLS), gnutls)
 OBJS += tls_gnutls.o
 LIBS += -lgnutls -lgcrypt -lgpg-error
@@ -866,8 +927,29 @@ test-md5: $(TEST_MD5_OBJS)
 
 tests: test-ms_funcs test-sha1 test-aes test-eap_sim_common test-md4 test-md5
 
+build: 
+
+	@if [ ! -d $(BINDIR) ]; then \
+		mkdir $(BINDIR); \
+	fi 
+	cp -f ChangeLog  $(BINDIR)
+	cp -f RELEASENOTES $(BINDIR)
+	cp -f README $(BINDIR)
+	cp -f run $(BINDIR)
+	cp -f doc/supplicant_radius_installation_procedure.doc $(BINDIR)
+	cp -f wpa_cli  $(BINDIR)
+	cp -f wpa_supplicant  $(BINDIR)
+	cp -f wpa_supplicant.conf  $(BINDIR)
 clean:
 	rm -f core *~ *.o *.d eap_*.so $(ALL) $(WINALL)
+x86 ARM:
+	@grep -v CONFIG_ARM .config | grep -v CONFIG_x86 > .config
+	@echo CONFIG_$@=y >> .config
+
+distclean:
+	@find . -name "*.swp" -exec rm {} \;
+	@find . -name ".*~" -exec rm {} \;
+	@rm -f core *~ *.o wpa_supplicant wpa_passphrase wpa_cli *.d
 
 %.eps: %.fig
 	fig2dev -L eps $*.fig $*.eps
Index: wpa_supplicant-0.5.7/RELEASENOTES
===================================================================
--- /dev/null
+++ wpa_supplicant-0.5.7/RELEASENOTES
@@ -0,0 +1,58 @@
+Linux WAP Supplicant Release Notes
+
+1/9/2006 wpa_supplicant-0-5-7-MSI-1
+
+[1] This is a new release based on Open Source V.0.5.7.
+
+[2] Please refer to the attached document 
+    "supplicant_radius_installation_procedure.doc"
+    for installation procedure.
+
+[3] To build X86 version supplicant
+    (1)rm .config
+    (2)make mkconfig
+    (3)make clean
+    (4)make
+    (5)make build
+    (6)binary file will be copy to wpa_supplicant-linux-x86-0.5.7-MSI-1-bin folder
+
+[4] To build ARM version supplicant
+    (1)rm .config
+    (2)make mkconfig ARCH=ARM
+    (3)make clean
+    (4)make
+    (5)make build
+    (6)binary file will be copy to wpa_supplicant-linux-arm-0.5.7-MSI-1-bin folder
+
+[5] To build Fedora version supplicant
+    (1)rm .config
+    (2)make mkconfig ARCH=FEDORA
+    (3)make clean
+    (4)make
+    (5)make build
+    (6)binary file will be copy to wpa_supplicant-linux-fedora-0.5.7-MSI-1-bin folder
+
+[6] To build scma11 version supplicant
+    (1)rm .config
+    (2)make mkconfig ARCH=SCMA11
+    (3)make clean
+    (4)make
+    (5)make build
+    (6)binary file will be copy to wpa_supplicant-linux-scma11-0.5.7-MSI-1-bin folder
+
+  
+
+
+
+
+
+
+
+
+
+            
+
+
+    
+
+
Index: wpa_supplicant-0.5.7/driver_marvell.c
===================================================================
--- /dev/null
+++ wpa_supplicant-0.5.7/driver_marvell.c
@@ -0,0 +1,740 @@
+/*
+ * WPA Supplicant - driver interaction with Linux Marvell drivers
+ * 
+ *  Copyright