summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <aar@pengutronix.de>2016-06-18 10:45:33 +0200
committerMarcel Holtmann <marcel@holtmann.org>2016-07-08 12:20:57 +0200
commitaece0c3fe1f06962a591268b8c236df0ae5d9e4e (patch)
tree14432d2013b1c14d8c88f6c4e4ca56ef3bfcce76
parent439e65d3998c0b9501638cc0c2190e936c0caaf2 (diff)
downloadlinux-stable-aece0c3fe1f06962a591268b8c236df0ae5d9e4e.tar.gz
linux-stable-aece0c3fe1f06962a591268b8c236df0ae5d9e4e.tar.bz2
linux-stable-aece0c3fe1f06962a591268b8c236df0ae5d9e4e.zip
nl802154: move PAD to right position
The PAD define should be above the experimental support. We don't care about if we break userspace in experimental stuff but PAD is part of the existing UAPI. Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Stefan Schmidt<stefan@osg.samsung.com> Signed-off-by: Alexander Aring <aar@pengutronix.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--include/net/nl802154.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/nl802154.h b/include/net/nl802154.h
index fcab4de49951..7aad2fdfd16a 100644
--- a/include/net/nl802154.h
+++ b/include/net/nl802154.h
@@ -124,6 +124,8 @@ enum nl802154_attrs {
NL802154_ATTR_ACKREQ_DEFAULT,
+ NL802154_ATTR_PAD,
+
/* add attributes here, update the policy in nl802154.c */
#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
@@ -138,8 +140,6 @@ enum nl802154_attrs {
NL802154_ATTR_SEC_KEY,
#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
- NL802154_ATTR_PAD,
-
__NL802154_ATTR_AFTER_LAST,
NL802154_ATTR_MAX = __NL802154_ATTR_AFTER_LAST - 1
};