r3635 - developers/sameo/patches/ar6k-ng

sameo at sita.openmoko.org sameo at sita.openmoko.org
Wed Dec 12 13:06:22 CET 2007


Author: sameo
Date: 2007-12-12 13:06:20 +0100 (Wed, 12 Dec 2007)
New Revision: 3635

Modified:
   developers/sameo/patches/ar6k-ng/160-ar6k_ng.patch
Log:
ar6k-ng: mainline SDIO stack transition done, time to debug now...


Modified: developers/sameo/patches/ar6k-ng/160-ar6k_ng.patch
===================================================================
--- developers/sameo/patches/ar6k-ng/160-ar6k_ng.patch	2007-12-12 03:45:46 UTC (rev 3634)
+++ developers/sameo/patches/ar6k-ng/160-ar6k_ng.patch	2007-12-12 12:06:20 UTC (rev 3635)
@@ -6,14 +6,14 @@
  drivers/net/wireless/ar6k/ar6k.h                       |   68 
  drivers/net/wireless/ar6k/ar6k_main.c                  | 5580 +++++++++++++++++
  drivers/net/wireless/ar6k/bmi.c                        |  466 +
- drivers/net/wireless/ar6k/hif.c                        |  287 
+ drivers/net/wireless/ar6k/hif.c                        |  289 
  drivers/net/wireless/ar6k/hif.h                        |   87 
  drivers/net/wireless/ar6k/htc/Makefile                 |    5 
  drivers/net/wireless/ar6k/htc/htc.c                    |  445 +
  drivers/net/wireless/ar6k/htc/htc_events.c             |  934 ++
  drivers/net/wireless/ar6k/htc/htc_internal.h           |  456 +
  drivers/net/wireless/ar6k/htc/htc_recv.c               |  205 
- drivers/net/wireless/ar6k/htc/htc_send.c               |  359 +
+ drivers/net/wireless/ar6k/htc/htc_send.c               |  389 +
  drivers/net/wireless/ar6k/htc/htc_utils.c              |  394 +
  drivers/net/wireless/ar6k/include/AR6000_bmi.h         |  136 
  drivers/net/wireless/ar6k/include/AR6000_gpio.h        |   39 
@@ -49,12 +49,12 @@
  drivers/net/wireless/ar6k/wlan/wlan_recv_beacon.c      |  169 
  drivers/net/wireless/ar6k/wlan/wlan_utils.c            |   53 
  drivers/net/wireless/ar6k/wmi.c                        | 2834 ++++++++
- 50 files changed, 20706 insertions(+)
+ 50 files changed, 20738 insertions(+)
 
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/ar6k.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/ar6k.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/ar6k.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,68 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -127,7 +127,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/ar6k_main.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/ar6k_main.c	2007-12-11 18:52:33.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/ar6k_main.c	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,5580 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5712,7 +5712,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/bmi.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/bmi.c	2007-12-11 19:41:01.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/bmi.c	2007-12-12 12:32:26.000000000 +0100
 @@ -0,0 +1,466 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -6114,7 +6114,7 @@
 +			AR_DEBUG_PRINTF
 +				("Unable to decrement the command credit count register: %d\n",
 +				 ret);
-+			return A_ERROR;
++//			return A_ERROR;
 +		}
 +	}
 +
@@ -6183,8 +6183,8 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/hif.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/hif.c	2007-12-11 19:36:51.000000000 +0100
-@@ -0,0 +1,287 @@
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/hif.c	2007-12-12 12:07:48.000000000 +0100
+@@ -0,0 +1,289 @@
 +/*
 + * Copyright (c) 2004-2005 Atheros Communications Inc.
 + *
@@ -6314,6 +6314,7 @@
 +		return ret;
 +	}
 +
++#if 0
 +	ret = sdio_claim_irq(func, hifIRQHandler);
 +	if (ret) {
 +		printk("%s(), claim_irq failed ret %d\n", __FUNCTION__, ret);
@@ -6321,6 +6322,7 @@
 +		sdio_release_host(func);
 +		return ret;
 +	}
++#endif
 +
 +	sdio_release_host(func);
 +
@@ -6475,7 +6477,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/hif.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/hif.h	2007-12-11 19:53:56.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/hif.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,87 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -6567,7 +6569,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc.c	2007-12-11 21:04:28.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc.c	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,445 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -7017,7 +7019,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_events.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_events.c	2007-12-11 21:46:34.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_events.c	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,934 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -7956,7 +7958,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_internal.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_internal.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_internal.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,456 @@
 +/*
 + * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -8417,7 +8419,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_recv.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_recv.c	2007-12-11 21:54:22.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_recv.c	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,205 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -8627,8 +8629,8 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_send.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_send.c	2007-12-11 02:30:20.000000000 +0100
-@@ -0,0 +1,359 @@
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_send.c	2007-12-12 10:48:10.000000000 +0100
+@@ -0,0 +1,389 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
 + *
@@ -8745,6 +8747,7 @@
 +	HTC_TARGET *target;
 +	u32 frameLength;
 +	u32 paddedLength;
++	u32 block_mode;
 +	HTC_EVENT_INFO eventInfo;
 +	u8 txCreditsConsumed;
 +	u8 txCreditsAvailable;
@@ -8780,10 +8783,10 @@
 +	txCreditsConsumed = GET_TX_CREDITS_CONSUMED(endPoint);
 +	SET_TX_CREDITS_AVAILABLE(endPoint, 0);
 +	SET_TX_CREDITS_CONSUMED(endPoint,
-+							txCreditsConsumed + txCreditsAvailable);
++				txCreditsConsumed + txCreditsAvailable);
 +	AR_DEBUG_PRINTF(ATH_DEBUG_SYNC,
-+					("Critical Section (credit): UNLOCK at line %d in file %s\n",
-+					 __LINE__, __FILE__));
++			("Critical Section (credit): UNLOCK at line %d in file %s\n",
++			 __LINE__, __FILE__));
 +	A_MUTEX_UNLOCK(&creditCS);
 +
 +	/*
@@ -8821,8 +8824,13 @@
 +						("Available Tx credits: %d\n",
 +						 txCreditsAvailable));
 +
++		block_mode = (endPoint->blockSize > 1) ? HIF_BLOCK_BASIS : HIF_BYTE_BASIS;
++
 +		/* Send the data to the bus driver, FIXME: async request */
-+		status = sdio_memcpy_toio(target->device, endPoint->address, mboxBuffer->buffer, mboxBuffer->actualLength);
++		status = hif_rw(target->device, HIF_WRITE, HIF_INCREMENTAL_ADDRESS, block_mode,
++				endPoint->address, mboxBuffer->buffer, mboxBuffer->actualLength);
++
++//		status = sdio_memcpy_toio(target->device, endPoint->address, mboxBuffer->buffer, mboxBuffer->actualLength);
 +		if (status) {
 +			AR_DEBUG_PRINTF(ATH_DEBUG_ERR | ATH_DEBUG_SEND,
 +							("Frame transmission failed\n"));
@@ -8870,9 +8878,17 @@
 +			 * credits that might have been queued up by now.
 +			 */
 +			address = getRegAddr(TX_CREDIT_COUNTER_DECREMENT_REG, endPointId);
++			element = allocateRegRequestElement(target);
++			AR_DEBUG_ASSERT(element != NULL);
++			FILL_REG_BUFFER(element, &endPoint->txCreditsAvailable[1],
++					txCreditsConsumed, TX_CREDIT_COUNTER_DECREMENT_REG,
++					endPointId);
 +			/* FIXME: async request */
-+			status = sdio_readsb(target->device, &endPoint->txCreditsAvailable[1], address, txCreditsConsumed);
++			status = hif_rw(target->device, HIF_READ, HIF_FIXED_ADDRESS, HIF_BYTE_BASIS,
++					address, &endPoint->txCreditsAvailable[1], txCreditsConsumed);
 +
++			//status = sdio_readsb(target->device, &endPoint->txCreditsAvailable[1], address, txCreditsConsumed);
++
 +#ifdef notyet
 +			/* for async */
 +			AR_DEBUG_ASSERT(status == A_OK);
@@ -8970,9 +8986,22 @@
 +	AR_DEBUG_ASSERT(endPoint->txCreditsConsumed == 0);
 +	endPoint->txCreditsConsumed = 1;
 +	address = getRegAddr(TX_CREDIT_COUNTER_DECREMENT_REG, endPointId);
++	element = allocateRegRequestElement(target);
++	AR_DEBUG_ASSERT(element != NULL);
++	FILL_REG_BUFFER(element, &endPoint->txCreditsAvailable[1],
++			endPoint->txCreditsConsumed,
++			TX_CREDIT_COUNTER_DECREMENT_REG, endPointId);
++
 +	/* FIXME: async request */
-+	status = sdio_readsb(target->device, &endPoint->txCreditsAvailable[1], address, endPoint->txCreditsConsumed);
++	status = hif_rw(target->device, HIF_READ, HIF_FIXED_ADDRESS, HIF_BYTE_BASIS,
++			address, &endPoint->txCreditsAvailable[1], endPoint->txCreditsConsumed);
 +
++	//status = sdio_readsb(target->device, &endPoint->txCreditsAvailable[1], address, endPoint->txCreditsConsumed);
++
++	if (!status) {
++		element->completionCB(element, status);
++	}
++
 +	/* Negotiate the maximum block size for the endpoint */
 +	addToMboxQueue(sendQueue, (u8 *) & endPoint->blockSize,
 +				   sizeof(endPoint->blockSize),
@@ -8980,7 +9009,10 @@
 +	element = removeFromMboxQueue(sendQueue);
 +	element->completionCB = htcBlkSzNegCompletionCB;
 +	mboxBuffer = GET_MBOX_BUFFER(element);
-+	status = sdio_memcpy_toio(target->device, endPoint->address, mboxBuffer->buffer, mboxBuffer->bufferLength);
++	status = hif_rw(target->device, HIF_WRITE, HIF_INCREMENTAL_ADDRESS, HIF_BYTE_BASIS,
++			endPoint->address, mboxBuffer->buffer, mboxBuffer->bufferLength);
++
++//	status = sdio_memcpy_toio(target->device, endPoint->address, mboxBuffer->buffer, mboxBuffer->bufferLength);
 +	if (!status)
 +		element->completionCB(element, status);
 +
@@ -8991,7 +9023,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_utils.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_utils.c	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/htc_utils.c	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,394 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -9390,7 +9422,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/Makefile	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/htc/Makefile	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,5 @@
 +#
 +# SDIO ar6000 wlan htc function driver
@@ -9400,7 +9432,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/app/dset.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/app/dset.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/app/dset.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,77 @@
 +#ifndef _DSET_H_
 +#define _DSET_H_
@@ -9482,7 +9514,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/AR6000_bmi.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/AR6000_bmi.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/AR6000_bmi.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,136 @@
 +/*
 + * Copyright 2006 Atheros Communications, Inc.
@@ -9623,7 +9655,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/AR6000_gpio.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/AR6000_gpio.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/AR6000_gpio.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright 2005-2006 Atheros Communications, Inc.
@@ -9667,7 +9699,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/AR6000_version.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/AR6000_version.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/AR6000_version.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright 2006 Atheros Communications, Inc.
@@ -9716,7 +9748,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ar6k_api.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ar6k_api.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ar6k_api.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,79 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -9800,7 +9832,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/athdefs.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/athdefs.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/athdefs.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,85 @@
 +
 +#ifndef __ATHDEFS_H__
@@ -9890,7 +9922,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/athdrv.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/athdrv.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/athdrv.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,597 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -10492,7 +10524,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/dset_api.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/dset_api.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/dset_api.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,47 @@
 +/*
 + * Copyright 2005-2006 Atheros Communications, Inc.
@@ -10544,7 +10576,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/gpio_api.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/gpio_api.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/gpio_api.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,60 @@
 +/*
 + * Copyright 2005-2006 Atheros Communications, Inc.
@@ -10609,7 +10641,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hif.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hif.h	2007-12-11 18:05:40.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hif.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,75 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -10689,7 +10721,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/host_version.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/host_version.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/host_version.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,47 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -10741,7 +10773,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/htc.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/htc.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/htc.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,115 @@
 +/*
 + * Copyright (c) 2006 Atheros Communications, Inc.
@@ -10861,7 +10893,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/#mbox_host_reg.h#
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/#mbox_host_reg.h#	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/#mbox_host_reg.h#	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,416 @@
 +/*
 + * Copyright 2006 Atheros Communications, Inc.
@@ -11282,7 +11314,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/mbox_host_reg.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/mbox_host_reg.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/mbox_host_reg.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,416 @@
 +/*
 + * Copyright 2006 Atheros Communications, Inc.
@@ -11703,7 +11735,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/mbox_reg.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/mbox_reg.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/mbox_reg.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,550 @@
 +/*
 + * Copyright 2006 Atheros Communications, Inc.
@@ -12258,7 +12290,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/mc_reg.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/mc_reg.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/mc_reg.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,1129 @@
 +/*
 + * Copyright 2006 Atheros Communications, Inc.
@@ -13392,7 +13424,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/rtc_reg.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/rtc_reg.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/hw/rtc_reg.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,1204 @@
 +/*
 + * Copyright 2006 Atheros Communications, Inc.
@@ -14601,7 +14633,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ieee80211.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ieee80211.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ieee80211.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,333 @@
 +/*-
 + * Copyright (c) 2001 Atsushi Onoe
@@ -14939,7 +14971,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ieee80211_ioctl.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ieee80211_ioctl.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ieee80211_ioctl.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,121 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -15065,7 +15097,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ieee80211_node.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ieee80211_node.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/ieee80211_node.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,74 @@
 +/*
 + * Copyright (c) 2001 Atsushi Onoe
@@ -15144,7 +15176,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/osapi.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/osapi.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/osapi.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,49 @@
 +/*
 + * Copyright 2003-2006 Atheros Communications, Inc.
@@ -15198,7 +15230,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/osapi_linux.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/osapi_linux.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/osapi_linux.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,167 @@
 +/*
 + * Copyright 2003-2006 Atheros Communications, Inc.
@@ -15370,7 +15402,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/queue.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/queue.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/queue.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,550 @@
 +/*
 + * Copyright (c) 1991, 1993
@@ -15925,7 +15957,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wlan_api.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wlan_api.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wlan_api.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,90 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -16020,7 +16052,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmi_api.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmi_api.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmi_api.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,165 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -16190,7 +16222,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmi.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmi.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmi.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,1133 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17328,7 +17360,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmi_host.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmi_host.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmi_host.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,74 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17407,7 +17439,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmix.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmix.h	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/include/wmix.h	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,196 @@
 +/*
 + * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -17608,7 +17640,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/install
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/install	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/install	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,3 @@
 +make
 +sudo cp ar6k.ko /lib/modules/2.6.24-rc1/kernel/drivers/net/wireless/
@@ -17616,7 +17648,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/Kconfig
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/Kconfig	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/Kconfig	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,11 @@
 +config AR6K
 +	tristate "Atheros AR600x driver"
@@ -17632,7 +17664,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/Makefile	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/Makefile	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,19 @@
 +#
 +#  AR6K Kernel Module makefile.
@@ -17656,14 +17688,14 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/Makefile	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/Makefile	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,2 @@
 +obj-$(CONFIG_AR6K) += wlan_node.o  wlan_recv_beacon.o  wlan_utils.o
 +
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/wlan_node.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/wlan_node.c	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/wlan_node.c	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,259 @@
 +/*
 + * Copyright (c) 2001 Atsushi Onoe
@@ -17927,7 +17959,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/wlan_recv_beacon.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/wlan_recv_beacon.c	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/wlan_recv_beacon.c	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,169 @@
 +/*
 + * Copyright (c) 2001 Atsushi Onoe
@@ -18101,7 +18133,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/wlan_utils.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/wlan_utils.c	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wlan/wlan_utils.c	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,53 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18159,7 +18191,7 @@
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wmi.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wmi.c	2007-12-11 02:30:20.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/ar6k/wmi.c	2007-12-11 22:02:08.000000000 +0100
 @@ -0,0 +1,2834 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -20997,8 +21029,8 @@
 +}
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/Kconfig
 ===================================================================
---- linux-2.6.22-atheros-ng.orig/drivers/net/wireless/Kconfig	2007-12-11 02:31:12.000000000 +0100
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/Kconfig	2007-12-11 02:31:17.000000000 +0100
+--- linux-2.6.22-atheros-ng.orig/drivers/net/wireless/Kconfig	2007-12-11 21:59:29.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/Kconfig	2007-12-11 22:02:08.000000000 +0100
 @@ -549,5 +549,6 @@
  source "drivers/net/wireless/hostap/Kconfig"
  source "drivers/net/wireless/bcm43xx/Kconfig"
@@ -21008,8 +21040,8 @@
  endmenu
 Index: linux-2.6.22-atheros-ng/drivers/net/wireless/Makefile
 ===================================================================
---- linux-2.6.22-atheros-ng.orig/drivers/net/wireless/Makefile	2007-12-11 02:31:44.000000000 +0100
-+++ linux-2.6.22-atheros-ng/drivers/net/wireless/Makefile	2007-12-11 02:31:58.000000000 +0100
+--- linux-2.6.22-atheros-ng.orig/drivers/net/wireless/Makefile	2007-12-11 21:59:29.000000000 +0100
++++ linux-2.6.22-atheros-ng/drivers/net/wireless/Makefile	2007-12-11 22:02:08.000000000 +0100
 @@ -37,6 +37,7 @@
  obj-$(CONFIG_HOSTAP)		+= hostap/
  obj-$(CONFIG_BCM43XX)		+= bcm43xx/





More information about the commitlog mailing list