summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Syromiatnikov <esyr@redhat.com>2018-10-07 16:57:37 +0200
committerDavid S. Miller <davem@davemloft.net>2018-10-08 06:06:28 +0200
commitd4f0006a08f52b5320f038780286ef312535fc64 (patch)
tree7d03e7ffef08c3c779734c64bc4d4f6ba649ce2f
parentnet/smc: use __aligned_u64 for 64-bit smc_diag fields (diff)
downloadlinux-d4f0006a08f52b5320f038780286ef312535fc64.tar.xz
linux-d4f0006a08f52b5320f038780286ef312535fc64.zip
net/smc: retain old name for diag_mode field
Commit c601171d7a60 ("net/smc: provide smc mode in smc_diag.c") changed the name of diag_fallback field of struct smc_diag_msg structure to diag_mode. However, this structure is a part of UAPI, and this change breaks user space applications that use it ([1], for example). Since the new name is more suitable, convert the field to a union that provides access to the data via both the new and the old name. [1] https://gitlab.com/strace/strace/blob/v4.24/netlink_smc_diag.c#L165 Fixes: c601171d7a60 ("net/smc: provide smc mode in smc_diag.c") Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/uapi/linux/smc_diag.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/uapi/linux/smc_diag.h b/include/uapi/linux/smc_diag.h
index 6180c6d95309..8cb3a6fef553 100644
--- a/include/uapi/linux/smc_diag.h
+++ b/include/uapi/linux/smc_diag.h
@@ -20,7 +20,10 @@ struct smc_diag_req {
struct smc_diag_msg {
__u8 diag_family;
__u8 diag_state;
- __u8 diag_mode;
+ union {
+ __u8 diag_mode;
+ __u8 diag_fallback; /* the old name of the field */
+ };
__u8 diag_shutdown;
struct inet_diag_sockid id;