Return-Path: Received: from mail-wi0-f171.google.com ([209.85.212.171]:36114 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752820AbbEHSYn (ORCPT ); Fri, 8 May 2015 14:24:43 -0400 Received: by wizk4 with SMTP id k4so39430606wiz.1 for ; Fri, 08 May 2015 11:24:42 -0700 (PDT) From: Alexander Aring Subject: [PATCHv3 bluetooth-next 01/17] nl802154: cleanup invalid argument handling Date: Fri, 8 May 2015 20:24:12 +0200 Message-Id: <1431109468-4891-2-git-send-email-alex.aring@gmail.com> In-Reply-To: <1431109468-4891-1-git-send-email-alex.aring@gmail.com> References: <1431109468-4891-1-git-send-email-alex.aring@gmail.com> Sender: linux-wpan-owner@vger.kernel.org List-ID: To: linux-wpan@vger.kernel.org Cc: kernel@pengutronix.de, Alexander Aring This patch cleanups the -EINVAL cases by combining them in one condition. Signed-off-by: Alexander Aring --- net/ieee802154/nl802154.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c index f3c12f6..c01f4bb 100644 --- a/net/ieee802154/nl802154.c +++ b/net/ieee802154/nl802154.c @@ -668,10 +668,8 @@ static int nl802154_set_pan_id(struct sk_buff *skb, struct genl_info *info) return -EBUSY; /* don't change address fields on monitor */ - if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR) - return -EINVAL; - - if (!info->attrs[NL802154_ATTR_PAN_ID]) + if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR || + !info->attrs[NL802154_ATTR_PAN_ID]) return -EINVAL; pan_id = nla_get_le16(info->attrs[NL802154_ATTR_PAN_ID]); @@ -691,10 +689,8 @@ static int nl802154_set_short_addr(struct sk_buff *skb, struct genl_info *info) return -EBUSY; /* don't change address fields on monitor */ - if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR) - return -EINVAL; - - if (!info->attrs[NL802154_ATTR_SHORT_ADDR]) + if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR || + !info->attrs[NL802154_ATTR_SHORT_ADDR]) return -EINVAL; short_addr = nla_get_le16(info->attrs[NL802154_ATTR_SHORT_ADDR]); -- 2.3.7