mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 09:56:00 +00:00
nl802154: cleanup invalid argument handling
This patch cleanups the -EINVAL cases by combining them in one condition. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
43b79209b5
commit
0cf0879acd
@ -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]);
|
||||
|
Loading…
Reference in New Issue
Block a user