Commit ddc3d77c authored by Kalle Valo's avatar Kalle Valo
Browse files

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: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 96f1fadc

drivers/net/wireless/ath/ath6kl/cfg80211.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -614,8 +614,8 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 
	}

	}





	if ((!(ar->connect_ctrl_flags & CONNECT_DO_WPA_OFFLOAD)) &&

	if ((!(ar->connect_ctrl_flags & CONNECT_DO_WPA_OFFLOAD)) &&

	    ((vif->auth_mode == WPA_PSK_AUTH)

	    ((vif->auth_mode == WPA_PSK_AUTH) ||

	     || (vif->auth_mode == WPA2_PSK_AUTH))) {

	     (vif->auth_mode == WPA2_PSK_AUTH))) {

		mod_timer(&vif->disconnect_timer,

		mod_timer(&vif->disconnect_timer,

			  jiffies + msecs_to_jiffies(DISCON_TIMER_INTVAL));

			  jiffies + msecs_to_jiffies(DISCON_TIMER_INTVAL));

	}

	}
@@ -1068,9 +1068,9 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 
		return -ENOTSUPP;

		return -ENOTSUPP;

	}

	}





	if (((vif->auth_mode == WPA_PSK_AUTH)

	if (((vif->auth_mode == WPA_PSK_AUTH) ||

	     || (vif->auth_mode == WPA2_PSK_AUTH))

	     (vif->auth_mode == WPA2_PSK_AUTH)) &&

	    && (key_usage & GROUP_USAGE))

	    (key_usage & GROUP_USAGE))

		del_timer(&vif->disconnect_timer);

		del_timer(&vif->disconnect_timer);





	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,

	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,

drivers/net/wireless/ath/ath6kl/htc.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1672,8 +1672,8 @@ static int htc_parse_trailer(struct htc_target *target, 
		}

		}





		lk_ahd = (struct htc_lookahead_report *) record_buf;

		lk_ahd = (struct htc_lookahead_report *) record_buf;

		if ((lk_ahd->pre_valid == ((~lk_ahd->post_valid) & 0xFF))

		if ((lk_ahd->pre_valid == ((~lk_ahd->post_valid) & 0xFF)) &&

		    && next_lk_ahds) {

		    next_lk_ahds) {





			ath6kl_dbg(ATH6KL_DBG_HTC,

			ath6kl_dbg(ATH6KL_DBG_HTC,

				   "htc rx lk_ahd found pre_valid 0x%x post_valid 0x%x\n",

				   "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, 




		resp_msg = (struct htc_conn_service_resp *)rx_pkt->buf;

		resp_msg = (struct htc_conn_service_resp *)rx_pkt->buf;





		if ((le16_to_cpu(resp_msg->msg_id) != HTC_MSG_CONN_SVC_RESP_ID)

		if ((le16_to_cpu(resp_msg->msg_id) != HTC_MSG_CONN_SVC_RESP_ID) ||

		    || (rx_pkt->act_len < sizeof(*resp_msg))) {

		    (rx_pkt->act_len < sizeof(*resp_msg))) {

			status = -ENOMEM;

			status = -ENOMEM;

			goto fail_tx;

			goto fail_tx;

		}

		}

drivers/net/wireless/ath/ath6kl/main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -970,8 +970,8 @@ void ath6kl_disconnect_event(struct ath6kl_vif *vif, u8 reason, u8 *bssid, 
		set_bit(CONNECT_PEND, &vif->flags);

		set_bit(CONNECT_PEND, &vif->flags);

		if (((reason == ASSOC_FAILED) &&

		if (((reason == ASSOC_FAILED) &&

		     (prot_reason_status == 0x11)) ||

		     (prot_reason_status == 0x11)) ||

		    ((reason == ASSOC_FAILED) && (prot_reason_status == 0x0)

		    ((reason == ASSOC_FAILED) && (prot_reason_status == 0x0) &&

		     && (vif->reconnect_flag == 1))) {

		     (vif->reconnect_flag == 1))) {

			set_bit(CONNECTED, &vif->flags);

			set_bit(CONNECTED, &vif->flags);

			return;

			return;

		}

		}

drivers/net/wireless/ath/ath6kl/wmi.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -826,8 +826,8 @@ static int ath6kl_wmi_connect_event_rx(struct wmi *wmi, u8 *datap, int len, 
			if (pie[1] > 3 && pie[2] == 0x00 && pie[3] == 0x50 &&

			if (pie[1] > 3 && pie[2] == 0x00 && pie[3] == 0x50 &&

			    pie[4] == 0xf2 && pie[5] == WMM_OUI_TYPE) {

			    pie[4] == 0xf2 && pie[5] == WMM_OUI_TYPE) {

				/* WMM OUT (00:50:F2) */

				/* WMM OUT (00:50:F2) */

				if (pie[1] > 5

				if (pie[1] > 5 &&

				    && pie[6] == WMM_PARAM_OUI_SUBTYPE)

				    pie[6] == WMM_PARAM_OUI_SUBTYPE)

					wmi->is_wmm_enabled = true;

					wmi->is_wmm_enabled = true;

			}

			}

			break;

			break;
@@ -1032,8 +1032,9 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len, 
	if (len < 8 + 2 + 2)

	if (len < 8 + 2 + 2)

		return -EINVAL;

		return -EINVAL;





	if (bih->frame_type == BEACON_FTYPE && test_bit(CONNECTED, &vif->flags)

	if (bih->frame_type == BEACON_FTYPE &&

	    && memcmp(bih->bssid, vif->bssid, ETH_ALEN) == 0) {

	    test_bit(CONNECTED, &vif->flags) &&

	    memcmp(bih->bssid, vif->bssid, ETH_ALEN) == 0) {

		const u8 *tim;

		const u8 *tim;

		tim = cfg80211_find_ie(WLAN_EID_TIM, buf + 8 + 2 + 2,

		tim = cfg80211_find_ie(WLAN_EID_TIM, buf + 8 + 2 + 2,

				       len - 8 - 2 - 2);

				       len - 8 - 2 - 2);