diff options
Diffstat (limited to 'net/hsr/hsr_slave.c')
| -rw-r--r-- | net/hsr/hsr_slave.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c index a348dcbcd683..7d37366cc695 100644 --- a/net/hsr/hsr_slave.c +++ b/net/hsr/hsr_slave.c | |||
| @@ -181,8 +181,10 @@ void hsr_del_port(struct hsr_port *port) | |||
| 181 | list_del_rcu(&port->port_list); | 181 | list_del_rcu(&port->port_list); |
| 182 | 182 | ||
| 183 | if (port != master) { | 183 | if (port != master) { |
| 184 | netdev_update_features(master->dev); | 184 | if (master != NULL) { |
| 185 | dev_set_mtu(master->dev, hsr_get_max_mtu(hsr)); | 185 | netdev_update_features(master->dev); |
| 186 | dev_set_mtu(master->dev, hsr_get_max_mtu(hsr)); | ||
| 187 | } | ||
| 186 | netdev_rx_handler_unregister(port->dev); | 188 | netdev_rx_handler_unregister(port->dev); |
| 187 | dev_set_promiscuity(port->dev, -1); | 189 | dev_set_promiscuity(port->dev, -1); |
| 188 | } | 190 | } |
| @@ -192,5 +194,7 @@ void hsr_del_port(struct hsr_port *port) | |||
| 192 | */ | 194 | */ |
| 193 | 195 | ||
| 194 | synchronize_rcu(); | 196 | synchronize_rcu(); |
| 195 | dev_put(port->dev); | 197 | |
| 198 | if (port != master) | ||
| 199 | dev_put(port->dev); | ||
| 196 | } | 200 | } |