Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "usbnet: modern method to get random MAC"

Browse source 
This reverts commit dd010dbcce.
This commit is contained in:
Ksawlii 2024-11-24 00:23:41 +01:00
parent 2990a48a81
commit 24a09ec9d4
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/usb/usbnet.c
View file

@ -64,6 +64,9 @@
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
// randomly generated ethernet address
static u8 node_id [ETH_ALEN];
/* use ethtool to change the level for any given device */ /* use ethtool to change the level for any given device */
static int msg_level = -1; static int msg_level = -1;
module_param (msg_level, int, 0); module_param (msg_level, int, 0);
@ -1693,6 +1696,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
dev->net = net; dev->net = net;
strscpy(net->name, "usb%d", sizeof(net->name)); strscpy(net->name, "usb%d", sizeof(net->name));
eth_hw_addr_set(net, node_id);
/* rx and tx sides can use different message sizes; /* rx and tx sides can use different message sizes;
* bind() should set rx_urb_size in that case. * bind() should set rx_urb_size in that case.
@ -1767,9 +1771,9 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
goto out4; goto out4;
} }
/* this flags the device for user space */ /* let userspace know we have a random address */
if (!is_valid_ether_addr(net->dev_addr)) if (ether_addr_equal(net->dev_addr, node_id))
eth_hw_addr_random(net); net->addr_assign_type = NET_ADDR_RANDOM;
if ((dev->driver_info->flags & FLAG_WLAN) != 0) if ((dev->driver_info->flags & FLAG_WLAN) != 0)
SET_NETDEV_DEVTYPE(net, &wlan_type); SET_NETDEV_DEVTYPE(net, &wlan_type);
@ -2179,6 +2183,7 @@ static int __init usbnet_init(void)
BUILD_BUG_ON( BUILD_BUG_ON(
sizeof_field(struct sk_buff, cb) < sizeof(struct skb_data)); sizeof_field(struct sk_buff, cb) < sizeof(struct skb_data));
eth_random_addr(node_id);
return 0; return 0;
} }
module_init(usbnet_init); module_init(usbnet_init);