diff options
| author | Tony Lin <tony.lin@freescale.com> | 2011-03-15 10:44:44 +0800 |
|---|---|---|
| committer | Andy Voltz <andy.voltz@timesys.com> | 2011-06-01 13:21:02 -0400 |
| commit | d5fa03504f62a38fb61f1e76c83a0c656601b04e (patch) | |
| tree | 64e21240045cc1dd6ca0cf35a05d0f95a7b27006 | |
| parent | 8b2b707abbe96ec6f9ec798c5beabb53df438dcf (diff) | |
ENGR00140550-1 [AR6003 WIFI]modifications from cherry-pick
add header files to make cherry-pick compile on 2.6.35 kernel
change wireless name from eth to wlan
Signed-off-by: Tony Lin <tony.lin@freescale.com>
| -rw-r--r-- | drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 2 | ||||
| -rw-r--r-- | drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 1 | ||||
| -rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c index c307a5559362..f0e9aa43f8fb 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c @@ -30,7 +30,7 @@ #include <linux/mmc/sdio.h> #include <linux/mmc/sd.h> #include <linux/kthread.h> - +#include <linux/semaphore.h> /* by default setup a bounce buffer for the data packets, if the underlying host controller driver does not use DMA you may be able to skip this step and save the memory allocation and transfer time */ #define HIF_USE_DMA_BOUNCE_BUFFER 1 diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c index 22c6c6659f5b..10f6f6002b04 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c @@ -28,6 +28,7 @@ #include <linux/mmc/sdio_ids.h> #include <linux/mmc/sdio.h> #include <linux/kthread.h> +#include <linux/semaphore.h> #include "hif_internal.h" #define ATH_MODULE_NAME hif #include "a_debug.h" diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index ff7976e9a5ca..1d31c7da20fc 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c @@ -120,7 +120,7 @@ HCI_TRANSPORT_CALLBACKS ar6kHciTransCallbacks = { NULL }; unsigned int processDot11Hdr = 0; int bmienable = BMIENABLE_DEFAULT; -char ifname[IFNAMSIZ] = {0,}; +char ifname[IFNAMSIZ] = "wlan%d"; int wlaninitmode = WLAN_INIT_MODE_DEFAULT; unsigned int bypasswmi = 0; |