Skip to contentSkip to conversation

Please pull two IEEE 802.15.4 patches.

GIT PULL Applied Dmitry Eremin-Solenikov 3 participants 6 messages Jun 18, 2009 – Jun 19, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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(-)
#1 lore raw

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
index 882a927..3bb6bdb 100644
@@ -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
#2 lore raw

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
index 61c190a..e1cfb12 100644
@@ -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
#3 lore raw

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.

---
 MAINTAINERS |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
MAINTAINERS +0 -0
index 61c190a..e1cfb12 100644

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