Please pull two IEEE 802.15.4 patches.
Subsystems (3)
The following changes since commit 81e2a3d5b75cbf0b42428b9d5a7cc7c85be9e7a7:
Eric Dumazet (1):
atm: sk_wmem_alloc initial value is one
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git for-linus
Dmitry Eremin-Solenikov (2):
ieee802154: use standard routine for printing dumps
MAINTAINERS: fix IEEE 802.15.4 entry
MAINTAINERS | 4 ++-- net/ieee802154/af_ieee802154.c | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-)
PATCH 1/2 ieee802154: use standard routine for printing dumps
Use print_hex_dump_bytes instead of self-written dumping function for outputting packet dumps.
--- net/ieee802154/af_ieee802154.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-)
net/ieee802154/af_ieee802154.c +3 -9
@@ -39,14 +39,6 @@#include "af802154.h" -#define DBG_DUMP (data, len) { \ - int i; \ - pr_debug("function: %s: data: len %d:\n", __func__, len); \ - for (i = 0; i < len; i++) {\ - pr_debug("%02x: %02x\n", i, (data)[i]); \ - } \ -} -/* * Utility function for families */
@@ -302,10 +294,12 @@ static struct net_proto_family ieee802154_family_ops = {static int ieee802154_rcv (struct sk_buff *skb,struct net_device *dev,struct packet_type *pt,struct net_device *orig_dev) { -DBG_DUMP (skb->data, skb->len);if (!netif_running (dev))return -ENODEV ;pr_debug ("got frame, type %d, dev %p\n" , dev->type, dev); +#ifdef DEBUG +print_hex_dump_bytes ("ieee802154_rcv " ,DUMP_PREFIX_NONE , skb->data, skb->len); +#endif if (!net_eq (dev_net (dev), &init_net)) goto drop;
Signature · 1 line
1.6.3.1
PATCH 2/2 MAINTAINERS: fix address of IEEE 802.15.4 git tree
IEEE 802.15.4 git tree was moved from my private area to shared one. Fix address accordingly.
--- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
MAINTAINERS +1 -1
@@ -2826,7 +2826,7 @@ P: Sergey Lapin M: [email protected] L: [email protected] W: http://apps.sourceforge.net/trac/linux-zigbee -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git S: Maintained F: net/ieee802154/ F: drivers/ieee801254/
Signature · 1 line
1.6.3.1
Re: [PATCH 2/2] MAINTAINERS: fix address of IEEE 802.15.4 git tree
Quoted 13 lines · Dmitry Eremin-Solenikov
IEEE 802.15.4 git tree was moved from my private area to shared one. Fix address accordingly.
Signed-off-by Dmitry Eremin-Solenikov <[email protected]>--- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)MAINTAINERS +0
-0
MAINTAINERS P: Sergey Lapin · line 2832
Quoted 8 lines
MAINTAINERS +1
-1@@ -2826,7 +2826,7 @@ P: Sergey Lapin M: [email protected] L: [email protected] W: http://apps.sourceforge.net/trac/linux-zigbee -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git S: Maintained F: net/ieee802154/ F: drivers/ieee801254/
Can you fix the pattern typo too please
-F: drivers/ieee801254
+F: drivers/ieee802154
Re: [PATCH 2/2] MAINTAINERS: fix address of IEEE 802.15.4 git tree
In reply to Dmitry Eremin-SolenikovFrom: Dmitry Eremin-Solenikov <[email protected]>
Date: Thu, 18 Jun 2009 18:16:47 +0400
Quoted 4 lines
IEEE 802.15.4 git tree was moved from my private area to shared one. Fix address accordingly.
Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
Applied.
Re: [PATCH 1/2] ieee802154: use standard routine for printing dumps
In reply to Dmitry Eremin-SolenikovFrom: Dmitry Eremin-Solenikov <[email protected]>
Date: Thu, 18 Jun 2009 18:16:46 +0400
Quoted 4 lines
Use
print_hex_dump_bytesinstead of self-written dumping function for outputting packet dumps.Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
Applied.