[PATCH wpan-next] 6lowpan: cleanup for lowpan_rcv

[PATCH wpan-next] 6lowpan: cleanup for lowpan_rcv

[varkabhadram]

From: Varka Bhadram <varkab@cdac.in>

Instead of collecting the return value into 'ret' variable and
checking the perticular return value specifically, this patch
remove these by directly including function within 'if' statement

Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
 net/ieee802154/6lowpan_rtnl.c |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
index c7e07b8..38772d4 100644
--- a/net/ieee802154/6lowpan_rtnl.c
+++ b/net/ieee802154/6lowpan_rtnl.c
@@ -507,7 +507,6 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev,
 		      struct packet_type *pt, struct net_device *orig_dev)
 {
 	struct ieee802154_hdr hdr;
-	int ret;
 
 	skb = skb_share_check(skb, GFP_ATOMIC);
 	if (!skb)
@@ -533,31 +532,23 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev,
 		/* Pull off the 1-byte of 6lowpan header. */
 		skb_pull(skb, 1);
 
-		ret = lowpan_give_skb_to_devices(skb, NULL);
-		if (ret == NET_RX_DROP)
+		if (lowpan_give_skb_to_devices(skb, NULL))
 			goto drop;
 	} else {
 		switch (skb->data[0] & 0xe0) {
 		case LOWPAN_DISPATCH_IPHC:	/* ipv6 datagram */
-			ret = process_data(skb, &hdr);
-			if (ret == NET_RX_DROP)
+			if (process_data(skb, &hdr))
 				goto drop;
 			break;
 		case LOWPAN_DISPATCH_FRAG1:	/* first fragment header */
-			ret = lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAG1);
-			if (ret == 1) {
-				ret = process_data(skb, &hdr);
-				if (ret == NET_RX_DROP)
+			if (lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAG1))
+				if (process_data(skb, &hdr))
 					goto drop;
-			}
 			break;
 		case LOWPAN_DISPATCH_FRAGN:	/* next fragments headers */
-			ret = lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAGN);
-			if (ret == 1) {
-				ret = process_data(skb, &hdr);
-				if (ret == NET_RX_DROP)
+			if (lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAGN))
+				if (process_data(skb, &hdr))
 					goto drop;
-			}
 			break;
 		default:
 			break;
-- 
1.7.9.5

Re: [PATCH wpan-next] 6lowpan: cleanup for lowpan_rcv

[Alexander Aring]

Hi Varka,

On Tue, Oct 07, 2014 at 09:24:15AM +0530, varkabhadram@gmail.com wrote:
> From: Varka Bhadram <varkab@cdac.in>
> 
> Instead of collecting the return value into 'ret' variable and
> checking the perticular return value specifically, this patch
> remove these by directly including function within 'if' statement
> 

My opinion to this patch hasn't changed. The return value handling of
these functions are current broken and Martin works on this. After Martin
get his patches in you can do some cleanup here.

- Alex

Re: [PATCH wpan-next] 6lowpan: cleanup for lowpan_rcv

[Varka Bhadram]

Hi Alex,

On 10/07/2014 01:12 PM, Alexander Aring wrote:
> Hi Varka,
>
> On Tue, Oct 07, 2014 at 09:24:15AM +0530, varkabhadram@gmail.com wrote:
>> From: Varka Bhadram <varkab@cdac.in>
>>
>> Instead of collecting the return value into 'ret' variable and
>> checking the perticular return value specifically, this patch
>> remove these by directly including function within 'if' statement
>>
> My opinion to this patch hasn't changed. The return value handling of
> these functions are current broken and Martin works on this. After Martin
> get his patches in you can do some cleanup here.

Ok. Thanks...

-- 
Regards,
Varka Bhadram.