summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-01-01 21:36:31 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2014-01-18 13:43:54 +0100
commit51f54bc87c1a570d55049572c6f35f6e3f099a35 (patch)
treefa4071260b2a0fd5494edef3c05f7378853966ad /patches/collateral-evolutions/network
parent7756d06dae317dfdfddf4ca322893d9ed36651b3 (diff)
backports: remove usage of addr_assign_type in 6lowpan.c
The bluetooth 6lowpan code now accesses the addr_assign_type member of struct netdev, which is not available in older kernel versions. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network')
-rw-r--r--patches/collateral-evolutions/network/61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch
new file mode 100644
index 00000000..ad2618fb
--- /dev/null
+++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch
@@ -0,0 +1,12 @@
+--- a/net/bluetooth/6lowpan.c
++++ b/net/bluetooth/6lowpan.c
+@@ -632,7 +632,9 @@ static void set_addr(u8 *eui, u8 *addr,
+ static void set_dev_addr(struct net_device *netdev, bdaddr_t *addr,
+ u8 addr_type)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+ netdev->addr_assign_type = NET_ADDR_PERM;
++#endif
+ set_addr(netdev->dev_addr, addr->b, addr_type);
+ netdev->dev_addr[0] ^= 2;
+ }