Hi Alex, >>> Currently it is up to the functions below lowpan_rcv to free the skb on error >>> conditions. This patch now removes all the UAPI error codes and process data >>> now returns -1 if there is a problem. In this scenario lowpan_rcv will free >>> the skb and return NET_RX_DROP. This also fixes the problem where >>> NET_RX_SUCCESS is returned on error >>> >>> Martin Townsend (2): >>> Remove dev parameter from skb_delivery_cb in 6lowpan. >>> Change lowpan_rcv so skb is freed within function and fix return >>> values. >>> >>> include/net/6lowpan.h | 4 ++-- >>> net/6lowpan/iphc.c | 37 ++++++++++++++++++------------------ >>> net/bluetooth/6lowpan.c | 21 ++++++++++----------- >>> net/ieee802154/6lowpan_rtnl.c | 44 +++++++++++++++++++++---------------------- >>> 4 files changed, 52 insertions(+), 54 deletions(-) >> >> I can not take these patches at this point. >> >> checking file net/ieee802154/6lowpan_rtnl.c >> Hunk #1 FAILED at 143. >> Hunk #2 succeeded at 480 (offset -4 lines). >> 1 out of 2 hunks FAILED >> >> We need to get the IEEE 802.15.4 changes merged through John's wireless-next tree. IEEE 802.15.4 going straight into net-next and Bluetooth going into wireless-next will not work out smoothly when both technologies are now utilizing 6LoWPAN and we are heavily working on 6LoWPAN. >> > > I already told Martin that these patches should be based on bluetooth > (better bluetooth-next, 802.15.4 hasn't a real stable strategie and there > are also some known other issues in the current implementation). I don't > think that the current implementation is used in a real environment. > > I get this patch-series in a resend of this series, after Martin > subscribed the linux-zigbee-devel mailinglist, then I told Martin that I > need some time for review and he want to resend them tomorrow or friday. > The resend should based on bluetooth-next then, if this is okay for you. if patches are based on bluetooth-next, then we have no problem here. I can easily merge them. Regards Marcel -- 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
