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

Commit 4b4887e9 authored by Luciano Coelho's avatar Luciano Coelho
Browse files

wlcore/wl12xx: move rx_mem_pool_addr element to wl12xx 



Only wl127x chips use the rx_mem_pool_addr values, which need to be
given to the firmware as part of the RX path.  Move this from core to
the wl12xx driver.

Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
parent 54956294

drivers/net/wireless/ti/wl12xx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len) 
{

	if (wl->chip.id != CHIP_ID_1283_PG20) {

		struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;

		struct wl1271_rx_mem_pool_addr rx_mem_addr;

		struct wl127x_rx_mem_pool_addr rx_mem_addr;



		/*

		 * Choose the block we want to read

drivers/net/wireless/ti/wl12xx/wl12xx.h

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ 


#include "conf.h"



struct wl127x_rx_mem_pool_addr {

	u32 addr;

	u32 addr_extra;

};



struct wl12xx_priv {

	struct wl12xx_priv_conf conf;

drivers/net/wireless/ti/wlcore/wlcore.h

+0 −3
Original line number Diff line number Diff line
@@ -213,9 +213,6 @@ struct wl1271 { 
	/* FW Rx counter */

	u32 rx_counter;



	/* Rx memory pool address */

	struct wl1271_rx_mem_pool_addr rx_mem_pool_addr;



	/* Intermediate buffer, used for packet aggregation */

	u8 *aggr_buf;

drivers/net/wireless/ti/wlcore/wlcore_i.h

+0 −5
Original line number Diff line number Diff line
@@ -194,11 +194,6 @@ struct wl_fw_status { 
	u8 priv[0];

} __packed;



struct wl1271_rx_mem_pool_addr {

	u32 addr;

	u32 addr_extra;

};



#define WL1271_MAX_CHANNELS 64

struct wl1271_scan {

	struct cfg80211_scan_request *req;