diff options
Diffstat (limited to 'net/core/failover.c')
-rw-r--r-- | net/core/failover.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/failover.c b/net/core/failover.c index 4a92a98ccce9..b5cd3c727285 100644 --- a/net/core/failover.c +++ b/net/core/failover.c | |||
@@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev) | |||
80 | goto err_upper_link; | 80 | goto err_upper_link; |
81 | } | 81 | } |
82 | 82 | ||
83 | slave_dev->priv_flags |= IFF_FAILOVER_SLAVE; | 83 | slave_dev->priv_flags |= (IFF_FAILOVER_SLAVE | IFF_LIVE_RENAME_OK); |
84 | 84 | ||
85 | if (fops && fops->slave_register && | 85 | if (fops && fops->slave_register && |
86 | !fops->slave_register(slave_dev, failover_dev)) | 86 | !fops->slave_register(slave_dev, failover_dev)) |
87 | return NOTIFY_OK; | 87 | return NOTIFY_OK; |
88 | 88 | ||
89 | netdev_upper_dev_unlink(slave_dev, failover_dev); | 89 | netdev_upper_dev_unlink(slave_dev, failover_dev); |
90 | slave_dev->priv_flags &= ~IFF_FAILOVER_SLAVE; | 90 | slave_dev->priv_flags &= ~(IFF_FAILOVER_SLAVE | IFF_LIVE_RENAME_OK); |
91 | err_upper_link: | 91 | err_upper_link: |
92 | netdev_rx_handler_unregister(slave_dev); | 92 | netdev_rx_handler_unregister(slave_dev); |
93 | done: | 93 | done: |
@@ -121,7 +121,7 @@ int failover_slave_unregister(struct net_device *slave_dev) | |||
121 | 121 | ||
122 | netdev_rx_handler_unregister(slave_dev); | 122 | netdev_rx_handler_unregister(slave_dev); |
123 | netdev_upper_dev_unlink(slave_dev, failover_dev); | 123 | netdev_upper_dev_unlink(slave_dev, failover_dev); |
124 | slave_dev->priv_flags &= ~IFF_FAILOVER_SLAVE; | 124 | slave_dev->priv_flags &= ~(IFF_FAILOVER_SLAVE | IFF_LIVE_RENAME_OK); |
125 | 125 | ||
126 | if (fops && fops->slave_unregister && | 126 | if (fops && fops->slave_unregister && |
127 | !fops->slave_unregister(slave_dev, failover_dev)) | 127 | !fops->slave_unregister(slave_dev, failover_dev)) |