trivial changes
Subsystems (3)
cover trivial changes
This patch series includes some trivial changes to prepare the 6lowpan stack for upcomming patch-series which mainly fix fragmentation according to rfc4944 and udp handling(which is currently broken).
Alexander Aring (5):
6lowpan: remove unnecessary ret variable 6lowpan: remove unnecessary check on err >= 0 6lowpan: use netdev_alloc_skb instead dev_alloc_skb 6lowpan: remove skb->dev assignment 6lowpan: remove unecessary break
net/ieee802154/6lowpan.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
Signature · 9 lines
1.8.4.1 ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
A message that is not in the archive (sent off-list or not yet received): 1382647904-11311-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 1/5 6lowpan: remove unnecessary ret variable
--- net/ieee802154/6lowpan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/ieee802154/6lowpan.c +2 -4
@@ -1120,7 +1120,7 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head, int mlen, int plen, int offset, int type) { struct sk_buff *frag; -int hlen, ret; +int hlen; hlen = (type ==LOWPAN_DISPATCH_FRAG1 ) ?LOWPAN_FRAG1_HEAD_SIZE :LOWPAN_FRAGN_HEAD_SIZE ;
@@ -1145,9 +1145,7 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head,lowpan_raw_dump_table (__func__," raw fragment dump" , frag->data, frag->len); - ret =dev_queue_xmit (frag); - -return ret; +return dev_queue_xmit (frag); } static int
Signature · 9 lines
1.8.4.1 ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
PATCH 3/5 6lowpan: use netdev_alloc_skb instead dev_alloc_skb
In reply to a message not in the archiveThis patch uses the netdev_alloc_skb instead dev_alloc_skb function and drops the seperate assignment to skb->dev.
--- net/ieee802154/6lowpan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ieee802154/6lowpan.c +2 -2
@@ -1127,12 +1127,12 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head,lowpan_raw_dump_inline (__func__,"6lowpan fragment header" , head, hlen); - frag =dev_alloc_skb (hlen + mlen + plen +IEEE802154_MFR_SIZE ); + frag =netdev_alloc_skb (skb->dev, hlen + mlen + + plen +IEEE802154_MFR_SIZE );if (!frag)return -ENOMEM ; frag->priority = skb->priority; - frag->dev = skb->dev;/* copy header, MFR and payload */ memcpy (skb_put (frag, mlen), skb->data, mlen);
Signature · 9 lines
1.8.4.1 ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
David Miller
maintainerRe: [PATCH net-next 3/5] 6lowpan: use netdev_alloc_skb instead dev_alloc_skb
From: Alexander Aring <[email protected]>
Date: Thu, 24 Oct 2013 22:51:42 +0200
net/ieee802154/6lowpan.c lowpan_fragment_xmit(struct sk_buff *skb, u8 *head, · line 1131
Quoted 7 lines
net/ieee802154/6lowpan.c +2
-1@@ -1127,12 +1127,12 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head,lowpan_raw_dump_inline (__func__,"6lowpan fragment header" , head, hlen); - frag =dev_alloc_skb (hlen + mlen + plen +IEEE802154_MFR_SIZE ); + frag =netdev_alloc_skb (skb->dev, hlen + mlen + + plen +IEEE802154_MFR_SIZE );
Please indent this properly.
It should be something like:
frag = netdev_alloc_skb(skb->dev, hlen + mlen + plen + IEEE802154_MFR_SIZE);
A message that is not in the archive (sent off-list or not yet received): 20131026.014214.1636999222808937267.davem-fT/PcQaiUtIeIZ0/[email protected]
Re: [PATCH net-next 3/5] 6lowpan: use netdev_alloc_skb instead dev_alloc_skb
Quoted 13 lines · David Miller
From: Alexander Aring <[email protected]>
Date: Thu, 24 Oct 2013 22:51:42 +0200net/ieee802154/6lowpan.c lowpan_fragment_xmit(struct sk_buff *skb, u8 *head, · line 1131
Quoted 7 lines
net/ieee802154/6lowpan.c +2
-1@@ -1127,12 +1127,12 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head,lowpan_raw_dump_inline (__func__,"6lowpan fragment header" , head, hlen); - frag =dev_alloc_skb (hlen + mlen + plen +IEEE802154_MFR_SIZE ); + frag =netdev_alloc_skb (skb->dev, hlen + mlen + + plen +IEEE802154_MFR_SIZE );Please indent this properly.
Quoted 4 lines
It should be something like:
frag = netdev_alloc_skb(skb->dev, hlen + mlen + plen + IEEE802154_MFR_SIZE);
Maybe better as:
frag = netdev_alloc_skb(skb->dev, hlen + mlen + plen + IEEE802154_MFR_SIZE);
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
Re: [PATCH net-next 3/5] 6lowpan: use netdev_alloc_skb instead dev_alloc_skb
From: Joe Perches <[email protected]>
Date: Fri, 25 Oct 2013 23:01:44 -0700
Quoted 16 lines · David Miller
Quoted 15 lines
From: Alexander Aring <[email protected]>
Date: Thu, 24 Oct 2013 22:51:42 +0200net/ieee802154/6lowpan.c lowpan_fragment_xmit(struct sk_buff *skb, u8 *head, · line 1131
Quoted 7 lines
net/ieee802154/6lowpan.c +2
-1@@ -1127,12 +1127,12 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head,lowpan_raw_dump_inline (__func__,"6lowpan fragment header" , head, hlen); - frag =dev_alloc_skb (hlen + mlen + plen +IEEE802154_MFR_SIZE ); + frag =netdev_alloc_skb (skb->dev, hlen + mlen + + plen +IEEE802154_MFR_SIZE );Please indent this properly.
It should be something like:
Quoted 7 lines
Quoted 2 lines
frag = netdev_alloc_skb(skb->dev, hlen + mlen + plen + IEEE802154_MFR_SIZE);Maybe better as:
frag = netdev_alloc_skb(skb->dev, hlen + mlen + plen + IEEE802154_MFR_SIZE);
Either is fine with me.
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
PATCH 4/5 6lowpan: remove skb->dev assignment
In reply to a message not in the archiveThis patch removes the assignment of skb->dev. We don't need it here because we use the netdev_alloc_skb_ip_align function which already sets the skb->dev.
--- net/ieee802154/6lowpan.c | 1 - 1 file changed, 1 deletion(-)
net/ieee802154/6lowpan.c +0 -1
@@ -785,7 +785,6 @@ lowpan_alloc_new_frame(struct sk_buff *skb, u16 len, u16 tag) goto skb_err; frame->skb->priority = skb->priority; - frame->skb->dev = skb->dev;/* reserve headroom for uncompressed ipv6 header */ skb_reserve (frame->skb,sizeof (struct ipv6hdr ));
Signature · 9 lines
1.8.4.1 ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
PATCH 5/5 6lowpan: remove unecessary break
In reply to a message not in the archive--- net/ieee802154/6lowpan.c | 1 - 1 file changed, 1 deletion(-)
net/ieee802154/6lowpan.c +0 -1
@@ -440,7 +440,6 @@ lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh)default :pr_debug ("ERROR: unknown UDP format\n" ); goto err; -break ; } pr_debug("uncompressed UDP ports: src = %d, dst = %d\n",
Signature · 9 lines
1.8.4.1 ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
Re: [PATCH net-next 5/5] 6lowpan: remove unecessary break
Quoted 14 lines
25 окт. 2013 г., в 0:51, Alexander Aring <[email protected]> написал(а):
Signed-off-by Alexander Aring <[email protected]>Reviewed-by Werner Almesberger <[email protected]>---
net/ieee802154/6lowpan.c| 1 -1 file changed, 1 deletion(-)net/ieee802154/6lowpan.c +0
-0
net/ieee802154/6lowpan.c lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh) · line 444
Quoted 6 lines
net/ieee802154/6lowpan.c +0
-1@@ -440,7 +440,6 @@ lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh)default :pr_debug ("ERROR: unknown UDP format\n" ); goto err; -break ; }
It's not an unnecessary, it's let say a "good coding practice" to have a break for every case including default.
Quoted 4 lines
net/ieee802154/6lowpan.c +0
-0pr_debug("uncompressed UDP ports: src = %d, dst = %d\n",Signature · 1 line
1.8.4.1
Re: [PATCH net-next 5/5] 6lowpan: remove unecessary break
Quoted 1 line · Alexander Smirnov
Quoted 1 line
25 окт. 2013 г., в 0:51, Alexander Aring <[email protected]> написал(а):
[]
Quoted 1 line
net/ieee802154/6lowpan.c
Quoted 1 line
net/ieee802154/6lowpan.c +0
-0
[]
Quoted 9 lines
net/ieee802154/6lowpan.c lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh) · line 444
Quoted 7 lines
net/ieee802154/6lowpan.c +0
-1@@ -440,7 +440,6 @@ lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh)default :pr_debug ("ERROR: unknown UDP format\n" ); goto err; -break ; }It's not an unnecessary, it's let say a "good coding practice" to have a break for every case including default.
Hello Alexanders:
Some would otherwise say it's a poor practice.
David Miller
maintainerRe: [PATCH net-next 5/5] 6lowpan: remove unecessary break
From: Joe Perches <[email protected]>
Date: Thu, 24 Oct 2013 20:40:51 -0700
Quoted 15 lines · Alexander Smirnov
Quoted 1 line
Quoted 1 line
25 окт. 2013 г., в 0:51, Alexander Aring <[email protected]> написал(а):
[]
Quoted 1 line
net/ieee802154/6lowpan.c
Quoted 1 line
net/ieee802154/6lowpan.c +0
-0[]
Quoted 9 lines
net/ieee802154/6lowpan.c lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh) · line 444
Quoted 7 lines
net/ieee802154/6lowpan.c +0
-1@@ -440,7 +440,6 @@ lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh)default :pr_debug ("ERROR: unknown UDP format\n" ); goto err; -break ; }It's not an unnecessary, it's let say a "good coding practice" to have a break for every case including default.
Quoted 3 lines
Hello Alexanders:
Some would otherwise say it's a poor practice.
I think with a goto there at the end of the case statement, it's redundant and stupid, and thus should be removed.
Re: [PATCH net-next 5/5] 6lowpan: remove unecessary break
In reply to Alexander SmirnovHello.
Quoted 6 lines · Alexander Smirnov
Quoted 5 lines
Signed-off-by Alexander Aring <[email protected]>Reviewed-by Werner Almesberger <[email protected]>---
net/ieee802154/6lowpan.c| 1 -1 file changed, 1 deletion(-)
Quoted 12 lines
net/ieee802154/6lowpan.c lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh) · line 443
Quoted 10 lines
net/ieee802154/6lowpan.c +0
-1@@ -440,7 +440,6 @@ lowpan_uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh)default :pr_debug ("ERROR: unknown UDP format\n" ); goto err; -break ; }It's not an unnecessary, it's let say a "good coding practice" to have a break for every case including default.
Even after *goto*? :-)
WBR, Sergei
A message that is not in the archive (sent off-list or not yet received): 526A6CB2.1040007-M4DtvfQ/[email protected]
Re: [PATCH net-next 5/5] 6lowpan: remove unecessary break
Quoted 15 lines
diff --git
a/net/ieee802154/6lowpan.cb/net/ieee802154/6lowpan.cQuoted 12 lines
net/ieee802154/6lowpan.c lowpan_uncompress_udp_header(**struct sk_buff *skb, · line 445
Quoted 11 lines
index e15b101..09350f1 100644
net/ieee802154/6lowpan.c +0
-1@@ -440,7 +440,6 @@ lowpan_uncompress_udp_header(**struct sk_buff *skb, struct udphdr *uh)default :pr_debug ("ERROR: unknown UDP format\n" ); goto err; -break ; }
Quoted 8 lines
It's not an unnecessary, it's let say a "good coding practice" to have a
Quoted 2 lines
break for every case including default.
Even after *goto*? :-)WBR, Sergei
that's my fault, I missed goto here. I already declined my proposal, it's silly.
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
_______________________________________________
Linux-zigbee-devel mailing list Linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
Alexander Aring
maintainerPATCH 2/5 6lowpan: remove unnecessary check on err >= 0
In reply to Alexander AringThe err variable can only be zero in this case.
--- net/ieee802154/6lowpan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ieee802154/6lowpan.c +1 -1
@@ -1179,7 +1179,7 @@ lowpan_skb_fragmentation(struct sk_buff *skb, struct net_device *dev) head[0 ] &= ~LOWPAN_DISPATCH_FRAG1 ; head[0 ] |=LOWPAN_DISPATCH_FRAGN ; -while ((payload_length - offset >0 ) && (err >=0 )) { +while (payload_length - offset >0 ) {int len =LOWPAN_FRAG_SIZE ; head[4 ] = offset /8 ;
Signature · 1 line
1.8.4.1