Merge "usb: gadget: rndis: Don't call netif_carrier_on/off for IPA" (40b9695a) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/rndis.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1015,8 +1015,8 @@ void rndis_flow_control(u8 confignr, bool enable_flow_control)
		params = &rndis_per_dev_params[confignr];
		pr_debug("%s(): params->state:%x\n", __func__, params->state);
		if (enable_flow_control) {
		if (is_rndis_ipa_supported() &&
		params->state == RNDIS_DATA_INITIALIZED) {
		if (is_rndis_ipa_supported()) {
		if (params->state == RNDIS_DATA_INITIALIZED)
		u_bam_data_stop_rndis_ipa();
		} else {
		netif_carrier_off(params->dev);
		@@ -1024,8 +1024,8 @@ void rndis_flow_control(u8 confignr, bool enable_flow_control)
		}
		params->state = RNDIS_INITIALIZED;
		} else {
		if (is_rndis_ipa_supported() &&
		params->state != RNDIS_DATA_INITIALIZED) {
		if (is_rndis_ipa_supported()) {
		if (params->state != RNDIS_DATA_INITIALIZED)
		u_bam_data_start_rndis_ipa();
		} else {
		netif_carrier_on(params->dev);