diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-28 15:44:52 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-28 15:44:52 -0300 |
| commit | 717d182e4173c037fb9e720a046dec804fd9990e (patch) | |
| tree | 51f14a932abcbbb17c3eb023c63179e2843982d7 /include/uapi/linux/ethtool_netlink.h | |
| parent | a55b7bb1c14662490689e094964ecc5387bb2b55 (diff) | |
| parent | fb0155a09b0224a7147cb07a4ce6034c8d29667f (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and get v5.10 development in sync with the main kernel
sources.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/uapi/linux/ethtool_netlink.h')
| -rw-r--r-- | include/uapi/linux/ethtool_netlink.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h index 5dcd24cb33ea..72ba36be9655 100644 --- a/include/uapi/linux/ethtool_netlink.h +++ b/include/uapi/linux/ethtool_netlink.h @@ -79,6 +79,7 @@ enum { ETHTOOL_MSG_TSINFO_GET_REPLY, ETHTOOL_MSG_CABLE_TEST_NTF, ETHTOOL_MSG_CABLE_TEST_TDR_NTF, + ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY, /* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT, |