Skip to content

Commit

Permalink
mwifiex: pass priv pointer instead of adapter
Browse files Browse the repository at this point in the history
Pass mwifiex_private pointer directly to wmm_add_buf_txqueue()
instead of passing adapter and then deriving priv again in
mwifiex_get_priv_by_id(). This reduces a 'for' loop in TX path.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Avinash Patil authored and John W. Linville committed Jan 27, 2012
1 parent 10ef6a8 commit 2690e1b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/mwifiex/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
tx_info->bss_type = priv->bss_type;
mwifiex_fill_buffer(skb);

mwifiex_wmm_add_buf_txqueue(priv->adapter, skb);
mwifiex_wmm_add_buf_txqueue(priv, skb);
atomic_inc(&priv->adapter->tx_pending);

if (atomic_read(&priv->adapter->tx_pending) >= MAX_TX_PENDING) {
Expand Down
6 changes: 2 additions & 4 deletions drivers/net/wireless/mwifiex/wmm.c
Original file line number Diff line number Diff line change
Expand Up @@ -599,12 +599,10 @@ mwifiex_is_ralist_valid(struct mwifiex_private *priv,
* is queued at the list tail.
*/
void
mwifiex_wmm_add_buf_txqueue(struct mwifiex_adapter *adapter,
mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
struct sk_buff *skb)
{
struct mwifiex_txinfo *tx_info = MWIFIEX_SKB_TXCB(skb);
struct mwifiex_private *priv = mwifiex_get_priv_by_id(adapter,
tx_info->bss_num, tx_info->bss_type);
struct mwifiex_adapter *adapter = priv->adapter;
u32 tid;
struct mwifiex_ra_list_tbl *ra_list;
u8 ra[ETH_ALEN], tid_down;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/mwifiex/wmm.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ mwifiex_wmm_is_ra_list_empty(struct list_head *ra_list_hhead)
return true;
}

void mwifiex_wmm_add_buf_txqueue(struct mwifiex_adapter *adapter,
struct sk_buff *skb);
void mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
struct sk_buff *skb);
void mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra);

int mwifiex_wmm_lists_empty(struct mwifiex_adapter *adapter);
Expand Down

0 comments on commit 2690e1b

Please sign in to comment.