diff options
| author |   Michael Chan <mchan@broadcom.com> | 2013-07-28 19:03:55 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-07-29 22:03:06 -0700 |
| commit | 415fb87da80fa45a9cbe820cb2a86e70668688eb (patch) | |
| tree | 0f3a425e6c0e63ecbfb39353c492dbb42ff971c4 /drivers/net/ethernet/broadcom/cnic.c | |
| parent | net/mlx4_core: Respond to operation request by firmware (diff) | |
| download | linux-dev-415fb87da80fa45a9cbe820cb2a86e70668688eb.tar.xz linux-dev-415fb87da80fa45a9cbe820cb2a86e70668688eb.zip | |
cnic: Simplify netdev events handling.
After this earlier commit to simplify probing:
commit 4bd9b0fffb193d2e288f67f81821af32df8d4349
cnic, bnx2x, bnx2: Simplify cnic probing.
we can now reliably receive netdev events and we can simplify the handling
of these events. We now remove the logic that tries to handle missed
NETDEV_REGISTER events.
This change will allow cleanup to be simplified in the next patch. We can
now rely on the play back of netdev events during
unregister_netdevice_notifier() to cleanup the structures.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index d78d4cf140ed..764bfc158949 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c @@ -5628,7 +5628,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event, dev = cnic_from_netdev(netdev); - if (!dev && (event == NETDEV_REGISTER || netif_running(netdev))) { + if (!dev && event == NETDEV_REGISTER) { /* Check for the hot-plug device */ dev = is_cnic_dev(netdev); if (dev) { @@ -5644,7 +5644,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event, else if (event == NETDEV_UNREGISTER) cnic_ulp_exit(dev); - if (event == NETDEV_UP || (new_dev && netif_running(netdev))) { + if (event == NETDEV_UP) { if (cnic_register_netdev(dev) != 0) { cnic_put(dev); goto done; |