diff options
| author | Ursula Braun <ubraun@linux.ibm.com> | 2018-06-28 20:05:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-30 14:42:25 +0300 |
| commit | be6a3f38ff2a2bfd2e591fdc566940a0d4d9428c (patch) | |
| tree | 6611f8a48f23ad8468022b5d35d4802f713974a0 /net/smc/smc_pnet.c | |
| parent | b0402f0113675ad78bc10c839f93a25348dd1f73 (diff) | |
| download | linux-be6a3f38ff2a2bfd2e591fdc566940a0d4d9428c.tar.xz | |
net/smc: determine port attributes independent from pnet table
For SMC it is important to know the current port state of RoCE devices.
Monitoring port states has been triggered, when a RoCE device was added
to the pnet table. To support future alternatives to the pnet table the
monitoring of ports is made independent of the existence of a pnet table.
It starts once the smc_ib_device is established.
Due to this change smc_ib_remember_port_attr() is now a local function
and shuffling its location and the location of its used functions
makes any forward references obsolete.
And the duplicate SMC_MAX_PORTS definition is removed.
Signed-off-by: Ursula Braun <ubraun@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 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c index d7b88b2d1b22..a82a5cad0282 100644 --- a/net/smc/smc_pnet.c +++ b/net/smc/smc_pnet.c @@ -358,9 +358,6 @@ static int smc_pnet_add(struct sk_buff *skb, struct genl_info *info) kfree(pnetelem); return rc; } - rc = smc_ib_remember_port_attr(pnetelem->smcibdev, pnetelem->ib_port); - if (rc) - smc_pnet_remove_by_pnetid(pnetelem->pnet_name); return rc; } @@ -485,10 +482,10 @@ static int smc_pnet_netdev_event(struct notifier_block *this, case NETDEV_REBOOT: case NETDEV_UNREGISTER: smc_pnet_remove_by_ndev(event_dev); + return NOTIFY_OK; default: - break; + return NOTIFY_DONE; } - return NOTIFY_DONE; } static struct notifier_block smc_netdev_notifier = { |