Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef2b4fd5 authored by Divya Sharma's avatar Divya Sharma
Browse files

Revert "core: Update IID every time netdevice is brought down" 

This reverts commit f5ad5262.

Change-Id: I22f0b9d24567b032f153e30f02946b9568a4d40b
parent 7ce883f1

core/rmnet_config.c

+1 −3
Original line number Diff line number Diff line
@@ -331,9 +331,7 @@ static int rmnet_config_notify_cb(struct notifier_block *nb, 
		netdev_dbg(dev, "Kernel unregister\n");

		rmnet_force_unassociate_device(dev);

		break;

	case NETDEV_DOWN:

		rmnet_vnd_reset_mac_addr(dev);

		break;



	default:

		break;

	}

core/rmnet_vnd.c

+1 −9
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ void rmnet_vnd_setup(struct net_device *rmnet_dev) 
	rmnet_dev->netdev_ops = &rmnet_vnd_ops;

	rmnet_dev->mtu = RMNET_DFLT_PACKET_SIZE;

	rmnet_dev->needed_headroom = RMNET_NEEDED_HEADROOM;

	random_ether_addr(rmnet_dev->perm_addr);

	random_ether_addr(rmnet_dev->dev_addr);

	rmnet_dev->tx_queue_len = RMNET_TX_QUEUE_LEN;



	/* Raw IP mode */
@@ -444,11 +444,3 @@ int rmnet_vnd_do_flow_control(struct net_device *rmnet_dev, int enable) 


	return 0;

}
 


void rmnet_vnd_reset_mac_addr(struct net_device *dev)

{

	if (dev->netdev_ops != &rmnet_vnd_ops)

		return;



	random_ether_addr(dev->perm_addr);

}

core/rmnet_vnd.h

+1 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2018, 2020 The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -27,5 +27,4 @@ void rmnet_vnd_rx_fixup(struct net_device *dev, u32 skb_len); 
void rmnet_vnd_tx_fixup(struct net_device *dev, u32 skb_len);

u8 rmnet_vnd_get_mux(struct net_device *rmnet_dev);

void rmnet_vnd_setup(struct net_device *dev);

void rmnet_vnd_reset_mac_addr(struct net_device *dev);

#endif /* _RMNET_VND_H_ */