aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorWeilong Chen <chenweilong@huawei.com>2013-12-18 02:44:16 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-12-18 04:33:06 -0500
commitf359d3fe832e49eeec2232b2af5a9e3aee6b4862 (patch)
treeb39132ff536ffd8e083c712ede6332eac7cc57fc /net/mac80211/tx.c
parent204e35a91c4b3327b7239d7687fbd4923edbbf08 (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/tx.c')
-rw-r--r--net/mac80211/tx.c4
1 files changed, 2 insertions, 2 deletions
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)