[PATCH net-next 0/5] trivial changes

[PATCH net-next 0/5] trivial changes

[Alexander Aring]

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

-- 
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 net-next 1/5] 6lowpan: remove unnecessary ret variable

[Alexander Aring]

Signed-off-by: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Werner Almesberger <werner-SEdMjqphH88wryQfseakQg@public.gmane.org>
---
 net/ieee802154/6lowpan.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index ff41b4d..d288035 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -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
-- 
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 net-next 3/5] 6lowpan: use netdev_alloc_skb instead dev_alloc_skb

[Alexander Aring]

This patch uses the netdev_alloc_skb instead dev_alloc_skb function and
drops the seperate assignment to skb->dev.

Signed-off-by: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Werner Almesberger <werner-SEdMjqphH88wryQfseakQg@public.gmane.org>
---
 net/ieee802154/6lowpan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index 9057f83..7510278 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -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);
-- 
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 3/5] 6lowpan: use netdev_alloc_skb instead dev_alloc_skb

[David Miller]

From: Alexander Aring <alex.aring@gmail.com>
Date: Thu, 24 Oct 2013 22:51:42 +0200

> @@ -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);

Re: [PATCH net-next 3/5] 6lowpan: use netdev_alloc_skb instead dev_alloc_skb

[Joe Perches]

On Sat, 2013-10-26 at 01:42 -0400, David Miller wrote:
> From: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Date: Thu, 24 Oct 2013 22:51:42 +0200
> 
> > @@ -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);

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

[David Miller]

From: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
Date: Fri, 25 Oct 2013 23:01:44 -0700

> On Sat, 2013-10-26 at 01:42 -0400, David Miller wrote:
>> From: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> Date: Thu, 24 Oct 2013 22:51:42 +0200
>> 
>> > @@ -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);
> 
> 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 net-next 4/5] 6lowpan: remove skb->dev assignment

[Alexander Aring]

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

Signed-off-by: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Werner Almesberger <werner-SEdMjqphH88wryQfseakQg@public.gmane.org>
---
 net/ieee802154/6lowpan.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index 7510278..e15b101 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -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));
-- 
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 net-next 5/5] 6lowpan: remove unecessary break

[Alexander Aring]

Signed-off-by: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Werner Almesberger <werner-SEdMjqphH88wryQfseakQg@public.gmane.org>
---
 net/ieee802154/6lowpan.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index e15b101..09350f1 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -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",
-- 
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

[Alexander Smirnov]

> 25 окт. 2013 г., в 0:51, Alexander Aring <alex.aring@gmail.com> написал(а):
> 
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> Reviewed-by: Werner Almesberger <werner@almesberger.net>
> ---
> net/ieee802154/6lowpan.c | 1 -
> 1 file changed, 1 deletion(-)
> 
> diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
> index e15b101..09350f1 100644
> --- a/net/ieee802154/6lowpan.c
> +++ b/net/ieee802154/6lowpan.c
> @@ -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. 

>        pr_debug("uncompressed UDP ports: src = %d, dst = %d\n",
> -- 
> 1.8.4.1
> 

Re: [PATCH net-next 5/5] 6lowpan: remove unecessary break

[Joe Perches]

On Fri, 2013-10-25 at 07:28 +0400, Alexander Smirnov wrote:
> > 25 окт. 2013 г., в 0:51, Alexander Aring <alex.aring@gmail.com> написал(а):
[]
> > diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
[]
> > @@ -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.

Re: [PATCH net-next 5/5] 6lowpan: remove unecessary break

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Thu, 24 Oct 2013 20:40:51 -0700

> On Fri, 2013-10-25 at 07:28 +0400, Alexander Smirnov wrote:
>> > 25 окт. 2013 г., в 0:51, Alexander Aring <alex.aring@gmail.com> написал(а):
> []
>> > diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
> []
>> > @@ -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.

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

[Sergei Shtylyov]

Hello.

On 25-10-2013 7:28, Alexander Smirnov wrote:

>> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
>> Reviewed-by: Werner Almesberger <werner@almesberger.net>
>> ---
>> net/ieee802154/6lowpan.c | 1 -
>> 1 file changed, 1 deletion(-)

>> diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
>> index e15b101..09350f1 100644
>> --- a/net/ieee802154/6lowpan.c
>> +++ b/net/ieee802154/6lowpan.c
>> @@ -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

Re: [PATCH net-next 5/5] 6lowpan: remove unecessary break

[Alexander Smirnov]

[-- Attachment #1.1: Type: text/plain, Size: 676 bytes --]

>
>
>  diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
>>> index e15b101..09350f1 100644
>>> --- a/net/ieee802154/6lowpan.c
>>> +++ b/net/ieee802154/6lowpan.c
>>> @@ -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
>

that's my fault, I missed goto here. I already declined my proposal, it's
silly.

[-- Attachment #1.2: Type: text/html, Size: 1330 bytes --]

[-- Attachment #2: Type: text/plain, Size: 416 bytes --]

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

[-- Attachment #3: Type: text/plain, Size: 213 bytes --]

_______________________________________________
Linux-zigbee-devel mailing list
Linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel

[PATCH net-next 2/5] 6lowpan: remove unnecessary check on err >= 0

[Alexander Aring]

The err variable can only be zero in this case.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Reviewed-by: Werner Almesberger <werner@almesberger.net>
---
 net/ieee802154/6lowpan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index d288035..9057f83 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -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;
-- 
1.8.4.1