evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mhi_rmnet: set ifalias to unidentified_net_dev on error from MHI"

Browse source
This commit is contained in:
Linux Build Service Account 2017-10-06 13:42:26 -07:00 • committed by Gerrit - the friendly Code Review server
commit cf8e7e3850
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/ethernet/msm/msm_rmnet_mhi.c
View file

@ -958,6 +958,7 @@ static void rmnet_mhi_cb(struct mhi_cb_info *cb_info)
{ {
struct rmnet_mhi_private *rmnet_mhi_ptr; struct rmnet_mhi_private *rmnet_mhi_ptr;
struct mhi_result *result; struct mhi_result *result;
char ifalias[IFALIASZ];
int r = 0; int r = 0;
if (!cb_info || !cb_info->result) { if (!cb_info || !cb_info->result) {
@ -979,9 +980,16 @@ static void rmnet_mhi_cb(struct mhi_cb_info *cb_info)
* as we set mhi_enabled = 0, we gurantee rest of * as we set mhi_enabled = 0, we gurantee rest of
* driver will not touch any critical data. * driver will not touch any critical data.
*/ */
snprintf(ifalias, sizeof(ifalias), "%s", "unidentified_netdev");
write_lock_irq(&rmnet_mhi_ptr->pm_lock); write_lock_irq(&rmnet_mhi_ptr->pm_lock);
rmnet_mhi_ptr->mhi_enabled = 0; rmnet_mhi_ptr->mhi_enabled = 0;
write_unlock_irq(&rmnet_mhi_ptr->pm_lock); write_unlock_irq(&rmnet_mhi_ptr->pm_lock);
/* Set unidentified_net_dev string to ifalias
* on error notification
*/
rtnl_lock();
dev_set_alias(rmnet_mhi_ptr->dev, ifalias, strlen(ifalias));
rtnl_unlock();
if (cb_info->chan == rmnet_mhi_ptr->rx_channel) { if (cb_info->chan == rmnet_mhi_ptr->rx_channel) {
rmnet_log(rmnet_mhi_ptr, MSG_INFO, rmnet_log(rmnet_mhi_ptr, MSG_INFO,