Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Weilong Chen and committed by
Johannes Berg
f359d3fe 204e35a9

+12 -12
+1 -1
net/mac80211/aes_cmac.c
··· 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 116 struct crypto_cipher *tfm; 117 117
+1 -1
net/mac80211/aes_cmac.h
··· 11 11 12 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 15 void ieee80211_aes_cmac(struct crypto_cipher *tfm, const u8 *aad, 16 16 const u8 *data, size_t data_len, u8 *mic); 17 17 void ieee80211_aes_cmac_key_free(struct crypto_cipher *tfm);
+4 -4
net/mac80211/rc80211_minstrel.c
··· 135 135 u32 usecs; 136 136 int i; 137 137 138 - for (i=0; i < MAX_THR_RATES; i++) 138 + for (i = 0; i < MAX_THR_RATES; i++) 139 139 tmp_tp_rate[i] = 0; 140 140 141 141 for (i = 0; i < mi->n_rates; i++) { ··· 190 190 * choose the maximum throughput rate as max_prob_rate 191 191 * (2) if all success probabilities < 95%, the rate with 192 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 194 if (mr->cur_tp >= mi->r[tmp_prob_rate].cur_tp) 195 195 tmp_prob_rate = i; 196 196 } else { ··· 220 220 221 221 static void 222 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 224 struct sk_buff *skb) 225 225 { 226 226 struct minstrel_priv *mp = priv; ··· 260 260 261 261 static inline unsigned int 262 262 minstrel_get_retry_count(struct minstrel_rate *mr, 263 - struct ieee80211_tx_info *info) 263 + struct ieee80211_tx_info *info) 264 264 { 265 265 unsigned int retry = mr->adjusted_retry_count; 266 266
+1 -1
net/mac80211/rc80211_minstrel_ht.c
··· 63 63 64 64 #define CCK_DURATION(_bitrate, _short, _len) \ 65 65 (1000 * (10 /* SIFS */ + \ 66 - (_short ? 72 + 24 : 144 + 48 ) + \ 66 + (_short ? 72 + 24 : 144 + 48) + \ 67 67 (8 * (_len + 4) * 10) / (_bitrate))) 68 68 69 69 #define CCK_ACK_DURATION(_bitrate, _short) \
+1 -1
net/mac80211/tkip.c
··· 186 186 EXPORT_SYMBOL(ieee80211_get_tkip_p1k_iv); 187 187 188 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 191 const u8 *tk = &keyconf->key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY]; 192 192 struct tkip_ctx ctx;
+1 -1
net/mac80211/trace.h
··· 553 553 554 554 TP_printk( 555 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
+2 -2
net/mac80211/tx.c
··· 2161 2161 if (ieee80211_is_data_qos(fc)) { 2162 2162 __le16 *qos_control; 2163 2163 2164 - qos_control = (__le16*) skb_push(skb, 2); 2164 + qos_control = (__le16 *) skb_push(skb, 2); 2165 2165 memcpy(skb_push(skb, hdrlen - 2), &hdr, hdrlen - 2); 2166 2166 /* 2167 2167 * Maybe we could actually set some fields here, for now just ··· 2323 2323 if (atomic_read(&ps->num_sta_ps) > 0) 2324 2324 /* in the hope that this is faster than 2325 2325 * checking byte-for-byte */ 2326 - have_bits = !bitmap_empty((unsigned long*)ps->tim, 2326 + have_bits = !bitmap_empty((unsigned long *)ps->tim, 2327 2327 IEEE80211_MAX_AID+1); 2328 2328 2329 2329 if (ps->dtim_count == 0)
+1 -1
net/mac80211/util.c
··· 76 76 } 77 77 78 78 if (ieee80211_is_ctl(fc)) { 79 - if(ieee80211_is_pspoll(fc)) 79 + if (ieee80211_is_pspoll(fc)) 80 80 return hdr->addr1; 81 81 82 82 if (ieee80211_is_back_req(fc)) {