diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-09-14 05:50:17 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-09-18 03:45:32 -0400 |
commit | af762c0b0de586937409346d94d1f09035a5e64f (patch) | |
tree | 238181664cd1b6619f2633628ed36e0089898017 | |
parent | c6e2e60e858efa8dd92d94f5d442068fb12b9967 (diff) |
ath10k: fix missing a blank line after declarations
Fixes checkpatch warnings:
WARNING: Missing a blank line after declarations
Please note that some of the cases I fixed by moving the variable declarations
to the beginning of the function, which is the preferred style in ath10k.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r-- | drivers/net/wireless/ath/ath10k/htt_rx.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/mac.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi.c | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 1e69db52e465..26196ed947bc 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c | |||
@@ -222,6 +222,7 @@ static void ath10k_htt_rx_msdu_buff_replenish(struct ath10k_htt *htt) | |||
222 | static void ath10k_htt_rx_ring_refill_retry(unsigned long arg) | 222 | static void ath10k_htt_rx_ring_refill_retry(unsigned long arg) |
223 | { | 223 | { |
224 | struct ath10k_htt *htt = (struct ath10k_htt *)arg; | 224 | struct ath10k_htt *htt = (struct ath10k_htt *)arg; |
225 | |||
225 | ath10k_htt_rx_msdu_buff_replenish(htt); | 226 | ath10k_htt_rx_msdu_buff_replenish(htt); |
226 | } | 227 | } |
227 | 228 | ||
@@ -313,7 +314,7 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, | |||
313 | { | 314 | { |
314 | struct ath10k *ar = htt->ar; | 315 | struct ath10k *ar = htt->ar; |
315 | int msdu_len, msdu_chaining = 0; | 316 | int msdu_len, msdu_chaining = 0; |
316 | struct sk_buff *msdu; | 317 | struct sk_buff *msdu, *next; |
317 | struct htt_rx_desc *rx_desc; | 318 | struct htt_rx_desc *rx_desc; |
318 | 319 | ||
319 | lockdep_assert_held(&htt->rx_ring.lock); | 320 | lockdep_assert_held(&htt->rx_ring.lock); |
@@ -450,7 +451,7 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, | |||
450 | msdu->next = NULL; | 451 | msdu->next = NULL; |
451 | break; | 452 | break; |
452 | } else { | 453 | } else { |
453 | struct sk_buff *next = ath10k_htt_rx_netbuf_pop(htt); | 454 | next = ath10k_htt_rx_netbuf_pop(htt); |
454 | msdu->next = next; | 455 | msdu->next = next; |
455 | msdu = next; | 456 | msdu = next; |
456 | } | 457 | } |
@@ -479,6 +480,7 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, | |||
479 | static void ath10k_htt_rx_replenish_task(unsigned long ptr) | 480 | static void ath10k_htt_rx_replenish_task(unsigned long ptr) |
480 | { | 481 | { |
481 | struct ath10k_htt *htt = (struct ath10k_htt *)ptr; | 482 | struct ath10k_htt *htt = (struct ath10k_htt *)ptr; |
483 | |||
482 | ath10k_htt_rx_msdu_buff_replenish(htt); | 484 | ath10k_htt_rx_msdu_buff_replenish(htt); |
483 | } | 485 | } |
484 | 486 | ||
@@ -636,8 +638,10 @@ static struct ieee80211_hdr *ath10k_htt_rx_skb_get_hdr(struct sk_buff *skb) | |||
636 | /* This function only applies for first msdu in an msdu chain */ | 638 | /* This function only applies for first msdu in an msdu chain */ |
637 | static bool ath10k_htt_rx_hdr_is_amsdu(struct ieee80211_hdr *hdr) | 639 | static bool ath10k_htt_rx_hdr_is_amsdu(struct ieee80211_hdr *hdr) |
638 | { | 640 | { |
641 | u8 *qc; | ||
642 | |||
639 | if (ieee80211_is_data_qos(hdr->frame_control)) { | 643 | if (ieee80211_is_data_qos(hdr->frame_control)) { |
640 | u8 *qc = ieee80211_get_qos_ctl(hdr); | 644 | qc = ieee80211_get_qos_ctl(hdr); |
641 | if (qc[0] & 0x80) | 645 | if (qc[0] & 0x80) |
642 | return true; | 646 | return true; |
643 | } | 647 | } |
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 75b30adfd367..c1cf6ff319e8 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c | |||
@@ -1157,6 +1157,7 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar, | |||
1157 | { | 1157 | { |
1158 | const struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap; | 1158 | const struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap; |
1159 | int i, n; | 1159 | int i, n; |
1160 | u32 stbc; | ||
1160 | 1161 | ||
1161 | lockdep_assert_held(&ar->conf_mutex); | 1162 | lockdep_assert_held(&ar->conf_mutex); |
1162 | 1163 | ||
@@ -1193,7 +1194,6 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar, | |||
1193 | } | 1194 | } |
1194 | 1195 | ||
1195 | if (ht_cap->cap & IEEE80211_HT_CAP_RX_STBC) { | 1196 | if (ht_cap->cap & IEEE80211_HT_CAP_RX_STBC) { |
1196 | u32 stbc; | ||
1197 | stbc = ht_cap->cap & IEEE80211_HT_CAP_RX_STBC; | 1197 | stbc = ht_cap->cap & IEEE80211_HT_CAP_RX_STBC; |
1198 | stbc = stbc >> IEEE80211_HT_CAP_RX_STBC_SHIFT; | 1198 | stbc = stbc >> IEEE80211_HT_CAP_RX_STBC_SHIFT; |
1199 | stbc = stbc << WMI_RC_RX_STBC_FLAG_S; | 1199 | stbc = stbc << WMI_RC_RX_STBC_FLAG_S; |
@@ -3011,7 +3011,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, | |||
3011 | struct ath10k *ar = hw->priv; | 3011 | struct ath10k *ar = hw->priv; |
3012 | struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); | 3012 | struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); |
3013 | int ret = 0; | 3013 | int ret = 0; |
3014 | u32 vdev_param, pdev_param; | 3014 | u32 vdev_param, pdev_param, slottime, preamble; |
3015 | 3015 | ||
3016 | mutex_lock(&ar->conf_mutex); | 3016 | mutex_lock(&ar->conf_mutex); |
3017 | 3017 | ||
@@ -3132,7 +3132,6 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, | |||
3132 | } | 3132 | } |
3133 | 3133 | ||
3134 | if (changed & BSS_CHANGED_ERP_SLOT) { | 3134 | if (changed & BSS_CHANGED_ERP_SLOT) { |
3135 | u32 slottime; | ||
3136 | if (info->use_short_slot) | 3135 | if (info->use_short_slot) |
3137 | slottime = WMI_VDEV_SLOT_TIME_SHORT; /* 9us */ | 3136 | slottime = WMI_VDEV_SLOT_TIME_SHORT; /* 9us */ |
3138 | 3137 | ||
@@ -3151,7 +3150,6 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, | |||
3151 | } | 3150 | } |
3152 | 3151 | ||
3153 | if (changed & BSS_CHANGED_ERP_PREAMBLE) { | 3152 | if (changed & BSS_CHANGED_ERP_PREAMBLE) { |
3154 | u32 preamble; | ||
3155 | if (info->use_short_preamble) | 3153 | if (info->use_short_preamble) |
3156 | preamble = WMI_VDEV_PREAMBLE_SHORT; | 3154 | preamble = WMI_VDEV_PREAMBLE_SHORT; |
3157 | else | 3155 | else |
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index ed438edb9763..6b9f38b8b827 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c | |||
@@ -612,6 +612,7 @@ static struct wmi_cmd_map wmi_10_2_cmd_map = { | |||
612 | int ath10k_wmi_wait_for_service_ready(struct ath10k *ar) | 612 | int ath10k_wmi_wait_for_service_ready(struct ath10k *ar) |
613 | { | 613 | { |
614 | int ret; | 614 | int ret; |
615 | |||
615 | ret = wait_for_completion_timeout(&ar->wmi.service_ready, | 616 | ret = wait_for_completion_timeout(&ar->wmi.service_ready, |
616 | WMI_SERVICE_READY_TIMEOUT_HZ); | 617 | WMI_SERVICE_READY_TIMEOUT_HZ); |
617 | return ret; | 618 | return ret; |
@@ -620,6 +621,7 @@ int ath10k_wmi_wait_for_service_ready(struct ath10k *ar) | |||
620 | int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar) | 621 | int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar) |
621 | { | 622 | { |
622 | int ret; | 623 | int ret; |
624 | |||
623 | ret = wait_for_completion_timeout(&ar->wmi.unified_ready, | 625 | ret = wait_for_completion_timeout(&ar->wmi.unified_ready, |
624 | WMI_UNIFIED_READY_TIMEOUT_HZ); | 626 | WMI_UNIFIED_READY_TIMEOUT_HZ); |
625 | return ret; | 627 | return ret; |
@@ -1384,6 +1386,8 @@ static void ath10k_wmi_update_tim(struct ath10k *ar, | |||
1384 | struct ieee80211_tim_ie *tim; | 1386 | struct ieee80211_tim_ie *tim; |
1385 | u8 *ies, *ie; | 1387 | u8 *ies, *ie; |
1386 | u8 ie_len, pvm_len; | 1388 | u8 ie_len, pvm_len; |
1389 | __le32 t; | ||
1390 | u32 v; | ||
1387 | 1391 | ||
1388 | /* if next SWBA has no tim_changed the tim_bitmap is garbage. | 1392 | /* if next SWBA has no tim_changed the tim_bitmap is garbage. |
1389 | * we must copy the bitmap upon change and reuse it later */ | 1393 | * we must copy the bitmap upon change and reuse it later */ |
@@ -1394,8 +1398,8 @@ static void ath10k_wmi_update_tim(struct ath10k *ar, | |||
1394 | sizeof(bcn_info->tim_info.tim_bitmap)); | 1398 | sizeof(bcn_info->tim_info.tim_bitmap)); |
1395 | 1399 | ||
1396 | for (i = 0; i < sizeof(arvif->u.ap.tim_bitmap); i++) { | 1400 | for (i = 0; i < sizeof(arvif->u.ap.tim_bitmap); i++) { |
1397 | __le32 t = bcn_info->tim_info.tim_bitmap[i / 4]; | 1401 | t = bcn_info->tim_info.tim_bitmap[i / 4]; |
1398 | u32 v = __le32_to_cpu(t); | 1402 | v = __le32_to_cpu(t); |
1399 | arvif->u.ap.tim_bitmap[i] = (v >> ((i % 4) * 8)) & 0xFF; | 1403 | arvif->u.ap.tim_bitmap[i] = (v >> ((i % 4) * 8)) & 0xFF; |
1400 | } | 1404 | } |
1401 | 1405 | ||