diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-03-29 23:27:01 +0000 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-08 18:16:21 -0700 |
commit | d6172fcc037acc5c82336e27dcecefddcf54bc18 (patch) | |
tree | 12f17f715d94709e8ecd2c5d4eabbeeba82befa2 /patches/collateral-evolutions | |
parent | 250c5d2e5bbedb7b8beed78ed159ad60facbb20c (diff) |
backports: address move of 6lowpan.c to 6lowpan_rtnl.c
Commit 01348b3448 moved 6lowpan.c to 6lowpan_rtnl.c
which means we have to adjust the respective backport
patches.
commit 01348b34485eceace5d9ca9756ba40679cf22ac6
Author: Alexander Aring <alex.aring@gmail.com>
Date: Fri Feb 28 07:32:47 2014 +0100
6lowpan: move 6lowpan.c to 6lowpan_rtnl.c
We have a 6lowpan.c file and 6lowpan.ko file. To avoid confusing we
should move 6lowpan.c to 6lowpan_rtnl.c. Then we can support multiple
source files for 6lowpan module.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Alexander Aring <alex.aring@gmail.com>
Cc: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: linux-zigbee-devel@lists.sourceforge.net
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions')
-rw-r--r-- | patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch b/patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch index d685b3cd..b4f319d7 100644 --- a/patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch +++ b/patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch @@ -1,8 +1,6 @@ -diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c -index 8edfea5..04f18ab 100644 ---- a/net/ieee802154/6lowpan.c -+++ b/net/ieee802154/6lowpan.c -@@ -530,7 +530,9 @@ static struct header_ops lowpan_header_o +--- a/net/ieee802154/6lowpan_rtnl.c ++++ b/net/ieee802154/6lowpan_rtnl.c +@@ -374,7 +374,9 @@ static struct header_ops lowpan_header_o .create = lowpan_header_create, }; @@ -12,7 +10,7 @@ index 8edfea5..04f18ab 100644 static struct lock_class_key lowpan_netdev_xmit_lock_key; static void lowpan_set_lockdep_class_one(struct net_device *dev, -@@ -545,7 +547,9 @@ static void lowpan_set_lockdep_class_one +@@ -389,7 +391,9 @@ static void lowpan_set_lockdep_class_one static int lowpan_dev_init(struct net_device *dev) { netdev_for_each_tx_queue(dev, lowpan_set_lockdep_class_one, NULL); |