diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-01-31 10:13:07 -0600 |
---|---|---|
committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-31 10:13:07 -0600 |
commit | 6a436fa81252b3a302d61133c784472a237b6dd7 (patch) | |
tree | b27ae295c39997e681fb40e88a9d1ed6edf633a7 /include/uapi/linux | |
parent | 414ae7609e19580a56647344e61f13f3768e0820 (diff) | |
parent | bb6b42b4fb8e4b488c1282fa7c0f26953ceef0b4 (diff) |
Merge branch 'pci/switchtec' into next
* pci/switchtec:
switchtec: Add device IDs for PSX 24xG3 and PSX 48xG3
switchtec: Add Global Fabric Manager Server (GFMS) event
Diffstat (limited to 'include/uapi/linux')
-rw-r--r-- | include/uapi/linux/switchtec_ioctl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/switchtec_ioctl.h b/include/uapi/linux/switchtec_ioctl.h index 75df44373034..4f4daf8db954 100644 --- a/include/uapi/linux/switchtec_ioctl.h +++ b/include/uapi/linux/switchtec_ioctl.h @@ -88,7 +88,8 @@ struct switchtec_ioctl_event_summary { #define SWITCHTEC_IOCTL_EVENT_FORCE_SPEED 26 #define SWITCHTEC_IOCTL_EVENT_CREDIT_TIMEOUT 27 #define SWITCHTEC_IOCTL_EVENT_LINK_STATE 28 -#define SWITCHTEC_IOCTL_MAX_EVENTS 29 +#define SWITCHTEC_IOCTL_EVENT_GFMS 29 +#define SWITCHTEC_IOCTL_MAX_EVENTS 30 #define SWITCHTEC_IOCTL_EVENT_LOCAL_PART_IDX -1 #define SWITCHTEC_IOCTL_EVENT_IDX_ALL -2 |