summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-10-06 13:42:26 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-10-06 13:42:26 -0700
commitcf8e7e38501c3ffd2818257597f5fbc305c416ef (patch)
treedef121d43546ab96b665c20b53a787dc351c6953
parent8480d22d5b99f18bc396ef9bb46dcfb2b30ca9e8 (diff)
parentc50f1bbbb51a2715542252ea85b1f8bd13f10e01 (diff)
Merge "msm: mhi_rmnet: set ifalias to unidentified_net_dev on error from MHI"
-rw-r--r--drivers/net/ethernet/msm/msm_rmnet_mhi.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ethernet/msm/msm_rmnet_mhi.c b/drivers/net/ethernet/msm/msm_rmnet_mhi.c
index de14dcc6f4ed..a342e39b9f43 100644
--- a/drivers/net/ethernet/msm/msm_rmnet_mhi.c
+++ b/drivers/net/ethernet/msm/msm_rmnet_mhi.c
@@ -958,6 +958,7 @@ static void rmnet_mhi_cb(struct mhi_cb_info *cb_info)
{
struct rmnet_mhi_private *rmnet_mhi_ptr;
struct mhi_result *result;
+ char ifalias[IFALIASZ];
int r = 0;
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
* driver will not touch any critical data.
*/
+ snprintf(ifalias, sizeof(ifalias), "%s", "unidentified_netdev");
write_lock_irq(&rmnet_mhi_ptr->pm_lock);
rmnet_mhi_ptr->mhi_enabled = 0;
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) {
rmnet_log(rmnet_mhi_ptr, MSG_INFO,