Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2a322a0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-smc-userspace-breakage-fixes' 



Eugene Syromiatnikov says:

====================
net/smc: userspace breakage fixes

These two patches correct some userspace-affecting issues introduced
during 4.19 development cycle, specifically:
 * New structure "struct smcd_diag_dmbinfo" has been defined in a way
   that would lead to different layout of the structure on most 32-bit
   ABIs in comparison with layout on 64-bit ABIs;
 * One of the commits renamed an UAPI-exposed field name.

Changes since v1:
 * Managed not to forget to add --cover-letter.
 * Commit ID format in commit message has been changed in accordance
   with Sergei Shtylyov's recommendations.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d4c4077 d4f0006a

include/uapi/linux/smc_diag.h

+14 −11
Original line number Diff line number Diff line
@@ -20,12 +20,15 @@ struct smc_diag_req { 
struct smc_diag_msg {

	__u8		diag_family;

	__u8		diag_state;

	union {

		__u8	diag_mode;

		__u8	diag_fallback; /* the old name of the field */

	};

	__u8		diag_shutdown;

	struct inet_diag_sockid id;



	__u32		diag_uid;

	__u64	diag_inode;

	__aligned_u64	diag_inode;

};



/* Mode of a connection */
@@ -100,10 +103,10 @@ struct smc_diag_fallback { 


struct smcd_diag_dmbinfo {		/* SMC-D Socket internals */

	__u32		linkid;		/* Link identifier */

	__u64 peer_gid;			/* Peer GID */

	__u64 my_gid;			/* My GID */

	__u64 token;			/* Token of DMB */

	__u64 peer_token;		/* Token of remote DMBE */

	__aligned_u64	peer_gid;	/* Peer GID */

	__aligned_u64	my_gid;		/* My GID */

	__aligned_u64	token;		/* Token of DMB */

	__aligned_u64	peer_token;	/* Token of remote DMBE */

};



#endif /* _UAPI_SMC_DIAG_H_ */