Hi Marcel, On Fri, Jul 11, 2014 at 01:23:52PM +0200, Marcel Holtmann wrote: > Hi Alexander, > ... > > index cbbbe6d..7ed1970 100644 > > --- a/net/Makefile > > +++ b/net/Makefile > > @@ -57,7 +57,8 @@ obj-$(CONFIG_CAIF) += caif/ > > ifneq ($(CONFIG_DCB),) > > obj-y += dcb/ > > endif > > -obj-y += ieee802154/ > > +obj-$(CONFIG_6LOWPAN) += 6lowpan/ > > +obj-$(CONFIG_IEEE802154) += ieee802154/ > > obj-$(CONFIG_MAC802154) += mac802154/ > > > > ifeq ($(CONFIG_NET),y) > > diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig > > index 06ec144..a54777d 100644 > > --- a/net/bluetooth/Kconfig > > +++ b/net/bluetooth/Kconfig > > @@ -6,7 +6,6 @@ menuconfig BT > > tristate "Bluetooth subsystem support" > > depends on NET && !S390 > > depends on RFKILL || !RFKILL > > - select 6LOWPAN_IPHC if BT_6LOWPAN > > select CRC16 > > select CRYPTO > > select CRYPTO_BLKCIPHER > > @@ -42,7 +41,7 @@ menuconfig BT > > > > config BT_6LOWPAN > > bool "Bluetooth 6LoWPAN support" > > - depends on BT && IPV6 > > + depends on BT && 6LOWPAN > > help > > IPv6 compression over Bluetooth. > > this will conflict with our changes in wireless-next tree. We converted out 6LoWPAN support into a separate module. > oops, sorry I didn't check on this. I simple based it on net-next, because the patch series adds a new branch. btw. we need to talk about who branch will commit changes to iphc code to avoid conflicts. - Alex -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
