Commit 838e4f44 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: improve uAP RX handling 



1. Separate file for uAP RX handling.
2. If received packet is broadcast/multicast, send it to kernel
   as well as requeue it back to uAP TX queue.
3. If received packet is for associated STA (intra-BSS), requeue
   it back to uAP TX queue.
4. In all other cases (packets for AP or inter-BSS packets),
   pass packet to kernel to handle it accordingly.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarKiran Divekar <dkiran@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 017a92a1

drivers/net/wireless/mwifiex/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ mwifiex-y += sta_event.o 
mwifiex-y += uap_event.o

mwifiex-y += sta_tx.o

mwifiex-y += sta_rx.o

mwifiex-y += uap_txrx.o

mwifiex-y += cfg80211.o

mwifiex-$(CONFIG_DEBUG_FS) += debugfs.o

obj-$(CONFIG_MWIFIEX) += mwifiex.o

drivers/net/wireless/mwifiex/decl.h

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ 
#define MWIFIEX_SDIO_BLOCK_SIZE            256



#define MWIFIEX_BUF_FLAG_REQUEUED_PKT      BIT(0)

#define MWIFIEX_BUF_FLAG_BRIDGED_PKT	   BIT(1)



#define MWIFIEX_BRIDGED_PKTS_THRESHOLD     1024



enum mwifiex_bss_type {

	MWIFIEX_BSS_TYPE_STA = 0,

drivers/net/wireless/mwifiex/fw.h

+25 −0
Original line number Diff line number Diff line
@@ -439,6 +439,31 @@ struct rxpd { 
	u8 reserved;

} __packed;



struct uap_txpd {

	u8 bss_type;

	u8 bss_num;

	__le16 tx_pkt_length;

	__le16 tx_pkt_offset;

	__le16 tx_pkt_type;

	__le32 tx_control;

	u8 priority;

	u8 flags;

	u8 pkt_delay_2ms;

	u8 reserved1;

	__le32 reserved2;

};



struct uap_rxpd {

	u8 bss_type;

	u8 bss_num;

	__le16 rx_pkt_length;

	__le16 rx_pkt_offset;

	__le16 rx_pkt_type;

	__le16 seq_num;

	u8 priority;

	u8 reserved1;

};



enum mwifiex_chan_scan_mode_bitmasks {

	MWIFIEX_PASSIVE_SCAN = BIT(0),

	MWIFIEX_DISABLE_CHAN_FILT = BIT(1),

drivers/net/wireless/mwifiex/main.h

+5 −0
Original line number Diff line number Diff line
@@ -710,6 +710,7 @@ struct mwifiex_adapter { 
	u8 scan_delay_cnt;

	u8 empty_tx_q_cnt;

	atomic_t is_tx_received;

	atomic_t pending_bridged_pkts;

};



int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);
@@ -800,6 +801,10 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *, u16 cmdresp_no, 
				struct host_cmd_ds_command *resp);

int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *,

				  struct sk_buff *skb);

int mwifiex_process_uap_rx_packet(struct mwifiex_adapter *adapter,

				  struct sk_buff *skb);

int mwifiex_handle_uap_rx_forward(struct mwifiex_private *priv,

				  struct sk_buff *skb);

int mwifiex_process_sta_event(struct mwifiex_private *);

int mwifiex_process_uap_event(struct mwifiex_private *);

struct mwifiex_sta_node *

drivers/net/wireless/mwifiex/txrx.c

+5 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter, 
	rx_info->bss_num = priv->bss_num;

	rx_info->bss_type = priv->bss_type;



	if (priv->bss_role == MWIFIEX_BSS_ROLE_UAP)

		return mwifiex_process_uap_rx_packet(adapter, skb);



	return mwifiex_process_sta_rx_packet(adapter, skb);

}

EXPORT_SYMBOL_GPL(mwifiex_handle_rx_packet);
@@ -157,6 +160,8 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter, 
		priv->stats.tx_errors++;

	}



	if (tx_info->flags & MWIFIEX_BUF_FLAG_BRIDGED_PKT)

		atomic_dec_return(&adapter->pending_bridged_pkts);

	if (atomic_dec_return(&adapter->tx_pending) >= LOW_TX_PENDING)

		goto done;