Merge tag 'docs-5.6-2' of git://git.lwn.net/linux

[linux.git] / net / smc / smc_clc.h

diff --git a/net/smc/smc_clc.h b/net/smc/smc_clc.h
index 24658e8c0de42bfa182cd7379bb79850eb3936a5..ca209272e5fa698df643807174b1ce3501ed6215 100644 (file)
--- a/net/smc/smc_clc.h
+++ b/net/smc/smc_clc.h
@@ -34,16 +34,22 @@
 #define SMC_CLC_DECL_CNFERR    0x03000000  /* configuration error            */
 #define SMC_CLC_DECL_PEERNOSMC 0x03010000  /* peer did not indicate SMC      */
 #define SMC_CLC_DECL_IPSEC     0x03020000  /* IPsec usage                    */
-#define SMC_CLC_DECL_NOSMCDEV  0x03030000  /* no SMC device found            */
+#define SMC_CLC_DECL_NOSMCDEV  0x03030000  /* no SMC device found (R or D)   */
+#define SMC_CLC_DECL_NOSMCDDEV 0x03030001  /* no SMC-D device found          */
+#define SMC_CLC_DECL_NOSMCRDEV 0x03030002  /* no SMC-R device found          */
+#define SMC_CLC_DECL_SMCDNOTALK        0x03030003  /* SMC-D dev can't talk to peer   */
 #define SMC_CLC_DECL_MODEUNSUPP        0x03040000  /* smc modes do not match (R or D)*/
 #define SMC_CLC_DECL_RMBE_EC   0x03050000  /* peer has eyecatcher in RMBE    */
 #define SMC_CLC_DECL_OPTUNSUPP 0x03060000  /* fastopen sockopt not supported */
+#define SMC_CLC_DECL_DIFFPREFIX        0x03070000  /* IP prefix / subnet mismatch    */
+#define SMC_CLC_DECL_GETVLANERR        0x03080000  /* err to get vlan id of ip device*/
+#define SMC_CLC_DECL_ISMVLANERR        0x03090000  /* err to reg vlan id on ism dev  */
 #define SMC_CLC_DECL_SYNCERR   0x04000000  /* synchronization error          */
 #define SMC_CLC_DECL_PEERDECL  0x05000000  /* peer declined during handshake */
-#define SMC_CLC_DECL_INTERR    0x99990000  /* internal error                 */
-#define SMC_CLC_DECL_ERR_RTOK  0x99990001  /*   rtoken handling failed       */
-#define SMC_CLC_DECL_ERR_RDYLNK        0x99990002  /*   ib ready link failed         */
-#define SMC_CLC_DECL_ERR_REGRMB        0x99990003  /*   reg rmb failed               */
+#define SMC_CLC_DECL_INTERR    0x09990000  /* internal error                 */
+#define SMC_CLC_DECL_ERR_RTOK  0x09990001  /*   rtoken handling failed       */
+#define SMC_CLC_DECL_ERR_RDYLNK        0x09990002  /*   ib ready link failed         */
+#define SMC_CLC_DECL_ERR_REGRMB        0x09990003  /*   reg rmb failed               */
 
 struct smc_clc_msg_hdr {       /* header1 of clc messages */
        u8 eyecatcher[4];       /* eye catcher */
@@ -179,6 +185,7 @@ smc_get_clc_msg_smcd(struct smc_clc_msg_proposal *prop)
 }
 
 struct smcd_dev;
+struct smc_init_info;
 
 int smc_clc_prfx_match(struct socket *clcsock,
                       struct smc_clc_msg_proposal_prefix *prop);
@@ -186,8 +193,7 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,
                     u8 expected_type, unsigned long timeout);
 int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info);
 int smc_clc_send_proposal(struct smc_sock *smc, int smc_type,
-                         struct smc_ib_device *smcibdev, u8 ibport, u8 gid[],
-                         struct smcd_dev *ismdev);
+                         struct smc_init_info *ini);
 int smc_clc_send_confirm(struct smc_sock *smc);
 int smc_clc_send_accept(struct smc_sock *smc, int srv_first_contact);