From: Varka Bhadram <varkabhadram@gmail.com>
To: Alexander Aring <alex.aring@gmail.com>
Cc: linux-wpan@vger.kernel.org, Varka Bhadram <varkab@cdac.in>,
martin.townsend@xsilon.com
Subject: Re: [PATCH wpan-next] ieee802154: cleanup for lowpan_rcv
Date: Wed, 01 Oct 2014 12:08:56 +0530 [thread overview]
Message-ID: <542BA180.2030803@gmail.com> (raw)
In-Reply-To: <20141001063319.GB23043@omega>
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@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 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.
next prev parent reply other threads:[~2014-10-01 6:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-01 6:01 [PATCH wpan-next] ieee802154: cleanup for lowpan_rcv Varka Bhadram
2014-10-01 6:33 ` Alexander Aring
2014-10-01 6:38 ` Varka Bhadram [this message]
2014-10-01 7:03 ` Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=542BA180.2030803@gmail.com \
--to=varkabhadram@gmail.com \
--cc=alex.aring@gmail.com \
--cc=linux-wpan@vger.kernel.org \
--cc=martin.townsend@xsilon.com \
--cc=varkab@cdac.in \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).