diff options
| author | Ursula Braun <ubraun@linux.ibm.com> | 2020-09-26 12:44:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-28 15:19:02 -0700 |
| commit | 3fc6493761372c5f6ff84d407c58948b8f2ee360 (patch) | |
| tree | cda77cd4ea341fde84a3ec0b9e5faab34b96e7c1 /net/smc/smc_pnet.c | |
| parent | e15c6c46dedd7ec307ccc0d38de4743b109adfc6 (diff) | |
| download | lwn-3fc6493761372c5f6ff84d407c58948b8f2ee360.tar.gz lwn-3fc6493761372c5f6ff84d407c58948b8f2ee360.zip | |
net/smc: prepare for more proposed ISM devices
SMCD Version 2 allows proposing of up to 8 ISM devices in addition
to the native ISM device of SMCD Version 1.
This patch prepares the struct smc_init_info to deal with these
additional 8 ISM devices.
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_pnet.c')
| -rw-r--r-- | net/smc/smc_pnet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c index 0af5b4acca30..0b0f2704026f 100644 --- a/net/smc/smc_pnet.c +++ b/net/smc/smc_pnet.c @@ -933,10 +933,10 @@ static void smc_pnet_find_ism_by_pnetid(struct net_device *ndev, list_for_each_entry(ismdev, &smcd_dev_list.list, list) { if (smc_pnet_match(ismdev->pnetid, ndev_pnetid) && !ismdev->going_away && - (!ini->ism_peer_gid || - !smc_ism_cantalk(ini->ism_peer_gid, ini->vlan_id, + (!ini->ism_peer_gid[0] || + !smc_ism_cantalk(ini->ism_peer_gid[0], ini->vlan_id, ismdev))) { - ini->ism_dev = ismdev; + ini->ism_dev[0] = ismdev; break; } } @@ -970,7 +970,7 @@ void smc_pnet_find_ism_resource(struct sock *sk, struct smc_init_info *ini) { struct dst_entry *dst = sk_dst_get(sk); - ini->ism_dev = NULL; + ini->ism_dev[0] = NULL; if (!dst) goto out; if (!dst->dev) |