Commit 5f6b1ea41b46bc63f667f9b30d939b49734c20b0
1 parent
19443178fb
Exists in
master
and in
7 other branches
Revert "atm: Do not free already unregistered net device."
This reverts commit 65e4113684e50cee75357ce10dc9026b0929e4e9. Unlike the other cases Pavel fixed, this case did not setup a netdev->destructor of free_netdev, therefore this change was not correct. Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff
net/atm/br2684.c
| ... | ... | @@ -350,6 +350,7 @@ |
| 350 | 350 | list_del(&brdev->br2684_devs); |
| 351 | 351 | write_unlock_irq(&devs_lock); |
| 352 | 352 | unregister_netdev(net_dev); |
| 353 | + free_netdev(net_dev); | |
| 353 | 354 | } |
| 354 | 355 | return; |
| 355 | 356 | } |
| ... | ... | @@ -770,6 +771,7 @@ |
| 770 | 771 | |
| 771 | 772 | list_del(&brdev->br2684_devs); |
| 772 | 773 | unregister_netdev(net_dev); |
| 774 | + free_netdev(net_dev); | |
| 773 | 775 | } |
| 774 | 776 | } |
| 775 | 777 |