mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-16 23:45:31 +08:00
cnic: Simplify netdev events handling.
After this earlier commit to simplify probing:
commit 4bd9b0fffb
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>
This commit is contained in:
parent
fe6f700d6c
commit
415fb87da8
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user