diff options
| author | Rob Herring <robh@kernel.org> | 2014-01-18 02:01:27 +0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-01-18 02:01:27 +0400 |
| commit | 361128fcbf30f590a05c8e8789155364f37367db (patch) | |
| tree | 7f7973599e286dfd48ea724a5b7fb4bca76b294e /include/uapi/linux/if_link.h | |
| parent | e2897d7e0b0460dca91b52d55ce41c888363502d (diff) | |
| parent | 482c43419fc204b4b658fa4acb80cd502e5fcbac (diff) | |
| download | linux-361128fcbf30f590a05c8e8789155364f37367db.tar.xz | |
Merge remote-tracking branch 'grant/devicetree/next' into for-3.14
Diffstat (limited to 'include/uapi/linux/if_link.h')
| -rw-r--r-- | include/uapi/linux/if_link.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index b78566f59aba..6db460121f84 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -488,7 +488,9 @@ enum { IFLA_HSR_UNSPEC, IFLA_HSR_SLAVE1, IFLA_HSR_SLAVE2, - IFLA_HSR_MULTICAST_SPEC, + IFLA_HSR_MULTICAST_SPEC, /* Last byte of supervision addr */ + IFLA_HSR_SUPERVISION_ADDR, /* Supervision frame multicast addr */ + IFLA_HSR_SEQ_NR, __IFLA_HSR_MAX, }; |