headers
proski | 1 Jun 2006 04:03
Favicon

revision 1615 committed by proski

Project     : madwifi
Revision    : 1615
Author      : proski
Date        : 2006-06-01 04:03:09 +0200 (Thu, 01 Jun 2006)

Log Message :
Full rewrite of get_arch_target.sh

This was destined for Makefile.inc originally, and the code is still in
a format that would allow easy integration into a makefile.

If .config is missing, make it an error.

Separate ARCH and TARGET calculation.  ARCH can often be determined much
more reliably, so that part of code won't need to change much.

CONFIG_SPARC is not defined for 32-bit SPARC.  Use CONFIG_SPARC32
instead.

Determine endianess more reliably.  Don't use variable endianess for
CPUs when there is no choice in the kernel or in the HAL.

Recognize CONFIG_CPU_SA110 and CONFIG_CPU_SA1100 as xscale.

Initial attempt at distinguishing misp1, mips and mipsisa32 targets.

Affected Files:
* trunk/scripts/get_arch_target.sh                    updated             

Modified: trunk/scripts/get_arch_target.sh
(Continue reading)

Permalink | Reply | 0 comments |
headers
proski | 1 Jun 2006 23:46
Favicon

revision 1616 committed by proski

Project     : madwifi
Revision    : 1616
Author      : proski
Date        : 2006-06-01 23:46:51 +0200 (Thu, 01 Jun 2006)

Log Message :
Improve error reporting, create function die() for that purpose

Affected Files:
* trunk/patches/install.sh                            updated             

Modified: trunk/patches/install.sh
===================================================================
--- trunk/patches/install.sh	2006-06-01 02:03:09 UTC (rev 1615)
+++ trunk/patches/install.sh	2006-06-01 21:46:51 UTC (rev 1616)
 <at>  <at>  -7,6 +7,12  <at>  <at> 

 set -e

+die()
+{
+	echo "FATAL ERROR: $1" >&2
+	exit 1
+}
+
 DEPTH=..
 KERNEL_VERSION=`uname -r`

 <at>  <at>  -17,8 +23,7  <at>  <at> 
 else if test -e /lib/modules/${KERNEL_VERSION}/build; then
(Continue reading)

Permalink | Reply | 0 comments |
headers
proski | 2 Jun 2006 00:20
Favicon

revision 1617 committed by proski

Project     : madwifi
Revision    : 1617
Author      : proski
Date        : 2006-06-02 00:20:30 +0200 (Fri, 02 Jun 2006)

Log Message :
Install kernel makefiles unmodified

Use makefile conditionals instead of trimming the makefiles at the
install time.

Don't overwrite src variable.  It's potentially risky.

Affected Files:
* trunk/ath/Makefile.kernel                           updated             
* trunk/ath_rate/amrr/Makefile.kernel                 updated             
* trunk/ath_rate/onoe/Makefile.kernel                 updated             
* trunk/ath_rate/sample/Makefile.kernel               updated             
* trunk/net80211/Makefile.kernel                      updated             
* trunk/patches/install.sh                            updated             

Modified: trunk/ath/Makefile.kernel
===================================================================
--- trunk/ath/Makefile.kernel	2006-06-01 21:46:51 UTC (rev 1616)
+++ trunk/ath/Makefile.kernel	2006-06-01 22:20:30 UTC (rev 1617)
 <at>  <at>  -2,15 +2,15  <at>  <at> 
 # Makefile for the Atheros WLAN driver.
 #

-##2.4##obj=.
(Continue reading)

Permalink | Reply | 0 comments |
headers
proski | 2 Jun 2006 00:56
Favicon

revision 1618 committed by proski

Project     : madwifi
Revision    : 1618
Author      : proski
Date        : 2006-06-02 00:56:55 +0200 (Fri, 02 Jun 2006)

Log Message :
Use "find" to find sources to be copied

Find all *.c and *.h files in directories containing kernel sources and
copy them into the kernel.  Find all Makefile.kernel file and copy each
to Makefile in the respective directory.

Retire INSTALL, use "cp -f" directly.

Affected Files:
* trunk/patches/install.sh                            updated             

Modified: trunk/patches/install.sh
===================================================================
--- trunk/patches/install.sh	2006-06-01 22:20:30 UTC (rev 1617)
+++ trunk/patches/install.sh	2006-06-01 22:56:55 UTC (rev 1618)
 <at>  <at>  -13,7 +13,7  <at>  <at> 
 	exit 1
 }

-DEPTH=..
+SRC=..
 KERNEL_VERSION=`uname -r`

 if test -n "$1"; then
(Continue reading)

Permalink | Reply | 0 comments |
headers
proski | 2 Jun 2006 01:48
Favicon

revision 1619 committed by proski

Project     : madwifi
Revision    : 1619
Author      : proski
Date        : 2006-06-02 01:48:29 +0200 (Fri, 02 Jun 2006)

Log Message :
Port TARGET calculation rules from scripts/get_arch_target.sh

It would be nice to reuse the same code eventually, but it would involve
significant makefile changes.

Affected Files:
* trunk/ath/Makefile.kernel                           updated             

Modified: trunk/ath/Makefile.kernel
===================================================================
--- trunk/ath/Makefile.kernel	2006-06-01 22:56:55 UTC (rev 1618)
+++ trunk/ath/Makefile.kernel	2006-06-01 23:48:29 UTC (rev 1619)
 <at>  <at>  -12,29 +12,43  <at>  <at> 
 WLAN=	$(srctree)/$(src)/../net80211
 COMPAT=	$(srctree)/$(src)/../include

-#
-# Use ARCH to guess the target platform.
-#
-ifdef CONFIG_CPU_BIG_ENDIAN
+
+# Determine endianess.  Note that it's not indicated for some CPUs at
+# all, so this value is only valid for certain processors.
+ifeq ($(filter-out arm%,$(KERNELRELEASE)),)
(Continue reading)

Permalink | Reply | 0 comments |
headers
proski | 2 Jun 2006 04:01
Favicon

revision 1620 committed by proski

Project     : madwifi
Revision    : 1620
Author      : proski
Date        : 2006-06-02 04:01:12 +0200 (Fri, 02 Jun 2006)

Log Message :
If pci_register_driver fails, don't call pci_unregister_driver

It would cause a kernel oops.  It happens if ath_pci is compiled into
the kernel, and a stale ath_pci module is loaded.

Affected Files:
* trunk/ath/if_ath_pci.c                              updated             

Modified: trunk/ath/if_ath_pci.c
===================================================================
--- trunk/ath/if_ath_pci.c	2006-06-01 23:48:29 UTC (rev 1619)
+++ trunk/ath/if_ath_pci.c	2006-06-02 02:01:12 UTC (rev 1620)
 <at>  <at>  -359,7 +359,6  <at>  <at> 

 	if (pci_register_driver(&ath_pci_drv_id) < 0) {
 		printk("ath_pci: No devices found, driver not installed.\n");
-		pci_unregister_driver(&ath_pci_drv_id);
 		return (-ENODEV);
 	}
 #ifdef CONFIG_SYSCTL
Permalink | Reply | 0 comments |
headers
kelmo | 2 Jun 2006 13:15
Favicon

revision 1621 committed by kelmo

Project     : madwifi
Revision    : 1621
Author      : kelmo
Date        : 2006-06-02 13:15:34 +0200 (Fri, 02 Jun 2006)

Log Message :
Use && in place of if statement.

Affected Files:
* trunk/scripts/madwifi-unload.bash                   updated             

Modified: trunk/scripts/madwifi-unload.bash
===================================================================
--- trunk/scripts/madwifi-unload.bash	2006-06-02 02:01:12 UTC (rev 1620)
+++ trunk/scripts/madwifi-unload.bash	2006-06-02 11:15:34 UTC (rev 1621)
 <at>  <at>  -2,5 +2,5  <at>  <at> 

 for module in ath{_{pci,rate_{amrr,onoe,sample},hal}} wlan{_{wep,tkip,ccmp,acl,xauth,scan_{sta,ap}},}
 do
-	 if grep -q ^$module /proc/modules; then modprobe -r $module; fi
+	 grep -q ^$module /proc/modules && modprobe -r $module
 done
Permalink | Reply | 0 comments |
headers
kelmo | 2 Jun 2006 13:16
Favicon

revision 1622 committed by kelmo

Project     : madwifi
Revision    : 1622
Author      : kelmo
Date        : 2006-06-02 13:16:30 +0200 (Fri, 02 Jun 2006)

Log Message :
Use -n in place of ! -z

Affected Files:
* trunk/Makefile                                      updated             

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-06-02 11:15:34 UTC (rev 1621)
+++ trunk/Makefile	2006-06-02 11:16:30 UTC (rev 1622)
 <at>  <at>  -114,7 +114,7  <at>  <at> 
 	 <at> echo "OS           : $(OS)"
 	 <at> echo "ARCH         : $(ARCH)"
 	 <at> echo "BUS          : $(BUS)"
-	 <at> if [ ! -z "$(TOOLPATH)" ]; then \
+	 <at> if [ -n "$(TOOLPATH)" ]; then \
 	     <at> echo "TOOLPATH     : $(TOOLPATH)"; \
 	fi	
 	 <at> echo "KERNELRELEASE: $(KERNELRELEASE)"
 <at>  <at>  -122,7 +122,7  <at>  <at> 
 	 <at> echo "KERNELCONF   : $(KERNELCONF)"
 	 <at> echo "KMODPATH     : $(KMODPATH)"
 	 <at> echo "KMODSUF      : $(KMODSUF)"
-	 <at> if [ ! -z "$(DESTDIR)" ]; then \
+	 <at> if [ -n "$(DESTDIR)" ]; then \
(Continue reading)

Permalink | Reply | 0 comments |
headers
kelmo | 2 Jun 2006 13:33
Favicon

revision 1623 committed by kelmo

Project     : madwifi
Revision    : 1623
Author      : kelmo
Date        : 2006-06-02 13:33:31 +0200 (Fri, 02 Jun 2006)

Log Message :
Adapt module locator script for the corner case of Ubuntu. They
use a "volatile" directory for modules with restrictive licenses.
These modules seem to be made on the fly from object files
installed by the "linux-restricted-modules-≤kernelversion>" package
to "/lib/linux-restricted-modules/<kernelversion>".

Affected Files:
* trunk/Makefile                                      updated             
* trunk/scripts/find-madwifi-modules.sh               updated             

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-06-02 11:16:30 UTC (rev 1622)
+++ trunk/Makefile	2006-06-02 11:33:31 UTC (rev 1623)
 <at>  <at>  -84,7 +84,7  <at>  <at> 
 install-modules:
 	 <at> # check if there are modules left from an old installation
 	 <at> # might cause make to abort the build
-	sh scripts/find-madwifi-modules.sh $(DESTDIR)/lib/modules/$(KERNELRELEASE)
+	sh scripts/find-madwifi-modules.sh $(KERNELRELEASE) $(DESTDIR)

 	for i in ${DIRS_MODULES}; do \
 		$(MAKE) -C $$i install || exit 1; \
 <at>  <at>  -97,7 +97,7  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
kelmo | 2 Jun 2006 15:01
Favicon

revision 1624 committed by kelmo

Project     : madwifi
Revision    : 1624
Author      : kelmo
Date        : 2006-06-02 15:01:30 +0200 (Fri, 02 Jun 2006)

Log Message :
Print a messsage when kernel aes module cannot be used for ccmp
cipher. Closes #579

Signed-off-by: Nicholas J Kreucher <nick <at> kreucher.net>

Affected Files:
* trunk/net80211/ieee80211_crypto_ccmp.c              updated             

Modified: trunk/net80211/ieee80211_crypto_ccmp.c
===================================================================
--- trunk/net80211/ieee80211_crypto_ccmp.c	2006-06-02 11:33:31 UTC (rev 1623)
+++ trunk/net80211/ieee80211_crypto_ccmp.c	2006-06-02 13:01:30 UTC (rev 1624)
 <at>  <at>  -107,6 +107,9  <at>  <at> 
 	ctx->cc_ic = vap->iv_ic;
 	ctx->cc_tfm = crypto_alloc_tfm("aes", 0);
 	if (ctx->cc_tfm == NULL) {
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO,
+			"%s: unable to load kernel AES crypto support\n",
+			__func__);
 		FREE(ctx, M_DEVBUF);
 		_MOD_DEC_USE(THIS_MODULE);
 		return NULL;
Permalink | Reply | 0 comments |

Gmane