All files name prefix removed due to the fact that wl12xx driver supports
wl1271 and wl1273.
Also the definition in Kconfig and header files changed respectively.
Signed-off-by: Shahar Levi <[email protected]>
---
Changes from v1:
- Rename header files protect define to the file name
- Definition naming in Kconfig
Changes from v2:
- Fix four comments words in Kconfig
- Replace wl1271-$(CONFIG_NL80211_TESTMODE) with wl12xx-$(CONFIG_NL80211_TESTMODE)
- Rebase to latest
Changes from v3:
- Typo
drivers/net/wireless/wl12xx/Kconfig | 51 ++++++++++----------
drivers/net/wireless/wl12xx/Makefile | 17 ++++---
.../net/wireless/wl12xx/{wl1271_acx.c => acx.c} | 8 ++--
.../net/wireless/wl12xx/{wl1271_acx.h => acx.h} | 8 ++--
.../net/wireless/wl12xx/{wl1271_boot.c => boot.c} | 10 ++--
.../net/wireless/wl12xx/{wl1271_boot.h => boot.h} | 2 +-
.../net/wireless/wl12xx/{wl1271_cmd.c => cmd.c} | 12 ++--
.../net/wireless/wl12xx/{wl1271_cmd.h => cmd.h} | 6 +-
.../net/wireless/wl12xx/{wl1271_conf.h => conf.h} | 4 +-
.../wl12xx/{wl1271_debugfs.c => debugfs.c} | 10 ++--
.../wl12xx/{wl1271_debugfs.h => debugfs.h} | 6 +-
.../wireless/wl12xx/{wl1271_event.c => event.c} | 12 ++--
.../wireless/wl12xx/{wl1271_event.h => event.h} | 4 +-
.../net/wireless/wl12xx/{wl1271_ini.h => ini.h} | 4 +-
.../net/wireless/wl12xx/{wl1271_init.c => init.c} | 8 ++--
.../net/wireless/wl12xx/{wl1271_init.h => init.h} | 6 +-
drivers/net/wireless/wl12xx/{wl1271_io.c => io.c} | 4 +-
drivers/net/wireless/wl12xx/{wl1271_io.h => io.h} | 6 +-
.../net/wireless/wl12xx/{wl1271_main.c => main.c} | 38 +++++++-------
drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c} | 6 +-
drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h} | 8 ++--
.../net/wireless/wl12xx/{wl1271_reg.h => reg.h} | 0
drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c} | 12 ++--
drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h} | 4 +-
.../net/wireless/wl12xx/{wl1271_scan.c => scan.c} | 8 ++--
.../net/wireless/wl12xx/{wl1271_scan.h => scan.h} | 6 +-
.../net/wireless/wl12xx/{wl1271_sdio.c => sdio.c} | 4 +-
.../net/wireless/wl12xx/{wl1271_spi.c => spi.c} | 6 +-
.../wl12xx/{wl1271_testmode.c => testmode.c} | 6 +-
.../wl12xx/{wl1271_testmode.h => testmode.h} | 4 +-
drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c} | 12 ++--
drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h} | 4 +-
drivers/net/wireless/wl12xx/{wl1271.h => wl12xx.h} | 8 ++--
33 files changed, 153 insertions(+), 151 deletions(-)
rename drivers/net/wireless/wl12xx/{wl1271_acx.c => acx.c} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_acx.h => acx.h} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_boot.c => boot.c} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_boot.h => boot.h} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_cmd.c => cmd.c} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_cmd.h => cmd.h} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_conf.h => conf.h} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_debugfs.c => debugfs.c} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_debugfs.h => debugfs.h} (93%)
rename drivers/net/wireless/wl12xx/{wl1271_event.c => event.c} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_event.h => event.h} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_ini.h => ini.h} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_init.c => init.c} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_init.h => init.h} (93%)
rename drivers/net/wireless/wl12xx/{wl1271_io.c => io.c} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_io.h => io.h} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_main.c => main.c} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h} (92%)
rename drivers/net/wireless/wl12xx/{wl1271_reg.h => reg.h} (100%)
rename drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c} (97%)
rename drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_scan.c => scan.c} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_scan.h => scan.h} (97%)
rename drivers/net/wireless/wl12xx/{wl1271_sdio.c => sdio.c} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_spi.c => spi.c} (99%)
rename drivers/net/wireless/wl12xx/{wl1271_testmode.c => testmode.c} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_testmode.h => testmode.h} (93%)
rename drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c} (98%)
rename drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h} (99%)
rename drivers/net/wireless/wl12xx/{wl1271.h => wl1wl1271-$(CONFIG_NL80211_TESTMODE)2xx.h} (99%)
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 1b3b7bd..2250db5 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -1,56 +1,57 @@
-menuconfig WL12XX
+menuconfig WL12XX_MENU
tristate "TI wl12xx driver support"
depends on MAC80211 && EXPERIMENTAL
---help---
- This will enable TI wl12xx driver support. The drivers make
- use of the mac80211 stack.
+ This will enable TI wl12xx driver support for the following chips:
+ wl1271 and wl1273.
+ The drivers make use of the mac80211 stack.
-config WL1271
- tristate "TI wl1271 support"
- depends on WL12XX && GENERIC_HARDIRQS
+config WL12XX
+ tristate "TI wl12xx support"
+ depends on WL12XX_MENU && GENERIC_HARDIRQS
depends on INET
select FW_LOADER
select CRC7
---help---
- This module adds support for wireless adapters based on the
- TI wl1271 chipset.
+ This module adds support for wireless adapters based on TI wl1271
+ and TI wl1273 chipsets
- If you choose to build a module, it'll be called wl1271. Say N if
+ If you choose to build a module, it will be called wl12xx. Say N if
unsure.
-config WL1271_HT
- bool "TI wl1271 802.11 HT support (EXPERIMENTAL)"
- depends on WL1271 && EXPERIMENTAL
+config WL12XX_HT
+ bool "TI wl12xx 802.11 HT support (EXPERIMENTAL)"
+ depends on WL12XX && EXPERIMENTAL
default n
---help---
- This will enable 802.11 HT support for TI wl1271 chipset.
+ This will enable 802.11 HT support in the wl12xx module.
That configuration is temporary due to the code incomplete and
still in testing process.
-config WL1271_SPI
- tristate "TI wl1271 SPI support"
- depends on WL1271 && SPI_MASTER
+config WL12XX_SPI
+ tristate "TI wl12xx SPI support"
+ depends on WL12XX && SPI_MASTER
---help---
This module adds support for the SPI interface of adapters using
- TI wl1271 chipset. Select this if your platform is using
+ TI wl12xx chipsets. Select this if your platform is using
the SPI bus.
- If you choose to build a module, it'll be called wl1251_spi.
+ If you choose to build a module, it'll be called wl12xx_spi.
Say N if unsure.
-config WL1271_SDIO
- tristate "TI wl1271 SDIO support"
- depends on WL1271 && MMC
+config WL12XX_SDIO
+ tristate "TI wl12xx SDIO support"
+ depends on WL12XX && MMC
---help---
This module adds support for the SDIO interface of adapters using
- TI wl1271 chipset. Select this if your platform is using
+ TI wl12xx chipsets. Select this if your platform is using
the SDIO bus.
- If you choose to build a module, it'll be called
- wl1271_sdio. Say N if unsure.
+ If you choose to build a module, it'll be called wl12xx_sdio.
+ Say N if unsure.
config WL12XX_PLATFORM_DATA
bool
- depends on WL1271_SDIO != n
+ depends on WL12XX_SDIO != n
default y
diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
index 3a80744..005a758 100644
--- a/drivers/net/wireless/wl12xx/Makefile
+++ b/drivers/net/wireless/wl12xx/Makefile
@@ -1,12 +1,13 @@
-wl1271-objs = wl1271_main.o wl1271_cmd.o wl1271_io.o \
- wl1271_event.o wl1271_tx.o wl1271_rx.o \
- wl1271_ps.o wl1271_acx.o wl1271_boot.o \
- wl1271_init.o wl1271_debugfs.o wl1271_scan.o
+wl12xx-objs = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
+ boot.o init.o debugfs.o scan.o
-wl1271-$(CONFIG_NL80211_TESTMODE) += wl1271_testmode.o
-obj-$(CONFIG_WL1271) += wl1271.o
-obj-$(CONFIG_WL1271_SPI) += wl1271_spi.o
-obj-$(CONFIG_WL1271_SDIO) += wl1271_sdio.o
+wl12xx_spi-objs = spi.o
+wl12xx_sdio-objs = sdio.o
+
+wl12xx-$(CONFIG_NL80211_TESTMODE) += testmode.o
+obj-$(CONFIG_WL12XX) += wl12xx.o
+obj-$(CONFIG_WL12XX_SPI) += wl12xx_spi.o
+obj-$(CONFIG_WL12XX_SDIO) += wl12xx_sdio.o
# small builtin driver bit
obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/acx.c
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_acx.c
rename to drivers/net/wireless/wl12xx/acx.c
index bd7f95f..bc1085b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.c
+++ b/drivers/net/wireless/wl12xx/acx.c
@@ -21,7 +21,7 @@
*
*/
-#include "wl1271_acx.h"
+#include "acx.h"
#include <linux/module.h>
#include <linux/platform_device.h>
@@ -29,10 +29,10 @@
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include "wl1271.h"
+#include "wl12xx.h"
#include "wl12xx_80211.h"
-#include "wl1271_reg.h"
-#include "wl1271_ps.h"
+#include "reg.h"
+#include "ps.h"
int wl1271_acx_wake_up_conditions(struct wl1271 *wl)
{
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/acx.h
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_acx.h
rename to drivers/net/wireless/wl12xx/acx.h
index b7c4908..f41a9c1 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/acx.h
@@ -22,11 +22,11 @@
*
*/
-#ifndef __WL1271_ACX_H__
-#define __WL1271_ACX_H__
+#ifndef __ACX_H__
+#define __ACX_H__
-#include "wl1271.h"
-#include "wl1271_cmd.h"
+#include "wl12xx.h"
+#include "cmd.h"
/*************************************************************************
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/boot.c
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_boot.c
rename to drivers/net/wireless/wl12xx/boot.c
index 5b19072..1eafb81 100644
--- a/drivers/net/wireless/wl12xx/wl1271_boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -24,11 +24,11 @@
#include <linux/gpio.h>
#include <linux/slab.h>
-#include "wl1271_acx.h"
-#include "wl1271_reg.h"
-#include "wl1271_boot.h"
-#include "wl1271_io.h"
-#include "wl1271_event.h"
+#include "acx.h"
+#include "reg.h"
+#include "boot.h"
+#include "io.h"
+#include "event.h"
static struct wl1271_partition_set part_table[PART_TABLE_LEN] = {
[PART_DOWN] = {
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.h b/drivers/net/wireless/wl12xx/boot.h
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_boot.h
rename to drivers/net/wireless/wl12xx/boot.h
index f73b0b1..c7d7719 100644
--- a/drivers/net/wireless/wl12xx/wl1271_boot.h
+++ b/drivers/net/wireless/wl12xx/boot.h
@@ -24,7 +24,7 @@
#ifndef __BOOT_H__
#define __BOOT_H__
-#include "wl1271.h"
+#include "wl12xx.h"
int wl1271_boot(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/cmd.c
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_cmd.c
rename to drivers/net/wireless/wl12xx/cmd.c
index 5d3e848..f3d0541 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -29,13 +29,13 @@
#include <linux/ieee80211.h>
#include <linux/slab.h>
-#include "wl1271.h"
-#include "wl1271_reg.h"
-#include "wl1271_io.h"
-#include "wl1271_acx.h"
+#include "wl12xx.h"
+#include "reg.h"
+#include "io.h"
+#include "acx.h"
#include "wl12xx_80211.h"
-#include "wl1271_cmd.h"
-#include "wl1271_event.h"
+#include "cmd.h"
+#include "event.h"
#define WL1271_CMD_FAST_POLL_COUNT 50
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.h b/drivers/net/wireless/wl12xx/cmd.h
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_cmd.h
rename to drivers/net/wireless/wl12xx/cmd.h
index a0caf4f..893dbf7 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.h
+++ b/drivers/net/wireless/wl12xx/cmd.h
@@ -22,10 +22,10 @@
*
*/
-#ifndef __WL1271_CMD_H__
-#define __WL1271_CMD_H__
+#ifndef __CMD_H__
+#define __CMD_H__
-#include "wl1271.h"
+#include "wl12xx.h"
struct acx_header;
diff --git a/drivers/net/wireless/wl12xx/wl1271_conf.h b/drivers/net/wireless/wl12xx/conf.h
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_conf.h
rename to drivers/net/wireless/wl12xx/conf.h
index 5f78a6c..a16b361 100644
--- a/drivers/net/wireless/wl12xx/wl1271_conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
@@ -21,8 +21,8 @@
*
*/
-#ifndef __WL1271_CONF_H__
-#define __WL1271_CONF_H__
+#ifndef __CONF_H__
+#define __CONF_H__
enum {
CONF_HW_BIT_RATE_1MBPS = BIT(0),
diff --git a/drivers/net/wireless/wl12xx/wl1271_debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_debugfs.c
rename to drivers/net/wireless/wl12xx/debugfs.c
index 3468b84..dd71b7d 100644
--- a/drivers/net/wireless/wl12xx/wl1271_debugfs.c
+++ b/drivers/net/wireless/wl12xx/debugfs.c
@@ -21,15 +21,15 @@
*
*/
-#include "wl1271_debugfs.h"
+#include "debugfs.h"
#include <linux/skbuff.h>
#include <linux/slab.h>
-#include "wl1271.h"
-#include "wl1271_acx.h"
-#include "wl1271_ps.h"
-#include "wl1271_io.h"
+#include "wl12xx.h"
+#include "acx.h"
+#include "ps.h"
+#include "io.h"
/* ms */
#define WL1271_DEBUGFS_STATS_LIFETIME 1000
diff --git a/drivers/net/wireless/wl12xx/wl1271_debugfs.h b/drivers/net/wireless/wl12xx/debugfs.h
similarity index 93%
rename from drivers/net/wireless/wl12xx/wl1271_debugfs.h
rename to drivers/net/wireless/wl12xx/debugfs.h
index 00a45b2..254c5b2 100644
--- a/drivers/net/wireless/wl12xx/wl1271_debugfs.h
+++ b/drivers/net/wireless/wl12xx/debugfs.h
@@ -21,10 +21,10 @@
*
*/
-#ifndef WL1271_DEBUGFS_H
-#define WL1271_DEBUGFS_H
+#ifndef __DEBUGFS_H__
+#define __DEBUGFS_H__
-#include "wl1271.h"
+#include "wl12xx.h"
int wl1271_debugfs_init(struct wl1271 *wl);
void wl1271_debugfs_exit(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.c b/drivers/net/wireless/wl12xx/event.c
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_event.c
rename to drivers/net/wireless/wl12xx/event.c
index 38ccef7..f9146f5 100644
--- a/drivers/net/wireless/wl12xx/wl1271_event.c
+++ b/drivers/net/wireless/wl12xx/event.c
@@ -21,12 +21,12 @@
*
*/
-#include "wl1271.h"
-#include "wl1271_reg.h"
-#include "wl1271_io.h"
-#include "wl1271_event.h"
-#include "wl1271_ps.h"
-#include "wl1271_scan.h"
+#include "wl12xx.h"
+#include "reg.h"
+#include "io.h"
+#include "event.h"
+#include "ps.h"
+#include "scan.h"
#include "wl12xx_80211.h"
void wl1271_pspoll_work(struct work_struct *work)
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.h b/drivers/net/wireless/wl12xx/event.h
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_event.h
rename to drivers/net/wireless/wl12xx/event.h
index e475166..6cce014 100644
--- a/drivers/net/wireless/wl12xx/wl1271_event.h
+++ b/drivers/net/wireless/wl12xx/event.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __WL1271_EVENT_H__
-#define __WL1271_EVENT_H__
+#ifndef __EVENT_H__
+#define __EVENT_H__
/*
* Mbox events
diff --git a/drivers/net/wireless/wl12xx/wl1271_ini.h b/drivers/net/wireless/wl12xx/ini.h
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_ini.h
rename to drivers/net/wireless/wl12xx/ini.h
index 2313047..c330a25 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ini.h
+++ b/drivers/net/wireless/wl12xx/ini.h
@@ -21,8 +21,8 @@
*
*/
-#ifndef __WL1271_INI_H__
-#define __WL1271_INI_H__
+#ifndef __INI_H__
+#define __INI_H__
#define WL1271_INI_MAX_SMART_REFLEX_PARAM 16
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/init.c
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_init.c
rename to drivers/net/wireless/wl12xx/init.c
index 8044bba..492edc0 100644
--- a/drivers/net/wireless/wl12xx/wl1271_init.c
+++ b/drivers/net/wireless/wl12xx/init.c
@@ -25,11 +25,11 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include "wl1271_init.h"
+#include "init.h"
#include "wl12xx_80211.h"
-#include "wl1271_acx.h"
-#include "wl1271_cmd.h"
-#include "wl1271_reg.h"
+#include "acx.h"
+#include "cmd.h"
+#include "reg.h"
static int wl1271_init_hwenc_config(struct wl1271 *wl)
{
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.h b/drivers/net/wireless/wl12xx/init.h
similarity index 93%
rename from drivers/net/wireless/wl12xx/wl1271_init.h
rename to drivers/net/wireless/wl12xx/init.h
index bc26f8c..7762421 100644
--- a/drivers/net/wireless/wl12xx/wl1271_init.h
+++ b/drivers/net/wireless/wl12xx/init.h
@@ -21,10 +21,10 @@
*
*/
-#ifndef __WL1271_INIT_H__
-#define __WL1271_INIT_H__
+#ifndef __INIT_H__
+#define __INIT_H__
-#include "wl1271.h"
+#include "wl12xx.h"
int wl1271_hw_init_power_auth(struct wl1271 *wl);
int wl1271_init_templates_config(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1271_io.c b/drivers/net/wireless/wl12xx/io.c
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_io.c
rename to drivers/net/wireless/wl12xx/io.c
index c8759ac..35c2f1a 100644
--- a/drivers/net/wireless/wl12xx/wl1271_io.c
+++ b/drivers/net/wireless/wl12xx/io.c
@@ -26,9 +26,9 @@
#include <linux/crc7.h>
#include <linux/spi/spi.h>
-#include "wl1271.h"
+#include "wl12xx.h"
#include "wl12xx_80211.h"
-#include "wl1271_io.h"
+#include "io.h"
#define OCP_CMD_LOOP 32
diff --git a/drivers/net/wireless/wl12xx/wl1271_io.h b/drivers/net/wireless/wl12xx/io.h
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_io.h
rename to drivers/net/wireless/wl12xx/io.h
index c1f92e6..844b32b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_io.h
+++ b/drivers/net/wireless/wl12xx/io.h
@@ -22,10 +22,10 @@
*
*/
-#ifndef __WL1271_IO_H__
-#define __WL1271_IO_H__
+#ifndef __IO_H__
+#define __IO_H__
-#include "wl1271_reg.h"
+#include "reg.h"
#define HW_ACCESS_MEMORY_MAX_RANGE 0x1FFC0
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/main.c
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_main.c
rename to drivers/net/wireless/wl12xx/main.c
index f5b1d19..c005230 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -31,20 +31,20 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
-#include "wl1271.h"
+#include "wl12xx.h"
#include "wl12xx_80211.h"
-#include "wl1271_reg.h"
-#include "wl1271_io.h"
-#include "wl1271_event.h"
-#include "wl1271_tx.h"
-#include "wl1271_rx.h"
-#include "wl1271_ps.h"
-#include "wl1271_init.h"
-#include "wl1271_debugfs.h"
-#include "wl1271_cmd.h"
-#include "wl1271_boot.h"
-#include "wl1271_testmode.h"
-#include "wl1271_scan.h"
+#include "reg.h"
+#include "io.h"
+#include "event.h"
+#include "tx.h"
+#include "rx.h"
+#include "ps.h"
+#include "init.h"
+#include "debugfs.h"
+#include "cmd.h"
+#include "boot.h"
+#include "testmode.h"
+#include "scan.h"
#define WL1271_BOOT_RETRIES 3
@@ -884,7 +884,7 @@ static int wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
set_bit(WL1271_FLAG_STA_RATES_CHANGED, &wl->flags);
}
-#ifdef CONFIG_WL1271_HT
+#ifdef CONFIG_WL12XX_HT
if (sta &&
sta->ht_cap.ht_supported &&
((wl->sta_rate_set >> HW_HT_RATES_OFFSET) !=
@@ -2247,8 +2247,8 @@ static const u8 wl1271_rate_to_idx_2ghz[] = {
/* 11n STA capabilities */
#define HW_RX_HIGHEST_RATE 72
-#ifdef CONFIG_WL1271_HT
-#define WL1271_HT_CAP { \
+#ifdef CONFIG_WL12XX_HT
+#define WL12XX_HT_CAP { \
.cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20, \
.ht_supported = true, \
.ampdu_factor = IEEE80211_HT_MAX_AMPDU_8K, \
@@ -2260,7 +2260,7 @@ static const u8 wl1271_rate_to_idx_2ghz[] = {
}, \
}
#else
-#define WL1271_HT_CAP { \
+#define WL12XX_HT_CAP { \
.ht_supported = false, \
}
#endif
@@ -2271,7 +2271,7 @@ static struct ieee80211_supported_band wl1271_band_2ghz = {
.n_channels = ARRAY_SIZE(wl1271_channels),
.bitrates = wl1271_rates,
.n_bitrates = ARRAY_SIZE(wl1271_rates),
- .ht_cap = WL1271_HT_CAP,
+ .ht_cap = WL12XX_HT_CAP,
};
/* 5 GHz data rates for WL1273 */
@@ -2386,7 +2386,7 @@ static struct ieee80211_supported_band wl1271_band_5ghz = {
.n_channels = ARRAY_SIZE(wl1271_channels_5ghz),
.bitrates = wl1271_rates_5ghz,
.n_bitrates = ARRAY_SIZE(wl1271_rates_5ghz),
- .ht_cap = WL1271_HT_CAP,
+ .ht_cap = WL12XX_HT_CAP,
};
static const u8 *wl1271_band_rate_to_idx[] = {
diff --git a/drivers/net/wireless/wl12xx/wl1271_ps.c b/drivers/net/wireless/wl12xx/ps.c
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_ps.c
rename to drivers/net/wireless/wl12xx/ps.c
index e3c332e..60a3738 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ps.c
+++ b/drivers/net/wireless/wl12xx/ps.c
@@ -21,9 +21,9 @@
*
*/
-#include "wl1271_reg.h"
-#include "wl1271_ps.h"
-#include "wl1271_io.h"
+#include "reg.h"
+#include "ps.h"
+#include "io.h"
#define WL1271_WAKEUP_TIMEOUT 500
diff --git a/drivers/net/wireless/wl12xx/wl1271_ps.h b/drivers/net/wireless/wl12xx/ps.h
similarity index 92%
rename from drivers/net/wireless/wl12xx/wl1271_ps.h
rename to drivers/net/wireless/wl12xx/ps.h
index 6ba7b03..8415060 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ps.h
+++ b/drivers/net/wireless/wl12xx/ps.h
@@ -21,11 +21,11 @@
*
*/
-#ifndef __WL1271_PS_H__
-#define __WL1271_PS_H__
+#ifndef __PS_H__
+#define __PS_H__
-#include "wl1271.h"
-#include "wl1271_acx.h"
+#include "wl12xx.h"
+#include "acx.h"
int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,
u32 rates, bool send);
diff --git a/drivers/net/wireless/wl12xx/wl1271_reg.h b/drivers/net/wireless/wl12xx/reg.h
similarity index 100%
rename from drivers/net/wireless/wl12xx/wl1271_reg.h
rename to drivers/net/wireless/wl12xx/reg.h
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.c b/drivers/net/wireless/wl12xx/rx.c
similarity index 97%
rename from drivers/net/wireless/wl12xx/wl1271_rx.c
rename to drivers/net/wireless/wl12xx/rx.c
index cacfee5..682304c 100644
--- a/drivers/net/wireless/wl12xx/wl1271_rx.c
+++ b/drivers/net/wireless/wl12xx/rx.c
@@ -23,11 +23,11 @@
#include <linux/gfp.h>
-#include "wl1271.h"
-#include "wl1271_acx.h"
-#include "wl1271_reg.h"
-#include "wl1271_rx.h"
-#include "wl1271_io.h"
+#include "wl12xx.h"
+#include "acx.h"
+#include "reg.h"
+#include "rx.h"
+#include "io.h"
static u8 wl1271_rx_get_mem_block(struct wl1271_fw_status *status,
u32 drv_rx_counter)
@@ -61,7 +61,7 @@ static void wl1271_rx_status(struct wl1271 *wl,
status->rate_idx = wl1271_rate_to_idx(desc->rate, desc_band);
-#ifdef CONFIG_WL1271_HT
+#ifdef CONFIG_WL12XX_HT
/* 11n support */
if (desc->rate <= CONF_HW_RXTX_RATE_MCS0)
status->flag |= RX_FLAG_HT;
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.h b/drivers/net/wireless/wl12xx/rx.h
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_rx.h
rename to drivers/net/wireless/wl12xx/rx.h
index 6d41981..3abb26f 100644
--- a/drivers/net/wireless/wl12xx/wl1271_rx.h
+++ b/drivers/net/wireless/wl12xx/rx.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __WL1271_RX_H__
-#define __WL1271_RX_H__
+#ifndef __RX_H__
+#define __RX_H__
#include <linux/bitops.h>
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.c b/drivers/net/wireless/wl12xx/scan.c
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_scan.c
rename to drivers/net/wireless/wl12xx/scan.c
index e0661a5..f3f2c5b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -23,10 +23,10 @@
#include <linux/ieee80211.h>
-#include "wl1271.h"
-#include "wl1271_cmd.h"
-#include "wl1271_scan.h"
-#include "wl1271_acx.h"
+#include "wl12xx.h"
+#include "cmd.h"
+#include "scan.h"
+#include "acx.h"
void wl1271_scan_complete_work(struct work_struct *work)
{
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.h b/drivers/net/wireless/wl12xx/scan.h
similarity index 97%
rename from drivers/net/wireless/wl12xx/wl1271_scan.h
rename to drivers/net/wireless/wl12xx/scan.h
index 6d57127..421a750 100644
--- a/drivers/net/wireless/wl12xx/wl1271_scan.h
+++ b/drivers/net/wireless/wl12xx/scan.h
@@ -21,10 +21,10 @@
*
*/
-#ifndef __WL1271_SCAN_H__
-#define __WL1271_SCAN_H__
+#ifndef __SCAN_H__
+#define __SCAN_H__
-#include "wl1271.h"
+#include "wl12xx.h"
int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
struct cfg80211_scan_request *req);
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/sdio.c
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_sdio.c
rename to drivers/net/wireless/wl12xx/sdio.c
index 784ef34..93cbb8d 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/sdio.c
@@ -32,9 +32,9 @@
#include <linux/wl12xx.h>
#include <linux/pm_runtime.h>
-#include "wl1271.h"
+#include "wl12xx.h"
#include "wl12xx_80211.h"
-#include "wl1271_io.h"
+#include "io.h"
#ifndef SDIO_VENDOR_ID_TI
#define SDIO_VENDOR_ID_TI 0x0097
diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/spi.c
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_spi.c
rename to drivers/net/wireless/wl12xx/spi.c
index ef80168..4671491 100644
--- a/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/drivers/net/wireless/wl12xx/spi.c
@@ -28,11 +28,11 @@
#include <linux/wl12xx.h>
#include <linux/slab.h>
-#include "wl1271.h"
+#include "wl12xx.h"
#include "wl12xx_80211.h"
-#include "wl1271_io.h"
+#include "io.h"
-#include "wl1271_reg.h"
+#include "reg.h"
#define WSPI_CMD_READ 0x40000000
#define WSPI_CMD_WRITE 0x00000000
diff --git a/drivers/net/wireless/wl12xx/wl1271_testmode.c b/drivers/net/wireless/wl12xx/testmode.c
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_testmode.c
rename to drivers/net/wireless/wl12xx/testmode.c
index 55ec442..e64403b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_testmode.c
+++ b/drivers/net/wireless/wl12xx/testmode.c
@@ -20,13 +20,13 @@
* 02110-1301 USA
*
*/
-#include "wl1271_testmode.h"
+#include "testmode.h"
#include <linux/slab.h>
#include <net/genetlink.h>
-#include "wl1271.h"
-#include "wl1271_acx.h"
+#include "wl12xx.h"
+#include "acx.h"
#define WL1271_TM_MAX_DATA_LENGTH 1024
diff --git a/drivers/net/wireless/wl12xx/wl1271_testmode.h b/drivers/net/wireless/wl12xx/testmode.h
similarity index 93%
rename from drivers/net/wireless/wl12xx/wl1271_testmode.h
rename to drivers/net/wireless/wl12xx/testmode.h
index c196d28..8071654 100644
--- a/drivers/net/wireless/wl12xx/wl1271_testmode.h
+++ b/drivers/net/wireless/wl12xx/testmode.h
@@ -21,8 +21,8 @@
*
*/
-#ifndef __WL1271_TESTMODE_H__
-#define __WL1271_TESTMODE_H__
+#ifndef __TESTMODE_H__
+#define __TESTMODE_H__
#include <net/mac80211.h>
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/tx.c
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1271_tx.c
rename to drivers/net/wireless/wl12xx/tx.c
index 279be5b..d332b3f 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -24,11 +24,11 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include "wl1271.h"
-#include "wl1271_io.h"
-#include "wl1271_reg.h"
-#include "wl1271_ps.h"
-#include "wl1271_tx.h"
+#include "wl12xx.h"
+#include "io.h"
+#include "reg.h"
+#include "ps.h"
+#include "tx.h"
static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb)
{
@@ -209,7 +209,7 @@ u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set)
rate_set >>= 1;
}
-#ifdef CONFIG_WL1271_HT
+#ifdef CONFIG_WL12XX_HT
/* MCS rates indication are on bits 16 - 23 */
rate_set >>= HW_HT_RATES_OFFSET - band->n_bitrates;
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.h b/drivers/net/wireless/wl12xx/tx.h
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271_tx.h
rename to drivers/net/wireless/wl12xx/tx.h
index 9dc6f22..903e5dc 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.h
+++ b/drivers/net/wireless/wl12xx/tx.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __WL1271_TX_H__
-#define __WL1271_TX_H__
+#ifndef __TX_H__
+#define __TX_H__
#define TX_HW_BLOCK_SPARE 2
#define TX_HW_BLOCK_SIZE 252
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl12xx.h
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1271.h
rename to drivers/net/wireless/wl12xx/wl12xx.h
index ab53162..3c836e6 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __WL1271_H__
-#define __WL1271_H__
+#ifndef __WL12XX_H__
+#define __WL12XX_H__
#include <linux/mutex.h>
#include <linux/completion.h>
@@ -32,8 +32,8 @@
#include <linux/bitops.h>
#include <net/mac80211.h>
-#include "wl1271_conf.h"
-#include "wl1271_ini.h"
+#include "conf.h"
+#include "ini.h"
#define DRIVER_NAME "wl1271"
#define DRIVER_PREFIX DRIVER_NAME ": "
--
1.7.0.4
On Wed, 2010-11-17 at 23:18 -0600, ext Krakowski, Oz wrote:
> Benzy,
>
>
> > > Doesn't help much. The problem is that the driver which is now called
> > > wl12xx already support wl1271 and wl1273. In the near future, it will
> > > also support wl1281 and wl1283, so the wl6 or wilink6 scheme would
> > > break
> > > already.
> > >
> > > The wl1251 driver, at least at the moment, only supports wl1251, it
> > > doesn't have the 11a implementation. If in the future someone adds
> > > support for wl1253, it could be renamed to wl125x.
> > >
> > > In any case, I think the name of the driver is not that important, as
> > > long as we're clear about which chips each one of them supports in the
> > > Kconfig description.
> > >
> > > Renaming the driver all the time (we already did it twice), ends up
> > > confusing more than clarifying things.
> > >
> > > --
> > > Cheers,
> > > Luca.
> >
> > mmm...
> >
> > In that case, another idea:
> > 1. why not create new driver source code which will designated for 128x.
> > 2. If we have a problem with unified 12xx then lets dived it completely to sub drivers and
> > have only common part as a unified driver. That way you get to keep the old names and
> > just divide the files content to a new file name wl12xx.c.
> >
> > e.g:
> > wl1251.c wl1253.c common part
> > wl1271.c wl1273.c ----------> wl12xx.c
> > wl1281.c wl1283.c
> >
>
> I agree with Luca here. The names have been changed recently and anyway represent both chipsets (127x and 128x) in a way that makes sense. I don't think we should make any changes to that.
> Also re-writing the driver into a new partitioning does not serve any special need IMO. Especially since wilink6 and wilink7 share the same driver essentially.
Yeah, we tried to have a common part for the wl1251 and wl1251 when we
started implementing support for wl1271. But the firmware API was very
different between the two, so we realized it was better to completely
split them into two.
Now, for the wl1281/3, your colleagues at TI are claiming that the
differences are tiny, so wl1281/3 should fit easily in the same driver
and we'll make the differentiation at runtime.
Thanks for your suggestions anyway! Let's keep them in mind in case
things don't go as expected and if we have to split the drivers again
for wl1281/3. But at least for now, I think it's good as it is (famous
last words).
--
Cheers,
Luca.
On Sun, 2010-11-07 at 11:07 +0100, ext Kalle Valo wrote:
> Luciano Coelho <[email protected]> writes:
>
> >> What about wl1251 vs. wl12agn (or wl12bgn if no .11a support), like iwlwifi?
> >
> > Hmmm... wl1251 supports bg. wl12xx supports abgn. I don't really see
> > the logic in this? What difference does it make comparing to calling it
> > wl12xx? From wl12agn the user still doesn't know whether wl1251 is
> > supported or not.
>
> Just to confuse even more: TI wl1253 (the chip) supports 11a and it
> would be easy to add wl1253 (the chip) support to wl1251 (the driver).
> I just haven't seen any linux devices using wl1253 yet.
Oh, I didn't even know that wl1253 even existed. :) But yeah, it
complicates things even more indeed.
--
Cheers,
Luca.
On Thu, Nov 4, 2010 at 5:07 PM, Shahar Levi <[email protected]> wrote:
> All files name prefix removed due to the fact that wl12xx driver supports
> wl1271 and wl1273.
> Also the definition in Kconfig and header files changed respectively.
>
> Signed-off-by: Shahar Levi <[email protected]>
Hmh the name 'wl12xx' kind of implies it covers 1251, while in fact
wl1251 is completely separate driver.. At least the Kconfig help text
should mention it doesn't cover wl1251 and users should use respective
driver for wl1251.
On Thu, Nov 4, 2010 at 6:19 PM, Luciano Coelho <[email protected]> wrote:
> On Thu, 2010-11-04 at 17:37 +0100, ext Grazvydas Ignotas wrote:
>> On Thu, Nov 4, 2010 at 5:07 PM, Shahar Levi <[email protected]> wrote:
>> > All files name prefix removed due to the fact that wl12xx driver supports
>> > wl1271 and wl1273.
>> > Also the definition in Kconfig and header files changed respectively.
>> >
>> > Signed-off-by: Shahar Levi <[email protected]>
>>
>> Hmh the name 'wl12xx' kind of implies it covers 1251, while in fact
>> wl1251 is completely separate driver.. At least the Kconfig help text
>> should mention it doesn't cover wl1251 and users should use respective
>> driver for wl1251.
>
> That's a good point. ?We have discussed this before and this was the
> best solution we found. ?The wl12xx driver includes support for wl1271
> and wl1273, so we considered calling it wl127x, but in the near future,
> we'll have support for wl1281 and wl1283 as well. ?So we have to use
> wl12xx.
>
> At least in my opinion, it is kind of clear that if there is a separate
> driver for wl1251, the user would use that one. ?In any case, A note in
> the Kconfig help text would definitely not hurt.
>
> Shahar, could you please change the text in the Kconfig so that it reads
> something like this?
>
> "This module adds support for wireless adapters based on TI wl1271 and
> TI wl1273 chipsets. ?This module does *not* include support for wl1251.
> For wl1251 support, use the separate homonymous driver instead."
What about wl1251 vs. wl12agn (or wl12bgn if no .11a support), like iwlwifi?
>
>
> --
> Cheers,
> Luca.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>
--
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
QmVuenksDQoNCg0KPiA+IERvZXNuJ3QgaGVscCBtdWNoLiAgVGhlIHByb2JsZW0gaXMgdGhhdCB0
aGUgZHJpdmVyIHdoaWNoIGlzIG5vdyBjYWxsZWQNCj4gPiB3bDEyeHggYWxyZWFkeSBzdXBwb3J0
IHdsMTI3MSBhbmQgd2wxMjczLiAgSW4gdGhlIG5lYXIgZnV0dXJlLCBpdCB3aWxsDQo+ID4gYWxz
byBzdXBwb3J0IHdsMTI4MSBhbmQgd2wxMjgzLCBzbyB0aGUgd2w2IG9yIHdpbGluazYgc2NoZW1l
IHdvdWxkDQo+ID4gYnJlYWsNCj4gPiBhbHJlYWR5Lg0KPiA+DQo+ID4gVGhlIHdsMTI1MSBkcml2
ZXIsIGF0IGxlYXN0IGF0IHRoZSBtb21lbnQsIG9ubHkgc3VwcG9ydHMgd2wxMjUxLCBpdA0KPiA+
IGRvZXNuJ3QgaGF2ZSB0aGUgMTFhIGltcGxlbWVudGF0aW9uLiAgSWYgaW4gdGhlIGZ1dHVyZSBz
b21lb25lIGFkZHMNCj4gPiBzdXBwb3J0IGZvciB3bDEyNTMsIGl0IGNvdWxkIGJlIHJlbmFtZWQg
dG8gd2wxMjV4Lg0KPiA+DQo+ID4gSW4gYW55IGNhc2UsIEkgdGhpbmsgdGhlIG5hbWUgb2YgdGhl
IGRyaXZlciBpcyBub3QgdGhhdCBpbXBvcnRhbnQsIGFzDQo+ID4gbG9uZyBhcyB3ZSdyZSBjbGVh
ciBhYm91dCB3aGljaCBjaGlwcyBlYWNoIG9uZSBvZiB0aGVtIHN1cHBvcnRzIGluIHRoZQ0KPiA+
IEtjb25maWcgZGVzY3JpcHRpb24uDQo+ID4NCj4gPiBSZW5hbWluZyB0aGUgZHJpdmVyIGFsbCB0
aGUgdGltZSAod2UgYWxyZWFkeSBkaWQgaXQgdHdpY2UpLCBlbmRzIHVwDQo+ID4gY29uZnVzaW5n
IG1vcmUgdGhhbiBjbGFyaWZ5aW5nIHRoaW5ncy4NCj4gPg0KPiA+IC0tDQo+ID4gQ2hlZXJzLA0K
PiA+IEx1Y2EuDQo+IA0KPiBtbW0uLi4NCj4gDQo+IEluIHRoYXQgY2FzZSwgYW5vdGhlciBpZGVh
Og0KPiAxLiB3aHkgbm90IGNyZWF0ZSBuZXcgZHJpdmVyIHNvdXJjZSBjb2RlIHdoaWNoIHdpbGwg
ZGVzaWduYXRlZCBmb3IgMTI4eC4NCj4gMi4gSWYgd2UgaGF2ZSBhIHByb2JsZW0gd2l0aCB1bmlm
aWVkIDEyeHggdGhlbiBsZXRzIGRpdmVkIGl0IGNvbXBsZXRlbHkgdG8gc3ViIGRyaXZlcnMgYW5k
DQo+IGhhdmUgb25seSBjb21tb24gcGFydCBhcyBhIHVuaWZpZWQgZHJpdmVyLiBUaGF0IHdheSB5
b3UgZ2V0IHRvIGtlZXAgdGhlIG9sZCBuYW1lcyBhbmQNCj4ganVzdCBkaXZpZGUgdGhlIGZpbGVz
IGNvbnRlbnQgdG8gYSBuZXcgZmlsZSBuYW1lIHdsMTJ4eC5jLg0KPiANCj4gZS5nOg0KPiB3bDEy
NTEuYyB3bDEyNTMuYyAgY29tbW9uIHBhcnQNCj4gd2wxMjcxLmMgd2wxMjczLmMgIC0tLS0tLS0t
LS0+ICB3bDEyeHguYw0KPiB3bDEyODEuYyB3bDEyODMuYw0KPiANCg0KSSBhZ3JlZSB3aXRoIEx1
Y2EgaGVyZS4gVGhlIG5hbWVzIGhhdmUgYmVlbiBjaGFuZ2VkIHJlY2VudGx5IGFuZCBhbnl3YXkg
cmVwcmVzZW50IGJvdGggY2hpcHNldHMgKDEyN3ggYW5kIDEyOHgpIGluIGEgd2F5IHRoYXQgbWFr
ZXMgc2Vuc2UuIEkgZG9uJ3QgdGhpbmsgd2Ugc2hvdWxkIG1ha2UgYW55IGNoYW5nZXMgdG8gdGhh
dC4gDQpBbHNvIHJlLXdyaXRpbmcgdGhlIGRyaXZlciBpbnRvIGEgbmV3IHBhcnRpdGlvbmluZyBk
b2VzIG5vdCBzZXJ2ZSBhbnkgc3BlY2lhbCBuZWVkIElNTy4gRXNwZWNpYWxseSBzaW5jZSB3aWxp
bms2IGFuZCB3aWxpbms3IHNoYXJlIHRoZSBzYW1lIGRyaXZlciBlc3NlbnRpYWxseS4NCg0KDQpS
ZWdhcmRzLA0KT3ouDQoNCg==
On Thu, 2010-11-04 at 22:48 +0100, ext Gábor Stefanik wrote:
> On Thu, Nov 4, 2010 at 6:19 PM, Luciano Coelho <[email protected]> wrote:
> > On Thu, 2010-11-04 at 17:37 +0100, ext Grazvydas Ignotas wrote:
> >> On Thu, Nov 4, 2010 at 5:07 PM, Shahar Levi <[email protected]> wrote:
> >> > All files name prefix removed due to the fact that wl12xx driver supports
> >> > wl1271 and wl1273.
> >> > Also the definition in Kconfig and header files changed respectively.
> >> >
> >> > Signed-off-by: Shahar Levi <[email protected]>
> >>
> >> Hmh the name 'wl12xx' kind of implies it covers 1251, while in fact
> >> wl1251 is completely separate driver.. At least the Kconfig help text
> >> should mention it doesn't cover wl1251 and users should use respective
> >> driver for wl1251.
> >
> > That's a good point. We have discussed this before and this was the
> > best solution we found. The wl12xx driver includes support for wl1271
> > and wl1273, so we considered calling it wl127x, but in the near future,
> > we'll have support for wl1281 and wl1283 as well. So we have to use
> > wl12xx.
> >
> > At least in my opinion, it is kind of clear that if there is a separate
> > driver for wl1251, the user would use that one. In any case, A note in
> > the Kconfig help text would definitely not hurt.
> >
> > Shahar, could you please change the text in the Kconfig so that it reads
> > something like this?
> >
> > "This module adds support for wireless adapters based on TI wl1271 and
> > TI wl1273 chipsets. This module does *not* include support for wl1251.
> > For wl1251 support, use the separate homonymous driver instead."
>
> What about wl1251 vs. wl12agn (or wl12bgn if no .11a support), like iwlwifi?
Hmmm... wl1251 supports bg. wl12xx supports abgn. I don't really see
the logic in this? What difference does it make comparing to calling it
wl12xx? From wl12agn the user still doesn't know whether wl1251 is
supported or not.
--
Cheers,
Luca.
Luciano Coelho <[email protected]> writes:
>> What about wl1251 vs. wl12agn (or wl12bgn if no .11a support), like iwlwifi?
>
> Hmmm... wl1251 supports bg. wl12xx supports abgn. I don't really see
> the logic in this? What difference does it make comparing to calling it
> wl12xx? From wl12agn the user still doesn't know whether wl1251 is
> supported or not.
Just to confuse even more: TI wl1253 (the chip) supports 11a and it
would be easy to add wl1253 (the chip) support to wl1251 (the driver).
I just haven't seen any linux devices using wl1253 yet.
I agree with Luca, name wl12agn would not help.
--
Kalle Valo
SGkgQWxsLA0KDQo+ID4gPj4gPiBBbGwgZmlsZXMgbmFtZSBwcmVmaXggcmVtb3ZlZCBkdWUgdG8g
dGhlIGZhY3QgdGhhdCB3bDEyeHggZHJpdmVyDQo+IHN1cHBvcnRzDQo+ID4gPj4gPiB3bDEyNzEg
YW5kIHdsMTI3My4NCj4gPiA+PiA+IEFsc28gdGhlIGRlZmluaXRpb24gaW4gS2NvbmZpZyBhbmQg
aGVhZGVyIGZpbGVzIGNoYW5nZWQNCj4gcmVzcGVjdGl2ZWx5Lg0KPiA+ID4+ID4NCj4gPiA+PiA+
IFNpZ25lZC1vZmYtYnk6IFNoYWhhciBMZXZpIDxzaGFoYXJfbGV2aUB0aS5jb20+DQo+ID4gPj4N
Cj4gPiA+PiBIbWggdGhlIG5hbWUgJ3dsMTJ4eCcga2luZCBvZiBpbXBsaWVzIGl0IGNvdmVycyAx
MjUxLCB3aGlsZSBpbg0KPiBmYWN0DQo+ID4gPj4gd2wxMjUxIGlzIGNvbXBsZXRlbHkgc2VwYXJh
dGUgZHJpdmVyLi4gQXQgbGVhc3QgdGhlIEtjb25maWcgaGVscA0KPiB0ZXh0DQo+ID4gPj4gc2hv
dWxkIG1lbnRpb24gaXQgZG9lc24ndCBjb3ZlciB3bDEyNTEgYW5kIHVzZXJzIHNob3VsZCB1c2UN
Cj4gcmVzcGVjdGl2ZQ0KPiA+ID4+IGRyaXZlciBmb3Igd2wxMjUxLg0KPiA+ID4NCj4gPiA+IFRo
YXQncyBhIGdvb2QgcG9pbnQuICBXZSBoYXZlIGRpc2N1c3NlZCB0aGlzIGJlZm9yZSBhbmQgdGhp
cyB3YXMNCj4gdGhlDQo+ID4gPiBiZXN0IHNvbHV0aW9uIHdlIGZvdW5kLiAgVGhlIHdsMTJ4eCBk
cml2ZXIgaW5jbHVkZXMgc3VwcG9ydCBmb3INCj4gd2wxMjcxDQo+ID4gPiBhbmQgd2wxMjczLCBz
byB3ZSBjb25zaWRlcmVkIGNhbGxpbmcgaXQgd2wxMjd4LCBidXQgaW4gdGhlIG5lYXINCj4gZnV0
dXJlLA0KPiA+ID4gd2UnbGwgaGF2ZSBzdXBwb3J0IGZvciB3bDEyODEgYW5kIHdsMTI4MyBhcyB3
ZWxsLiAgU28gd2UgaGF2ZSB0bw0KPiB1c2UNCj4gPiA+IHdsMTJ4eC4NCj4gPiA+DQo+ID4gPiBB
dCBsZWFzdCBpbiBteSBvcGluaW9uLCBpdCBpcyBraW5kIG9mIGNsZWFyIHRoYXQgaWYgdGhlcmUg
aXMgYQ0KPiBzZXBhcmF0ZQ0KPiA+ID4gZHJpdmVyIGZvciB3bDEyNTEsIHRoZSB1c2VyIHdvdWxk
IHVzZSB0aGF0IG9uZS4gIEluIGFueSBjYXNlLCBBDQo+IG5vdGUgaW4NCj4gPiA+IHRoZSBLY29u
ZmlnIGhlbHAgdGV4dCB3b3VsZCBkZWZpbml0ZWx5IG5vdCBodXJ0Lg0KPiA+ID4NCj4gPiA+IFNo
YWhhciwgY291bGQgeW91IHBsZWFzZSBjaGFuZ2UgdGhlIHRleHQgaW4gdGhlIEtjb25maWcgc28g
dGhhdCBpdA0KPiByZWFkcw0KPiA+ID4gc29tZXRoaW5nIGxpa2UgdGhpcz8NCj4gPiA+DQo+ID4g
PiAiVGhpcyBtb2R1bGUgYWRkcyBzdXBwb3J0IGZvciB3aXJlbGVzcyBhZGFwdGVycyBiYXNlZCBv
biBUSSB3bDEyNzENCj4gYW5kDQo+ID4gPiBUSSB3bDEyNzMgY2hpcHNldHMuICBUaGlzIG1vZHVs
ZSBkb2VzICpub3QqIGluY2x1ZGUgc3VwcG9ydCBmb3INCj4gd2wxMjUxLg0KPiA+ID4gRm9yIHds
MTI1MSBzdXBwb3J0LCB1c2UgdGhlIHNlcGFyYXRlIGhvbW9ueW1vdXMgZHJpdmVyIGluc3RlYWQu
Ig0KPiA+DQo+ID4gV2hhdCBhYm91dCB3bDEyNTEgdnMuIHdsMTJhZ24gKG9yIHdsMTJiZ24gaWYg
bm8gLjExYSBzdXBwb3J0KSwgbGlrZQ0KPiBpd2x3aWZpPw0KPiANCj4gSG1tbS4uLiB3bDEyNTEg
c3VwcG9ydHMgYmcuICB3bDEyeHggc3VwcG9ydHMgYWJnbi4gIEkgZG9uJ3QgcmVhbGx5IHNlZQ0K
PiB0aGUgbG9naWMgaW4gdGhpcz8gV2hhdCBkaWZmZXJlbmNlIGRvZXMgaXQgbWFrZSBjb21wYXJp
bmcgdG8gY2FsbGluZyBpdA0KPiB3bDEyeHg/IEZyb20gd2wxMmFnbiB0aGUgdXNlciBzdGlsbCBk
b2Vzbid0IGtub3cgd2hldGhlciB3bDEyNTEgaXMNCj4gc3VwcG9ydGVkIG9yIG5vdC4NCj4gDQo+
IC0tDQo+IENoZWVycywNCj4gTHVjYS4NCj4gDQoNCkkgaGF2ZSBhbm90aGVyIGlkZWEgZm9yIG5h
bWluZyBjb252ZW50aW9uIGhlcmUuDQpCdXQgZmlyc3QgdG8gYWxpZ24gZXZlcnlvbmUgb24gdGhl
IFRJIGNoaXAgY29udmVudGlvbnM6DQoxMngxID09IHN1cHBvcnQgZm9yIDIuNEdoeg0KMTJ4MyA9
PSBzdXBwb3J0cyBib3RoIDIuNEdoeiBhbmQgNS4wR2h6Lg0KDQpUaGUgVEkgcHJvamVjdCBuYW1p
bmcgY29udmVudGlvbiBwZXIgY2hpcCBpcyBhcyBmb2xsb3c6DQoNCndpbGluazQgPT0gMTI1MSBh
bmQgMTI1Mw0Kd2lsaW5rNiA9PSAxMjcxIGFuZCAxMjczDQp3aWxpbms3ID09IDEyODEgYW5kIDEy
ODENCg0KU28gSSBwcm9wb3NlIHRvIHVzZSB0aGUgcHJvamVjdCBuYW1lIGluc3RlYWQgb2YgdXNp
bmcgdGhlIGNoaXAgbmFtZS4NCmUuZy46IA0KZm9yIHdsMTI1eCB3ZSBjYW4gdXNlOiB3bDQgb3Ig
d2lsaW5rNC4gSWYgd2Ugd2FudCB0byBpbXBseSB0aGUgYmFuZCBzdXBwb3J0OiB3bDRfYWJnIGFu
ZCB3bDRfYmcNCmZvciB3bDEyN3ggd2UgY2FuIHVzZTogd2w2IG9yIHdpbGluazYuIElmIHdlIHdh
bnQgdG8gaW1wbHkgdGhlIGJhbmQgYW5kIGNhcGFiaWxpdHkgc3VwcG9ydDogd2w2X2FiZ24gYW5k
IHdsNF9iZ24NCg0KZXRjJw0KDQpXaGF0IHNheT8NCg0KQ2hlZXJzLA0KQmVuenkgR2FiYXkNClRl
eGFzIEluc3RydW1lbnRzDQo=
THVjYSwNCg0KPiANCj4gT24gV2VkLCAyMDEwLTExLTE3IGF0IDEyOjA4IC0wNjAwLCBleHQgR2Fi
YXksIEJlbnp5IHdyb3RlOg0KPiA+IEhpIEFsbCwNCj4gDQo+IEhpIEJlbnp5LA0KPiANCj4gDQo+
ID4gPiA+IFdoYXQgYWJvdXQgd2wxMjUxIHZzLiB3bDEyYWduIChvciB3bDEyYmduIGlmIG5vIC4x
MWEgc3VwcG9ydCksDQo+IGxpa2UNCj4gPiA+IGl3bHdpZmk/DQo+ID4gPg0KPiA+ID4gSG1tbS4u
LiB3bDEyNTEgc3VwcG9ydHMgYmcuICB3bDEyeHggc3VwcG9ydHMgYWJnbi4gIEkgZG9uJ3QgcmVh
bGx5DQo+IHNlZQ0KPiA+ID4gdGhlIGxvZ2ljIGluIHRoaXM/IFdoYXQgZGlmZmVyZW5jZSBkb2Vz
IGl0IG1ha2UgY29tcGFyaW5nIHRvDQo+IGNhbGxpbmcgaXQNCj4gPiA+IHdsMTJ4eD8gRnJvbSB3
bDEyYWduIHRoZSB1c2VyIHN0aWxsIGRvZXNuJ3Qga25vdyB3aGV0aGVyIHdsMTI1MSBpcw0KPiA+
ID4gc3VwcG9ydGVkIG9yIG5vdC4NCj4gPg0KPiA+IEkgaGF2ZSBhbm90aGVyIGlkZWEgZm9yIG5h
bWluZyBjb252ZW50aW9uIGhlcmUuDQo+ID4gQnV0IGZpcnN0IHRvIGFsaWduIGV2ZXJ5b25lIG9u
IHRoZSBUSSBjaGlwIGNvbnZlbnRpb25zOg0KPiA+IDEyeDEgPT0gc3VwcG9ydCBmb3IgMi40R2h6
DQo+ID4gMTJ4MyA9PSBzdXBwb3J0cyBib3RoIDIuNEdoeiBhbmQgNS4wR2h6Lg0KPiA+DQo+ID4g
VGhlIFRJIHByb2plY3QgbmFtaW5nIGNvbnZlbnRpb24gcGVyIGNoaXAgaXMgYXMgZm9sbG93Og0K
PiA+DQo+ID4gd2lsaW5rNCA9PSAxMjUxIGFuZCAxMjUzDQo+ID4gd2lsaW5rNiA9PSAxMjcxIGFu
ZCAxMjczDQo+ID4gd2lsaW5rNyA9PSAxMjgxIGFuZCAxMjgxDQo+ID4NCj4gPiBTbyBJIHByb3Bv
c2UgdG8gdXNlIHRoZSBwcm9qZWN0IG5hbWUgaW5zdGVhZCBvZiB1c2luZyB0aGUgY2hpcCBuYW1l
Lg0KPiA+IGUuZy46DQo+ID4gZm9yIHdsMTI1eCB3ZSBjYW4gdXNlOiB3bDQgb3Igd2lsaW5rNC4g
SWYgd2Ugd2FudCB0byBpbXBseSB0aGUgYmFuZA0KPiBzdXBwb3J0OiB3bDRfYWJnIGFuZCB3bDRf
YmcNCj4gPiBmb3Igd2wxMjd4IHdlIGNhbiB1c2U6IHdsNiBvciB3aWxpbms2LiBJZiB3ZSB3YW50
IHRvIGltcGx5IHRoZSBiYW5kDQo+IGFuZCBjYXBhYmlsaXR5IHN1cHBvcnQ6IHdsNl9hYmduIGFu
ZCB3bDRfYmduDQo+ID4NCj4gPiBldGMnDQo+ID4NCj4gPiBXaGF0IHNheT8NCj4gDQo+IERvZXNu
J3QgaGVscCBtdWNoLiAgVGhlIHByb2JsZW0gaXMgdGhhdCB0aGUgZHJpdmVyIHdoaWNoIGlzIG5v
dyBjYWxsZWQNCj4gd2wxMnh4IGFscmVhZHkgc3VwcG9ydCB3bDEyNzEgYW5kIHdsMTI3My4gIElu
IHRoZSBuZWFyIGZ1dHVyZSwgaXQgd2lsbA0KPiBhbHNvIHN1cHBvcnQgd2wxMjgxIGFuZCB3bDEy
ODMsIHNvIHRoZSB3bDYgb3Igd2lsaW5rNiBzY2hlbWUgd291bGQNCj4gYnJlYWsNCj4gYWxyZWFk
eS4NCj4gDQo+IFRoZSB3bDEyNTEgZHJpdmVyLCBhdCBsZWFzdCBhdCB0aGUgbW9tZW50LCBvbmx5
IHN1cHBvcnRzIHdsMTI1MSwgaXQNCj4gZG9lc24ndCBoYXZlIHRoZSAxMWEgaW1wbGVtZW50YXRp
b24uICBJZiBpbiB0aGUgZnV0dXJlIHNvbWVvbmUgYWRkcw0KPiBzdXBwb3J0IGZvciB3bDEyNTMs
IGl0IGNvdWxkIGJlIHJlbmFtZWQgdG8gd2wxMjV4Lg0KPiANCj4gSW4gYW55IGNhc2UsIEkgdGhp
bmsgdGhlIG5hbWUgb2YgdGhlIGRyaXZlciBpcyBub3QgdGhhdCBpbXBvcnRhbnQsIGFzDQo+IGxv
bmcgYXMgd2UncmUgY2xlYXIgYWJvdXQgd2hpY2ggY2hpcHMgZWFjaCBvbmUgb2YgdGhlbSBzdXBw
b3J0cyBpbiB0aGUNCj4gS2NvbmZpZyBkZXNjcmlwdGlvbi4NCj4gDQo+IFJlbmFtaW5nIHRoZSBk
cml2ZXIgYWxsIHRoZSB0aW1lICh3ZSBhbHJlYWR5IGRpZCBpdCB0d2ljZSksIGVuZHMgdXANCj4g
Y29uZnVzaW5nIG1vcmUgdGhhbiBjbGFyaWZ5aW5nIHRoaW5ncy4NCj4gDQo+IC0tDQo+IENoZWVy
cywNCj4gTHVjYS4NCg0KbW1tLi4uDQoNCkluIHRoYXQgY2FzZSwgYW5vdGhlciBpZGVhOg0KMS4g
d2h5IG5vdCBjcmVhdGUgbmV3IGRyaXZlciBzb3VyY2UgY29kZSB3aGljaCB3aWxsIGRlc2lnbmF0
ZWQgZm9yIDEyOHguDQoyLiBJZiB3ZSBoYXZlIGEgcHJvYmxlbSB3aXRoIHVuaWZpZWQgMTJ4eCB0
aGVuIGxldHMgZGl2ZWQgaXQgY29tcGxldGVseSB0byBzdWIgZHJpdmVycyBhbmQgaGF2ZSBvbmx5
IGNvbW1vbiBwYXJ0IGFzIGEgdW5pZmllZCBkcml2ZXIuIFRoYXQgd2F5IHlvdSBnZXQgdG8ga2Vl
cCB0aGUgb2xkIG5hbWVzIGFuZCBqdXN0IGRpdmlkZSB0aGUgZmlsZXMgY29udGVudCB0byBhIG5l
dyBmaWxlIG5hbWUgd2wxMnh4LmMuDQoNCmUuZzoNCndsMTI1MS5jIHdsMTI1My5jICBjb21tb24g
cGFydA0Kd2wxMjcxLmMgd2wxMjczLmMgIC0tLS0tLS0tLS0+ICB3bDEyeHguYyANCndsMTI4MS5j
IHdsMTI4My5jDQoNCg0KQmVueg0KDQo=
On Wed, 2010-11-17 at 12:08 -0600, ext Gabay, Benzy wrote:
> Hi All,
Hi Benzy,
> > > What about wl1251 vs. wl12agn (or wl12bgn if no .11a support), like
> > iwlwifi?
> >
> > Hmmm... wl1251 supports bg. wl12xx supports abgn. I don't really see
> > the logic in this? What difference does it make comparing to calling it
> > wl12xx? From wl12agn the user still doesn't know whether wl1251 is
> > supported or not.
>
> I have another idea for naming convention here.
> But first to align everyone on the TI chip conventions:
> 12x1 == support for 2.4Ghz
> 12x3 == supports both 2.4Ghz and 5.0Ghz.
>
> The TI project naming convention per chip is as follow:
>
> wilink4 == 1251 and 1253
> wilink6 == 1271 and 1273
> wilink7 == 1281 and 1281
>
> So I propose to use the project name instead of using the chip name.
> e.g.:
> for wl125x we can use: wl4 or wilink4. If we want to imply the band support: wl4_abg and wl4_bg
> for wl127x we can use: wl6 or wilink6. If we want to imply the band and capability support: wl6_abgn and wl4_bgn
>
> etc'
>
> What say?
Doesn't help much. The problem is that the driver which is now called
wl12xx already support wl1271 and wl1273. In the near future, it will
also support wl1281 and wl1283, so the wl6 or wilink6 scheme would break
already.
The wl1251 driver, at least at the moment, only supports wl1251, it
doesn't have the 11a implementation. If in the future someone adds
support for wl1253, it could be renamed to wl125x.
In any case, I think the name of the driver is not that important, as
long as we're clear about which chips each one of them supports in the
Kconfig description.
Renaming the driver all the time (we already did it twice), ends up
confusing more than clarifying things.
--
Cheers,
Luca.
On Thu, 2010-11-04 at 17:37 +0100, ext Grazvydas Ignotas wrote:
> On Thu, Nov 4, 2010 at 5:07 PM, Shahar Levi <[email protected]> wrote:
> > All files name prefix removed due to the fact that wl12xx driver supports
> > wl1271 and wl1273.
> > Also the definition in Kconfig and header files changed respectively.
> >
> > Signed-off-by: Shahar Levi <[email protected]>
>
> Hmh the name 'wl12xx' kind of implies it covers 1251, while in fact
> wl1251 is completely separate driver.. At least the Kconfig help text
> should mention it doesn't cover wl1251 and users should use respective
> driver for wl1251.
That's a good point. We have discussed this before and this was the
best solution we found. The wl12xx driver includes support for wl1271
and wl1273, so we considered calling it wl127x, but in the near future,
we'll have support for wl1281 and wl1283 as well. So we have to use
wl12xx.
At least in my opinion, it is kind of clear that if there is a separate
driver for wl1251, the user would use that one. In any case, A note in
the Kconfig help text would definitely not hurt.
Shahar, could you please change the text in the Kconfig so that it reads
something like this?
"This module adds support for wireless adapters based on TI wl1271 and
TI wl1273 chipsets. This module does *not* include support for wl1251.
For wl1251 support, use the separate homonymous driver instead."
--
Cheers,
Luca.