diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-06 03:00:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-06 03:00:16 -0400 |
commit | 5f6b1ea41b46bc63f667f9b30d939b49734c20b0 (patch) | |
tree | a7cd8e40aaa07578267242aba8f04db65887f171 /net/atm/br2684.c | |
parent | 19443178fbfbf40db15c86012fc37df1a44ab857 (diff) |
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>
Diffstat (limited to 'net/atm/br2684.c')
-rw-r--r-- | net/atm/br2684.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 13858e2675c5..9d52ebfc1962 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
@@ -350,6 +350,7 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) | |||
350 | list_del(&brdev->br2684_devs); | 350 | list_del(&brdev->br2684_devs); |
351 | write_unlock_irq(&devs_lock); | 351 | write_unlock_irq(&devs_lock); |
352 | unregister_netdev(net_dev); | 352 | unregister_netdev(net_dev); |
353 | free_netdev(net_dev); | ||
353 | } | 354 | } |
354 | return; | 355 | return; |
355 | } | 356 | } |
@@ -770,6 +771,7 @@ static void __exit br2684_exit(void) | |||
770 | 771 | ||
771 | list_del(&brdev->br2684_devs); | 772 | list_del(&brdev->br2684_devs); |
772 | unregister_netdev(net_dev); | 773 | unregister_netdev(net_dev); |
774 | free_netdev(net_dev); | ||
773 | } | 775 | } |
774 | } | 776 | } |
775 | 777 | ||