Commit c601171d authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller
Browse files

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: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a2ad362

include/uapi/linux/smc_diag.h

+8 −1
Original line number Diff line number Diff line
@@ -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 {

net/smc/smc_diag.c

+6 −1
Original line number Diff line number Diff line
@@ -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;