mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge db9f7f48ee on remote branch
Change-Id: I4b7b2426c17a3f7fc1656ef4f69f553141793cfd
This commit is contained in:
commit
99872368f6
2 changed files with 9 additions and 8 deletions
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
|
@ -1515,13 +1515,13 @@ static void ipa3_q6_clnt_svc_arrive(struct work_struct *work)
|
|||
IPAWANERR(
|
||||
"ipa3_qmi_init_modem_send_sync_msg failed due to SSR!\n");
|
||||
/* Cleanup when ipa3_wwan_remove is called */
|
||||
mutex_lock(&ipa3_qmi_lock);
|
||||
if (ipa_q6_clnt != NULL) {
|
||||
mutex_lock(&ipa3_qmi_lock);
|
||||
qmi_handle_release(ipa_q6_clnt);
|
||||
vfree(ipa_q6_clnt);
|
||||
ipa_q6_clnt = NULL;
|
||||
mutex_unlock(&ipa3_qmi_lock);
|
||||
}
|
||||
mutex_unlock(&ipa3_qmi_lock);
|
||||
IPAWANERR("Exit from service arrive fun\n");
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2144,11 +2144,12 @@ static int ipa3_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
|||
if (mtu_v4_set && mtu_v6_set)
|
||||
iptype = IPA_IP_MAX;
|
||||
|
||||
rc = rmnet_ipa_send_set_mtu_notification(
|
||||
ext_ioctl_data.u.mtu_params.if_name,
|
||||
mux_channel[rmnet_index].mtu_v4,
|
||||
mux_channel[rmnet_index].mtu_v6,
|
||||
iptype);
|
||||
if (mtu_v4_set || mtu_v6_set)
|
||||
rc = rmnet_ipa_send_set_mtu_notification(
|
||||
ext_ioctl_data.u.mtu_params.if_name,
|
||||
mux_channel[rmnet_index].mtu_v4,
|
||||
mux_channel[rmnet_index].mtu_v6,
|
||||
iptype);
|
||||
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
Loading…
Reference in a new issue