Merge "drivers: usb: Stop transfers on MSG_HALT" (a80871a9) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/rndis.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -866,11 +866,17 @@ int rndis_msg_parser(u8 configNr, u8 *buf)
		case RNDIS_MSG_HALT:
		pr_debug("%s: RNDIS_MSG_HALT\n",
		__func__);
		params->state = RNDIS_UNINITIALIZED;

		if (!is_rndis_ipa_supported()) {
		if (params->dev) {
		netif_carrier_off(params->dev);
		netif_stop_queue(params->dev);
		}
		} else {
		if (params->state == RNDIS_DATA_INITIALIZED)
		u_bam_data_stop_rndis_ipa();
		}
		params->state = RNDIS_UNINITIALIZED;
		return 0;

		case RNDIS_MSG_QUERY:

+2 −0

Original line number	Diff line number	Diff line
		@@ -1269,6 +1269,8 @@ void u_bam_data_start_rndis_ipa(void)

		if (!is_ipa_rndis_net_on)
		queue_work(bam_data_wq, rndis_conn_w);
		else
		pr_debug("%s: Transfers already started?\n", __func__);
		}

		void u_bam_data_stop_rndis_ipa(void)