From: Hauke Mehrtens Date: Wed, 23 Oct 2013 19:09:56 +0000 (+0200) Subject: backports: remove addr_assign_type from usbnet X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8b7bd1b52ba2808d970e1ce6b714a6917dbfe4c0;p=openwrt%2Fstaging%2Fblogic.git backports: remove addr_assign_type from usbnet addr_assign_type was added with kernel 2.6.36. This is just used to inform userspace, so removing it is no problem. Signed-off-by: Hauke Mehrtens --- diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch new file mode 100644 index 000000000000..a82c4782875f --- /dev/null +++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch @@ -0,0 +1,14 @@ +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -1669,9 +1669,11 @@ usbnet_probe (struct usb_interface *udev + dev->rx_urb_size = dev->hard_mtu; + dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) + /* let userspace know we have a random address */ + if (ether_addr_equal(net->dev_addr, node_id)) + net->addr_assign_type = NET_ADDR_RANDOM; ++#endif + + if ((dev->driver_info->flags & FLAG_WLAN) != 0) + SET_NETDEV_DEVTYPE(net, &wlan_type);