net/smc: provide smc mode in smc_diag.c

Rename field diag_fallback into diag_mode and set the smc mode of a
connection explicitly.

Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/smc_diag.h b/include/uapi/linux/smc_diag.h
index 92be255e534c741844ade9a727ee82309240b619..48ae3ee22b2db09589ea39019ffe82aaf036703c 100644 (file)
--- a/include/uapi/linux/smc_diag.h
+++ b/include/uapi/linux/smc_diag.h
@@ -20,7 +20,7 @@ struct smc_diag_req {
 struct smc_diag_msg {
        __u8    diag_family;
        __u8    diag_state;
-       __u8    diag_fallback;
+       __u8    diag_mode;
        __u8    diag_shutdown;
        struct inet_diag_sockid id;
 
@@ -28,6 +28,13 @@ struct smc_diag_msg {
        __u64   diag_inode;
 };
 
+/* Mode of a connection */
+enum {
+       SMC_DIAG_MODE_SMCR,
+       SMC_DIAG_MODE_FALLBACK_TCP,
+       SMC_DIAG_MODE_SMCD,
+};
+
 /* Extensions */
 
 enum {

diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c
index 6d83eef1b743da03cd06302076236d5a668b33e6..d772cd10297edc77b6ae0c5485f78c198e97a717 100644 (file)
--- a/net/smc/smc_diag.c
+++ b/net/smc/smc_diag.c
@@ -91,7 +91,12 @@ static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb,
        r = nlmsg_data(nlh);
        smc_diag_msg_common_fill(r, sk);
        r->diag_state = sk->sk_state;
-       r->diag_fallback = smc->use_fallback;
+       if (smc->use_fallback)
+               r->diag_mode = SMC_DIAG_MODE_FALLBACK_TCP;
+       else if (smc->conn.lgr && smc->conn.lgr->is_smcd)
+               r->diag_mode = SMC_DIAG_MODE_SMCD;
+       else
+               r->diag_mode = SMC_DIAG_MODE_SMCR;
        user_ns = sk_user_ns(NETLINK_CB(cb->skb).sk);
        if (smc_diag_msg_attrs_fill(sk, skb, r, user_ns))
                goto errout;