summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-23 21:09:56 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-23 23:17:25 +0200
commit8b7bd1b52ba2808d970e1ce6b714a6917dbfe4c0 (patch)
tree7a8f725066e73d8d37d2009efe6b4b43579caee2 /patches/collateral-evolutions
parent8972091cf673249ec81cb1adf94af3351daca3d0 (diff)
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 <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions')
-rw-r--r--patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch14
1 files changed, 14 insertions, 0 deletions
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 00000000..a82c4782
--- /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);