Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
mac80211: fix checkpatch errors
Browse files Browse the repository at this point in the history 
Fix a number of different checkpatch errors.

Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
@jmberg-intel
Weilong Chen authored and jmberg-intel committed Dec 18, 2013
1 parent 204e35a commit f359d3f
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion net/mac80211/aes_cmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void ieee80211_aes_cmac(struct crypto_cipher *tfm, const u8 *aad,
}


struct crypto_cipher * ieee80211_aes_cmac_key_setup(const u8 key[])
struct crypto_cipher *ieee80211_aes_cmac_key_setup(const u8 key[])
{
struct crypto_cipher *tfm;

Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/aes_cmac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <linux/crypto.h>

struct crypto_cipher * ieee80211_aes_cmac_key_setup(const u8 key[]);
struct crypto_cipher *ieee80211_aes_cmac_key_setup(const u8 key[]);
void ieee80211_aes_cmac(struct crypto_cipher *tfm, const u8 *aad,
const u8 *data, size_t data_len, u8 *mic);
void ieee80211_aes_cmac_key_free(struct crypto_cipher *tfm);
Expand Down
8 changes: 4 additions & 4 deletions net/mac80211/rc80211_minstrel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi)
u32 usecs;
int i;

for (i=0; i < MAX_THR_RATES; i++)
for (i = 0; i < MAX_THR_RATES; i++)
tmp_tp_rate[i] = 0;

for (i = 0; i < mi->n_rates; i++) {
Expand Down Expand Up @@ -190,7 +190,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi)
* choose the maximum throughput rate as max_prob_rate
* (2) if all success probabilities < 95%, the rate with
* highest success probability is choosen as max_prob_rate */
if (mr->probability >= MINSTREL_FRAC(95,100)) {
if (mr->probability >= MINSTREL_FRAC(95, 100)) {
if (mr->cur_tp >= mi->r[tmp_prob_rate].cur_tp)
tmp_prob_rate = i;
} else {
Expand Down Expand Up @@ -220,7 +220,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi)

static void
minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,
struct ieee80211_sta *sta, void *priv_sta,
struct ieee80211_sta *sta, void *priv_sta,
struct sk_buff *skb)
{
struct minstrel_priv *mp = priv;
Expand Down Expand Up @@ -260,7 +260,7 @@ minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,

static inline unsigned int
minstrel_get_retry_count(struct minstrel_rate *mr,
struct ieee80211_tx_info *info)
struct ieee80211_tx_info *info)
{
unsigned int retry = mr->adjusted_retry_count;

Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/rc80211_minstrel_ht.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

#define CCK_DURATION(_bitrate, _short, _len) \
(1000 * (10 /* SIFS */ + \
(_short ? 72 + 24 : 144 + 48 ) + \
(_short ? 72 + 24 : 144 + 48) + \
(8 * (_len + 4) * 10) / (_bitrate)))

#define CCK_ACK_DURATION(_bitrate, _short) \
Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/tkip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ void ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *keyconf,
EXPORT_SYMBOL(ieee80211_get_tkip_p1k_iv);

void ieee80211_get_tkip_rx_p1k(struct ieee80211_key_conf *keyconf,
const u8 *ta, u32 iv32, u16 *p1k)
const u8 *ta, u32 iv32, u16 *p1k)
{
const u8 *tk = &keyconf->key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
struct tkip_ctx ctx;
Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/trace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ TRACE_EVENT(drv_update_tkip_key,

TP_printk(
LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " iv32:%#x",
LOCAL_PR_ARG,VIF_PR_ARG,STA_PR_ARG, __entry->iv32
LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->iv32
)
);

Expand Down
4 changes: 2 additions & 2 deletions net/mac80211/tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2161,7 +2161,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
if (ieee80211_is_data_qos(fc)) {
__le16 *qos_control;

qos_control = (__le16*) skb_push(skb, 2);
qos_control = (__le16 *) skb_push(skb, 2);
memcpy(skb_push(skb, hdrlen - 2), &hdr, hdrlen - 2);
/*
* Maybe we could actually set some fields here, for now just
Expand Down Expand Up @@ -2323,7 +2323,7 @@ static void __ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata,
if (atomic_read(&ps->num_sta_ps) > 0)
/* in the hope that this is faster than
* checking byte-for-byte */
have_bits = !bitmap_empty((unsigned long*)ps->tim,
have_bits = !bitmap_empty((unsigned long *)ps->tim,
IEEE80211_MAX_AID+1);

if (ps->dtim_count == 0)
Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,
}

if (ieee80211_is_ctl(fc)) {
if(ieee80211_is_pspoll(fc))
if (ieee80211_is_pspoll(fc))
return hdr->addr1;

if (ieee80211_is_back_req(fc)) {
Expand Down

0 comments on commit f359d3f

Please sign in to comment.