diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-25 22:09:12 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-25 22:09:12 +0300 |
| commit | e7157f28ced492accf6e665ba0f748162757779f (patch) | |
| tree | f3a8e41d923583b0df37b48898be106eadf70671 /include/linux | |
| parent | d296ba60d8e2de23a350796a567a3aa90fe1cb6e (diff) | |
| parent | 2dad624e6dd65c6048a9bbe0e16559fce182c87c (diff) | |
| download | linux-e7157f28ced492accf6e665ba0f748162757779f.tar.xz | |
Merge branch 'nla_align-set-2'
Nicolas Dichtel says:
====================
netlink: align attributes when needed (patchset #2)
This is the continuation (series #2) of the work done to align netlink
attributes when these attributes contain some 64-bit fields.
In patch #3, I didn't modify the function ila_encap_nlsize(). I was waiting
feedback for this patch: http://patchwork.ozlabs.org/patch/613766/
If it's approved, there will be an update to switch nla_total_size() to
nla_total_size_64bit() after the merge of net in net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nl802154.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h index 167342c2ce6b..0f6f6607f592 100644 --- a/include/linux/nl802154.h +++ b/include/linux/nl802154.h @@ -92,6 +92,8 @@ enum { IEEE802154_ATTR_LLSEC_DEV_OVERRIDE, IEEE802154_ATTR_LLSEC_DEV_KEY_MODE, + IEEE802154_ATTR_PAD, + __IEEE802154_ATTR_MAX, }; |