Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bc6772e authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

wl1251: move to it's own directory 



wl1271 driver is under heavy development but on the other hand the older
wl1251 driver is currently considered more as a legacy driver. To make it
easier to develop wl1271 features move wl1251 to it's own directory,
drivers/net/wireless/wl1251.

There are no functional changes, only moving of files. One regression
is that Kconfig won't be updated automatically and user needs to enable
wl1251 manually with an older config file.

Signed-off-by: default avatarKalle Valo <kvalo@adurom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f03ee1ec

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ source "drivers/net/wireless/libertas/Kconfig" 
source "drivers/net/wireless/orinoco/Kconfig"

source "drivers/net/wireless/p54/Kconfig"

source "drivers/net/wireless/rt2x00/Kconfig"

source "drivers/net/wireless/wl1251/Kconfig"

source "drivers/net/wireless/wl12xx/Kconfig"

source "drivers/net/wireless/zd1211rw/Kconfig"

drivers/net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ obj-$(CONFIG_ATH_COMMON) += ath/ 


obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o



obj-$(CONFIG_WL1251)	+= wl1251/

obj-$(CONFIG_WL12XX)	+= wl12xx/

obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/

drivers/net/wireless/wl1251/Kconfig

0 → 100644
+33 −0
Original line number Diff line number Diff line 
menuconfig WL1251

	tristate "TI wl1251 driver support"

	depends on MAC80211 && EXPERIMENTAL && GENERIC_HARDIRQS

	select FW_LOADER

	select CRC7

	---help---

	  This will enable TI wl1251 driver support. The drivers make

	  use of the mac80211 stack.



	  If you choose to build a module, it'll be called wl1251. Say

	  N if unsure.



config WL1251_SPI

	tristate "TI wl1251 SPI support"

	depends on WL1251 && SPI_MASTER

	---help---

	  This module adds support for the SPI interface of adapters using

	  TI wl1251 chipset.  Select this if your platform is using

	  the SPI bus.



	  If you choose to build a module, it'll be called wl1251_spi.

	  Say N if unsure.



config WL1251_SDIO

	tristate "TI wl1251 SDIO support"

	depends on WL1251 && MMC

	---help---

	  This module adds support for the SDIO interface of adapters using

	  TI wl1251 chipset.  Select this if your platform is using

	  the SDIO bus.



	  If you choose to build a module, it'll be called

	  wl1251_sdio. Say N if unsure.

drivers/net/wireless/wl1251/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
wl1251-objs		= main.o event.o tx.o rx.o ps.o cmd.o \

			  acx.o boot.o init.o debugfs.o io.o



obj-$(CONFIG_WL1251)	+= wl1251.o

obj-$(CONFIG_WL1251_SPI)	+= spi.o

obj-$(CONFIG_WL1251_SDIO)	+= sdio.o

drivers/net/wireless/wl12xx/wl1251_acx.c→drivers/net/wireless/wl1251/acx.c

+4 −4
Original line number Diff line number Diff line 
#include "wl1251_acx.h"

#include "acx.h"



#include <linux/module.h>

#include <linux/slab.h>

#include <linux/crc7.h>



#include "wl1251.h"

#include "wl1251_reg.h"

#include "wl1251_cmd.h"

#include "wl1251_ps.h"

#include "reg.h"

#include "cmd.h"

#include "ps.h"



int wl1251_acx_frame_rates(struct wl1251 *wl, u8 ctrl_rate, u8 ctrl_mod,

			   u8 mgt_rate, u8 mgt_mod)