Commit b33f0e28 authored by Henry Ptasinski's avatar Henry Ptasinski Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: move utility functions into new module 



Move utility functions shared by the brcmsmac and brcmfmac drivers into a new
module, brcmutil.ko.  This eliminates the need to compile and link the shared
functions into both drivers.  Prefix all exported symbols with "bcm_".

Cc: devel@linuxdriverproject.org
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4e458c1d

drivers/staging/brcm80211/Kconfig

+6 −0
Original line number Diff line number Diff line 
config BRCMUTIL

	tristate

	default n



config BRCMSMAC

	tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"

	default n

	depends on PCI

	depends on WLAN && MAC80211

	select BRCMUTIL

	select FW_LOADER

	select CRC_CCITT

	---help---
@@ -15,6 +20,7 @@ config BRCMFMAC 
	default n

	depends on MMC

	depends on WLAN && CFG80211

	select BRCMUTIL

	select FW_LOADER

	select WIRELESS_EXT

	select WEXT_PRIV

drivers/staging/brcm80211/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ 
subdir-ccflags-y					:= -DBCMDMA32

subdir-ccflags-$(CONFIG_BRCMDBG)	+= -DBCMDBG -DBCMDBG_ASSERT



obj-$(CONFIG_BRCMUTIL)	+= util/

obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/

obj-$(CONFIG_BRCMSMAC)	+= brcmsmac/

drivers/staging/brcm80211/brcmfmac/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -50,9 +50,7 @@ DHDOFILES = \ 
	bcmsdh.o \

	bcmsdh_linux.o	\

	bcmsdh_sdmmc.o \

	bcmsdh_sdmmc_linux.o \

	bcmutils.o \

	bcmwifi.o

	bcmsdh_sdmmc_linux.o



obj-m += brcmfmac.o

brcmfmac-objs += $(DHDOFILES)

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+6 −6
Original line number Diff line number Diff line
@@ -1042,9 +1042,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, 
	if (pkt == NULL) {

		sd_data(("%s: Creating new %s Packet, len=%d\n",

			 __func__, write ? "TX" : "RX", buflen_u));

		mypkt = pkt_buf_get_skb(buflen_u);

		mypkt = bcm_pkt_buf_get_skb(buflen_u);

		if (!mypkt) {

			sd_err(("%s: pkt_buf_get_skb failed: len %d\n",

			sd_err(("%s: bcm_pkt_buf_get_skb failed: len %d\n",

				__func__, buflen_u));

			return SDIOH_API_RC_FAIL;

		}
@@ -1060,7 +1060,7 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, 
		if (!write)

			memcpy(buffer, mypkt->data, buflen_u);



		pkt_buf_free_skb(mypkt);

		bcm_pkt_buf_free_skb(mypkt);

	} else if (((u32) (pkt->data) & DMA_ALIGN_MASK) != 0) {

		/* Case 2: We have a packet, but it is unaligned. */
@@ -1069,9 +1069,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, 


		sd_data(("%s: Creating aligned %s Packet, len=%d\n",

			 __func__, write ? "TX" : "RX", pkt->len));

		mypkt = pkt_buf_get_skb(pkt->len);

		mypkt = bcm_pkt_buf_get_skb(pkt->len);

		if (!mypkt) {

			sd_err(("%s: pkt_buf_get_skb failed: len %d\n",

			sd_err(("%s: bcm_pkt_buf_get_skb failed: len %d\n",

				__func__, pkt->len));

			return SDIOH_API_RC_FAIL;

		}
@@ -1087,7 +1087,7 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, 
		if (!write)

			memcpy(pkt->data, mypkt->data, mypkt->len);



		pkt_buf_free_skb(mypkt);

		bcm_pkt_buf_free_skb(mypkt);

	} else {		/* case 3: We have a packet and

				 it is aligned. */

		sd_data(("%s: Aligned %s Packet, direct DMA\n",

drivers/staging/brcm80211/brcmfmac/bcmutils.c

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include "../util/bcmutils.c"