net/smc: remember PNETID of IB device for later device matching

The PNETID is needed to find an alternate link for a link group.
Save the PNETID of the link that is used to create the link group for
later device matching.

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

diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index 4c3af05d76a5b578b04008952f83c7be08a691b4..d7ab92fc5b150cc7a0b588ccba27710a8cade2a3 100644 (file)
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -413,6 +413,8 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini)
                lgr->role = smc->listen_smc ? SMC_SERV : SMC_CLNT;
                memcpy(lgr->peer_systemid, ini->ib_lcl->id_for_peer,
                       SMC_SYSTEMID_LEN);
+               memcpy(lgr->pnet_id, ini->ib_dev->pnetid[ini->ib_port - 1],
+                      SMC_MAX_PNETID_LEN);
                smc_llc_lgr_init(lgr, smc);
 
                link_idx = SMC_SINGLE_LINK;

diff --git a/net/smc/smc_core.h b/net/smc/smc_core.h
index aa198dd0f0e4dae3c93ab4232c71407fc22d0c46..413eaad50c7f34f57c6e8b4b4bcfa3e448ed5a9a 100644 (file)
--- a/net/smc/smc_core.h
+++ b/net/smc/smc_core.h
@@ -244,6 +244,8 @@ struct smc_link_group {
                        u8                      next_link_id;
                        enum smc_lgr_type       type;
                                                /* redundancy state */
+                       u8                      pnet_id[SMC_MAX_PNETID_LEN + 1];
+                                               /* pnet id of this lgr */
                        struct list_head        llc_event_q;
                                                /* queue for llc events */
                        spinlock_t              llc_event_q_lock;