2009-06-18 14:17:23

by Dmitry Baryshkov

Subject: [GIT PULL] Please pull two IEEE 802.15.4 patches.

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(-)

2009-06-18 14:17:40

by Dmitry Baryshkov

Subject: [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.

Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
---
net/ieee802154/af_ieee802154.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c
index 882a927..3bb6bdb 100644
--- a/net/ieee802154/af_ieee802154.c
+++ b/net/ieee802154/af_ieee802154.c
@@ -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;
--
1.6.3.1

2009-06-18 14:17:52

by Dmitry Baryshkov

Subject: [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.

Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
---
MAINTAINERS | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 61c190a..e1cfb12 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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/
--
1.6.3.1

2009-06-18 15:38:43

by Joe Perches

Subject: Re: [PATCH 2/2] MAINTAINERS: fix address of IEEE 802.15.4 git tree

On Thu, 2009-06-18 at 18:16 +0400, Dmitry Eremin-Solenikov wrote:
> 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(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 61c190a..e1cfb12 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -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

2009-06-19 07:25:48

by David Miller

Subject: Re: [PATCH 1/2] ieee802154: use standard routine for printing dumps

From: Dmitry Eremin-Solenikov <[email protected]>
Date: Thu, 18 Jun 2009 18:16:46 +0400

> Use print_hex_dump_bytes instead of self-written dumping function
> for outputting packet dumps.
>
> Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>

Applied.

2009-06-19 07:26:03

by David Miller

Subject: Re: [PATCH 2/2] MAINTAINERS: fix address of IEEE 802.15.4 git tree

From: Dmitry Eremin-Solenikov <[email protected]>
Date: Thu, 18 Jun 2009 18:16:47 +0400

> 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.