Commit 01348b3448 moved 6lowpan.c to 6lowpan_rtnl.c which means we have to adjust the respective backport patches.
commit 01348b34485eceace5d9ca9756ba40679cf22ac6 Author: Alexander Aring <[email protected]> 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 <[email protected]> Signed-off-by: David S. Miller <[email protected]> Cc: Alexander Aring <[email protected]> Cc: Alexander Smirnov <[email protected]> Cc: Dmitry Eremin-Solenikov <[email protected]> Cc: [email protected] Signed-off-by: Luis R. Rodriguez <[email protected]> --- .../network/86-qdisc_tx_busylock/ieee802154.patch | 10 ++++------ 1 file 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 d685b3c..b4f319d 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); -- 1.8.5.3 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
