Alex,
On 10/01/2014 12:03 PM, Alexander Aring wrote:
checking the perticular return value specifically, this patch
remove these by directly including function within 'if' statement
Signed-off-by: Varka Bhadram <varkab@xxxxxxx>
---
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 4413629..657940e 100644
--- a/net/ieee802154/6lowpan_rtnl.c
+++ b/net/ieee802154/6lowpan_rtnl.c
@@ -506,7 +506,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)
@@ -529,31 +528,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;
Mainly I would ack this, I detect no change. But this handling is
currently complete broken and Martin already work on this. [0]
I will not apply it. First fix the broken error handling, then you can
send cleanups for everything in 6LoWPAN receive handling.
Where is error handling is broken...?
--
Regards,
Varka Bhadram.
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
