aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/11n.h
diff options
context:
space:
mode:
authorYogesh Ashok Powar <yogeshp@marvell.com>2012-03-13 22:22:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-03-14 14:39:32 -0400
commit842668417c13f5fca19d9db29f508500cd621af0 (patch)
tree5d90f2ca575f5f21dc1738b888dbc3f34f9f1be5 /drivers/net/wireless/mwifiex/11n.h
parent3117bbdb7899d43927c8ce4fe885ab7c1231c121 (diff)
mwifiex: fix checkpatch --strict warnings/errors Part 1
For files 11n.c, 11n.h, 11n_aggr.c, 11n_rxreorder.c Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/11n.h')
-rw-r--r--drivers/net/wireless/mwifiex/11n.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h
index 139aa6ee1fbe..77646d777dce 100644
--- a/drivers/net/wireless/mwifiex/11n.h
+++ b/drivers/net/wireless/mwifiex/11n.h
@@ -86,9 +86,8 @@ mwifiex_is_ampdu_allowed(struct mwifiex_private *priv, int tid)
86static inline u8 86static inline u8
87mwifiex_is_amsdu_allowed(struct mwifiex_private *priv, int tid) 87mwifiex_is_amsdu_allowed(struct mwifiex_private *priv, int tid)
88{ 88{
89 return (((priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED) 89 return (((priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED) &&
90 && ((priv->is_data_rate_auto) 90 (priv->is_data_rate_auto || !(priv->bitmap_rates[2] & 0x03)))
91 || !((priv->bitmap_rates[2]) & 0x03)))
92 ? true : false); 91 ? true : false);
93} 92}
94 93
@@ -149,7 +148,7 @@ mwifiex_find_stream_to_delete(struct mwifiex_private *priv, int ptr_tid,
149 */ 148 */
150static inline int 149static inline int
151mwifiex_is_ba_stream_setup(struct mwifiex_private *priv, 150mwifiex_is_ba_stream_setup(struct mwifiex_private *priv,
152 struct mwifiex_ra_list_tbl *ptr, int tid) 151 struct mwifiex_ra_list_tbl *ptr, int tid)
153{ 152{
154 struct mwifiex_tx_ba_stream_tbl *tx_tbl; 153 struct mwifiex_tx_ba_stream_tbl *tx_tbl;
155 154