On Thu, Jul 24, 2014 at 03:23:20PM +0530, varkabhad...@gmail.com wrote:
> From: Varka Bhadram <var...@cdac.in>
> 
> By introducing label fail, making the common error path for
> mac802154_llsec_decrypt() and packet type default case.
> 
> Signed-off-by: Varka Bhadram <var...@cdac.in>
> ---
>  net/mac802154/wpan.c |   10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
> index 3c3069f..ce17570 100644
> --- a/net/mac802154/wpan.c
> +++ b/net/mac802154/wpan.c
> @@ -472,8 +472,7 @@ mac802154_subif_frame(struct mac802154_sub_if_data 
> *sdata, struct sk_buff *skb,
>       rc = mac802154_llsec_decrypt(&sdata->sec, skb);
>       if (rc) {
>               pr_debug("decryption failed: %i\n", rc);
> -             kfree_skb(skb);
> -             return NET_RX_DROP;
> +             goto fail;
>       }
>  
>       sdata->dev->stats.rx_packets++;
> @@ -485,9 +484,12 @@ mac802154_subif_frame(struct mac802154_sub_if_data 
> *sdata, struct sk_buff *skb,
>       default:
>               pr_warn("ieee802154: bad frame received (type = %d)\n",
>                       mac_cb(skb)->type);
> -             kfree_skb(skb);
> -             return NET_RX_DROP;
> +             goto fail;
>       }
> +
> +fail:
> +     kfree_skb(skb);
> +     return NET_RX_DROP;
>  }
>  
>  static void mac802154_print_addr(const char *name,

Thanks, applied.

------------------------------------------------------------------------------
Infragistics Professional
Build stunning WinForms apps today!
Reboot your WinForms applications with our WinForms controls. 
Build a bridge from your legacy apps to the future.
http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk
_______________________________________________
Linux-zigbee-devel mailing list
Linux-zigbee-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel

Reply via email to