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

Commit bae431c1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm_rmnet_bam: set name_assign_type in alloc_netdev"

parents 6e6db613 e992c3b4

drivers/net/ethernet/msm/msm_rmnet_bam.c

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ static int bam_rmnet_probe(struct platform_device *pdev) 
	else

		dev_name = "rev_rmnet%d";



	dev = alloc_netdev(sizeof(*p), dev_name, rmnet_setup);

	dev = alloc_netdev(sizeof(*p), dev_name, NET_NAME_ENUM, rmnet_setup);

	if (!dev) {

		pr_err("%s: no memory for netdev %d\n", __func__, i);

		return -ENOMEM;

include/uapi/linux/msm_rmnet.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ enum rmnet_ioctl_extended_cmds_e { 
	RMNET_IOCTL_GET_SUPPORTED_QOS_MODES    = 0x0013,   /* Get QoS modes   */

	RMNET_IOCTL_SET_SLEEP_STATE            = 0x0014,   /* Set sleep state */

	RMNET_IOCTL_SET_XLAT_DEV_INFO          = 0x0015,   /* xlat dev name   */

	RMNET_IOCTL_EXTENDED_MAX               = 0x0016

	RMNET_IOCTL_DEREGISTER_DEV             = 0x0016,   /* Dereg a net dev */

	RMNET_IOCTL_EXTENDED_MAX               = 0x0017

};



/* Return values for the RMNET_IOCTL_GET_SUPPORTED_FEATURES IOCTL */