diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-03-07 13:03:58 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-03-07 13:03:58 -0500 |
commit | ddc3d77c80bbaae562a91d4e032b56b2e4570f90 (patch) | |
tree | 938d3988dae78353fed71e1a3970c94412593d10 | |
parent | 96f1fadc94bc8dcde814109439e416143eed50fa (diff) |
ath6kl: logical continuations should be on the previous line
All found by checkpatch:
ath6kl/wmi.c:1036: CHECK: Logical continuations should be on the previous line
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/htc.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/main.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.c | 9 |
4 files changed, 16 insertions, 15 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index e1b0acc5a065..e14d1a072cfe 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
@@ -614,8 +614,8 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, | |||
614 | } | 614 | } |
615 | 615 | ||
616 | if ((!(ar->connect_ctrl_flags & CONNECT_DO_WPA_OFFLOAD)) && | 616 | if ((!(ar->connect_ctrl_flags & CONNECT_DO_WPA_OFFLOAD)) && |
617 | ((vif->auth_mode == WPA_PSK_AUTH) | 617 | ((vif->auth_mode == WPA_PSK_AUTH) || |
618 | || (vif->auth_mode == WPA2_PSK_AUTH))) { | 618 | (vif->auth_mode == WPA2_PSK_AUTH))) { |
619 | mod_timer(&vif->disconnect_timer, | 619 | mod_timer(&vif->disconnect_timer, |
620 | jiffies + msecs_to_jiffies(DISCON_TIMER_INTVAL)); | 620 | jiffies + msecs_to_jiffies(DISCON_TIMER_INTVAL)); |
621 | } | 621 | } |
@@ -1068,9 +1068,9 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, | |||
1068 | return -ENOTSUPP; | 1068 | return -ENOTSUPP; |
1069 | } | 1069 | } |
1070 | 1070 | ||
1071 | if (((vif->auth_mode == WPA_PSK_AUTH) | 1071 | if (((vif->auth_mode == WPA_PSK_AUTH) || |
1072 | || (vif->auth_mode == WPA2_PSK_AUTH)) | 1072 | (vif->auth_mode == WPA2_PSK_AUTH)) && |
1073 | && (key_usage & GROUP_USAGE)) | 1073 | (key_usage & GROUP_USAGE)) |
1074 | del_timer(&vif->disconnect_timer); | 1074 | del_timer(&vif->disconnect_timer); |
1075 | 1075 | ||
1076 | ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, | 1076 | ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, |
diff --git a/drivers/net/wireless/ath/ath6kl/htc.c b/drivers/net/wireless/ath/ath6kl/htc.c index 0204b8314beb..24cfc3bb961e 100644 --- a/drivers/net/wireless/ath/ath6kl/htc.c +++ b/drivers/net/wireless/ath/ath6kl/htc.c | |||
@@ -1672,8 +1672,8 @@ static int htc_parse_trailer(struct htc_target *target, | |||
1672 | } | 1672 | } |
1673 | 1673 | ||
1674 | lk_ahd = (struct htc_lookahead_report *) record_buf; | 1674 | lk_ahd = (struct htc_lookahead_report *) record_buf; |
1675 | if ((lk_ahd->pre_valid == ((~lk_ahd->post_valid) & 0xFF)) | 1675 | if ((lk_ahd->pre_valid == ((~lk_ahd->post_valid) & 0xFF)) && |
1676 | && next_lk_ahds) { | 1676 | next_lk_ahds) { |
1677 | 1677 | ||
1678 | ath6kl_dbg(ATH6KL_DBG_HTC, | 1678 | ath6kl_dbg(ATH6KL_DBG_HTC, |
1679 | "htc rx lk_ahd found pre_valid 0x%x post_valid 0x%x\n", | 1679 | "htc rx lk_ahd found pre_valid 0x%x post_valid 0x%x\n", |
@@ -2449,8 +2449,8 @@ int ath6kl_htc_conn_service(struct htc_target *target, | |||
2449 | 2449 | ||
2450 | resp_msg = (struct htc_conn_service_resp *)rx_pkt->buf; | 2450 | resp_msg = (struct htc_conn_service_resp *)rx_pkt->buf; |
2451 | 2451 | ||
2452 | if ((le16_to_cpu(resp_msg->msg_id) != HTC_MSG_CONN_SVC_RESP_ID) | 2452 | if ((le16_to_cpu(resp_msg->msg_id) != HTC_MSG_CONN_SVC_RESP_ID) || |
2453 | || (rx_pkt->act_len < sizeof(*resp_msg))) { | 2453 | (rx_pkt->act_len < sizeof(*resp_msg))) { |
2454 | status = -ENOMEM; | 2454 | status = -ENOMEM; |
2455 | goto fail_tx; | 2455 | goto fail_tx; |
2456 | } | 2456 | } |
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c index 91dbeb930298..229e1922ebe4 100644 --- a/drivers/net/wireless/ath/ath6kl/main.c +++ b/drivers/net/wireless/ath/ath6kl/main.c | |||
@@ -970,8 +970,8 @@ void ath6kl_disconnect_event(struct ath6kl_vif *vif, u8 reason, u8 *bssid, | |||
970 | set_bit(CONNECT_PEND, &vif->flags); | 970 | set_bit(CONNECT_PEND, &vif->flags); |
971 | if (((reason == ASSOC_FAILED) && | 971 | if (((reason == ASSOC_FAILED) && |
972 | (prot_reason_status == 0x11)) || | 972 | (prot_reason_status == 0x11)) || |
973 | ((reason == ASSOC_FAILED) && (prot_reason_status == 0x0) | 973 | ((reason == ASSOC_FAILED) && (prot_reason_status == 0x0) && |
974 | && (vif->reconnect_flag == 1))) { | 974 | (vif->reconnect_flag == 1))) { |
975 | set_bit(CONNECTED, &vif->flags); | 975 | set_bit(CONNECTED, &vif->flags); |
976 | return; | 976 | return; |
977 | } | 977 | } |
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c index 73ac21e172df..79aa90ba9163 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c | |||
@@ -826,8 +826,8 @@ static int ath6kl_wmi_connect_event_rx(struct wmi *wmi, u8 *datap, int len, | |||
826 | if (pie[1] > 3 && pie[2] == 0x00 && pie[3] == 0x50 && | 826 | if (pie[1] > 3 && pie[2] == 0x00 && pie[3] == 0x50 && |
827 | pie[4] == 0xf2 && pie[5] == WMM_OUI_TYPE) { | 827 | pie[4] == 0xf2 && pie[5] == WMM_OUI_TYPE) { |
828 | /* WMM OUT (00:50:F2) */ | 828 | /* WMM OUT (00:50:F2) */ |
829 | if (pie[1] > 5 | 829 | if (pie[1] > 5 && |
830 | && pie[6] == WMM_PARAM_OUI_SUBTYPE) | 830 | pie[6] == WMM_PARAM_OUI_SUBTYPE) |
831 | wmi->is_wmm_enabled = true; | 831 | wmi->is_wmm_enabled = true; |
832 | } | 832 | } |
833 | break; | 833 | break; |
@@ -1032,8 +1032,9 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len, | |||
1032 | if (len < 8 + 2 + 2) | 1032 | if (len < 8 + 2 + 2) |
1033 | return -EINVAL; | 1033 | return -EINVAL; |
1034 | 1034 | ||
1035 | if (bih->frame_type == BEACON_FTYPE && test_bit(CONNECTED, &vif->flags) | 1035 | if (bih->frame_type == BEACON_FTYPE && |
1036 | && memcmp(bih->bssid, vif->bssid, ETH_ALEN) == 0) { | 1036 | test_bit(CONNECTED, &vif->flags) && |
1037 | memcmp(bih->bssid, vif->bssid, ETH_ALEN) == 0) { | ||
1037 | const u8 *tim; | 1038 | const u8 *tim; |
1038 | tim = cfg80211_find_ie(WLAN_EID_TIM, buf + 8 + 2 + 2, | 1039 | tim = cfg80211_find_ie(WLAN_EID_TIM, buf + 8 + 2 + 2, |
1039 | len - 8 - 2 - 2); | 1040 | len - 8 - 2 - 2); |