diff options
author | Weilong Chen <chenweilong@huawei.com> | 2013-12-18 02:44:16 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-18 04:33:06 -0500 |
commit | f359d3fe832e49eeec2232b2af5a9e3aee6b4862 (patch) | |
tree | b39132ff536ffd8e083c712ede6332eac7cc57fc /net/mac80211 | |
parent | 204e35a91c4b3327b7239d7687fbd4923edbbf08 (diff) |
mac80211: fix checkpatch errors
Fix a number of different checkpatch errors.
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/aes_cmac.c | 2 | ||||
-rw-r--r-- | net/mac80211/aes_cmac.h | 2 | ||||
-rw-r--r-- | net/mac80211/rc80211_minstrel.c | 8 | ||||
-rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 2 | ||||
-rw-r--r-- | net/mac80211/tkip.c | 2 | ||||
-rw-r--r-- | net/mac80211/trace.h | 2 | ||||
-rw-r--r-- | net/mac80211/tx.c | 4 | ||||
-rw-r--r-- | net/mac80211/util.c | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/net/mac80211/aes_cmac.c b/net/mac80211/aes_cmac.c index 537488cbf941..9b9009f99551 100644 --- a/net/mac80211/aes_cmac.c +++ b/net/mac80211/aes_cmac.c | |||
@@ -111,7 +111,7 @@ void ieee80211_aes_cmac(struct crypto_cipher *tfm, const u8 *aad, | |||
111 | } | 111 | } |
112 | 112 | ||
113 | 113 | ||
114 | struct crypto_cipher * ieee80211_aes_cmac_key_setup(const u8 key[]) | 114 | struct crypto_cipher *ieee80211_aes_cmac_key_setup(const u8 key[]) |
115 | { | 115 | { |
116 | struct crypto_cipher *tfm; | 116 | struct crypto_cipher *tfm; |
117 | 117 | ||
diff --git a/net/mac80211/aes_cmac.h b/net/mac80211/aes_cmac.h index 20785a647254..0ce6487af795 100644 --- a/net/mac80211/aes_cmac.h +++ b/net/mac80211/aes_cmac.h | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | #include <linux/crypto.h> | 12 | #include <linux/crypto.h> |
13 | 13 | ||
14 | struct crypto_cipher * ieee80211_aes_cmac_key_setup(const u8 key[]); | 14 | struct crypto_cipher *ieee80211_aes_cmac_key_setup(const u8 key[]); |
15 | void ieee80211_aes_cmac(struct crypto_cipher *tfm, const u8 *aad, | 15 | void ieee80211_aes_cmac(struct crypto_cipher *tfm, const u8 *aad, |
16 | const u8 *data, size_t data_len, u8 *mic); | 16 | const u8 *data, size_t data_len, u8 *mic); |
17 | void ieee80211_aes_cmac_key_free(struct crypto_cipher *tfm); | 17 | void ieee80211_aes_cmac_key_free(struct crypto_cipher *tfm); |
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c index d2f19f7e7091..f3d88b0c054c 100644 --- a/net/mac80211/rc80211_minstrel.c +++ b/net/mac80211/rc80211_minstrel.c | |||
@@ -135,7 +135,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi) | |||
135 | u32 usecs; | 135 | u32 usecs; |
136 | int i; | 136 | int i; |
137 | 137 | ||
138 | for (i=0; i < MAX_THR_RATES; i++) | 138 | for (i = 0; i < MAX_THR_RATES; i++) |
139 | tmp_tp_rate[i] = 0; | 139 | tmp_tp_rate[i] = 0; |
140 | 140 | ||
141 | for (i = 0; i < mi->n_rates; i++) { | 141 | for (i = 0; i < mi->n_rates; i++) { |
@@ -190,7 +190,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi) | |||
190 | * choose the maximum throughput rate as max_prob_rate | 190 | * choose the maximum throughput rate as max_prob_rate |
191 | * (2) if all success probabilities < 95%, the rate with | 191 | * (2) if all success probabilities < 95%, the rate with |
192 | * highest success probability is choosen as max_prob_rate */ | 192 | * highest success probability is choosen as max_prob_rate */ |
193 | if (mr->probability >= MINSTREL_FRAC(95,100)) { | 193 | if (mr->probability >= MINSTREL_FRAC(95, 100)) { |
194 | if (mr->cur_tp >= mi->r[tmp_prob_rate].cur_tp) | 194 | if (mr->cur_tp >= mi->r[tmp_prob_rate].cur_tp) |
195 | tmp_prob_rate = i; | 195 | tmp_prob_rate = i; |
196 | } else { | 196 | } else { |
@@ -220,7 +220,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi) | |||
220 | 220 | ||
221 | static void | 221 | static void |
222 | minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband, | 222 | minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband, |
223 | struct ieee80211_sta *sta, void *priv_sta, | 223 | struct ieee80211_sta *sta, void *priv_sta, |
224 | struct sk_buff *skb) | 224 | struct sk_buff *skb) |
225 | { | 225 | { |
226 | struct minstrel_priv *mp = priv; | 226 | struct minstrel_priv *mp = priv; |
@@ -260,7 +260,7 @@ minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband, | |||
260 | 260 | ||
261 | static inline unsigned int | 261 | static inline unsigned int |
262 | minstrel_get_retry_count(struct minstrel_rate *mr, | 262 | minstrel_get_retry_count(struct minstrel_rate *mr, |
263 | struct ieee80211_tx_info *info) | 263 | struct ieee80211_tx_info *info) |
264 | { | 264 | { |
265 | unsigned int retry = mr->adjusted_retry_count; | 265 | unsigned int retry = mr->adjusted_retry_count; |
266 | 266 | ||
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index d2ed18d82fe1..c1b5b73c5b91 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c | |||
@@ -63,7 +63,7 @@ | |||
63 | 63 | ||
64 | #define CCK_DURATION(_bitrate, _short, _len) \ | 64 | #define CCK_DURATION(_bitrate, _short, _len) \ |
65 | (1000 * (10 /* SIFS */ + \ | 65 | (1000 * (10 /* SIFS */ + \ |
66 | (_short ? 72 + 24 : 144 + 48 ) + \ | 66 | (_short ? 72 + 24 : 144 + 48) + \ |
67 | (8 * (_len + 4) * 10) / (_bitrate))) | 67 | (8 * (_len + 4) * 10) / (_bitrate))) |
68 | 68 | ||
69 | #define CCK_ACK_DURATION(_bitrate, _short) \ | 69 | #define CCK_ACK_DURATION(_bitrate, _short) \ |
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c index 124b1fdc20d0..0ae207771a58 100644 --- a/net/mac80211/tkip.c +++ b/net/mac80211/tkip.c | |||
@@ -186,7 +186,7 @@ void ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *keyconf, | |||
186 | EXPORT_SYMBOL(ieee80211_get_tkip_p1k_iv); | 186 | EXPORT_SYMBOL(ieee80211_get_tkip_p1k_iv); |
187 | 187 | ||
188 | void ieee80211_get_tkip_rx_p1k(struct ieee80211_key_conf *keyconf, | 188 | void ieee80211_get_tkip_rx_p1k(struct ieee80211_key_conf *keyconf, |
189 | const u8 *ta, u32 iv32, u16 *p1k) | 189 | const u8 *ta, u32 iv32, u16 *p1k) |
190 | { | 190 | { |
191 | const u8 *tk = &keyconf->key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY]; | 191 | const u8 *tk = &keyconf->key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY]; |
192 | struct tkip_ctx ctx; | 192 | struct tkip_ctx ctx; |
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index 3a669d7ec7ad..da9366632f37 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h | |||
@@ -553,7 +553,7 @@ TRACE_EVENT(drv_update_tkip_key, | |||
553 | 553 | ||
554 | TP_printk( | 554 | TP_printk( |
555 | LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " iv32:%#x", | 555 | LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " iv32:%#x", |
556 | LOCAL_PR_ARG,VIF_PR_ARG,STA_PR_ARG, __entry->iv32 | 556 | LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->iv32 |
557 | ) | 557 | ) |
558 | ); | 558 | ); |
559 | 559 | ||
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 2f0e176e7989..377cf974d97d 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -2161,7 +2161,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
2161 | if (ieee80211_is_data_qos(fc)) { | 2161 | if (ieee80211_is_data_qos(fc)) { |
2162 | __le16 *qos_control; | 2162 | __le16 *qos_control; |
2163 | 2163 | ||
2164 | qos_control = (__le16*) skb_push(skb, 2); | 2164 | qos_control = (__le16 *) skb_push(skb, 2); |
2165 | memcpy(skb_push(skb, hdrlen - 2), &hdr, hdrlen - 2); | 2165 | memcpy(skb_push(skb, hdrlen - 2), &hdr, hdrlen - 2); |
2166 | /* | 2166 | /* |
2167 | * Maybe we could actually set some fields here, for now just | 2167 | * Maybe we could actually set some fields here, for now just |
@@ -2323,7 +2323,7 @@ static void __ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata, | |||
2323 | if (atomic_read(&ps->num_sta_ps) > 0) | 2323 | if (atomic_read(&ps->num_sta_ps) > 0) |
2324 | /* in the hope that this is faster than | 2324 | /* in the hope that this is faster than |
2325 | * checking byte-for-byte */ | 2325 | * checking byte-for-byte */ |
2326 | have_bits = !bitmap_empty((unsigned long*)ps->tim, | 2326 | have_bits = !bitmap_empty((unsigned long *)ps->tim, |
2327 | IEEE80211_MAX_AID+1); | 2327 | IEEE80211_MAX_AID+1); |
2328 | 2328 | ||
2329 | if (ps->dtim_count == 0) | 2329 | if (ps->dtim_count == 0) |
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 591b46b72462..656648b9b9d3 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -76,7 +76,7 @@ u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len, | |||
76 | } | 76 | } |
77 | 77 | ||
78 | if (ieee80211_is_ctl(fc)) { | 78 | if (ieee80211_is_ctl(fc)) { |
79 | if(ieee80211_is_pspoll(fc)) | 79 | if (ieee80211_is_pspoll(fc)) |
80 | return hdr->addr1; | 80 | return hdr->addr1; |
81 | 81 | ||
82 | if (ieee80211_is_back_req(fc)) { | 82 | if (ieee80211_is_back_req(fc)) { |