diff options
| author | Luka Pivk <luka.pivk@toradex.com> | 2019-01-08 13:52:27 +0100 |
|---|---|---|
| committer | Luka Pivk <luka.pivk@toradex.com> | 2019-01-08 13:52:27 +0100 |
| commit | e9dcc568b2e968af848bbdb4267ba6cde5457b9e (patch) | |
| tree | 4cc0a7e7220770f30d0c7c6989feaa8e73c9f1c1 /drivers/infiniband/core/roce_gid_mgmt.c | |
| parent | 6a082d8b56f739188cdcbac7cf412775a20447df (diff) | |
| parent | 457e6884cb33a86aef7e86119955ee3d87da6815 (diff) | |
Merge remote-tracking branch 'remotes/origin/linux-4.19.y-rt'
Signed-off-by: Luka Pivk <luka.pivk@toradex.com>
Diffstat (limited to 'drivers/infiniband/core/roce_gid_mgmt.c')
| -rw-r--r-- | drivers/infiniband/core/roce_gid_mgmt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/infiniband/core/roce_gid_mgmt.c b/drivers/infiniband/core/roce_gid_mgmt.c index ee366199b169..25d43c8f1c2a 100644 --- a/drivers/infiniband/core/roce_gid_mgmt.c +++ b/drivers/infiniband/core/roce_gid_mgmt.c @@ -767,8 +767,10 @@ static int netdevice_event(struct notifier_block *this, unsigned long event, case NETDEV_CHANGEADDR: cmds[0] = netdev_del_cmd; - cmds[1] = add_default_gid_cmd; - cmds[2] = add_cmd; + if (ndev->reg_state == NETREG_REGISTERED) { + cmds[1] = add_default_gid_cmd; + cmds[2] = add_cmd; + } break; case NETDEV_CHANGEUPPER: |