diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-06 00:00:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-06 00:00:16 -0700 |
| commit | 5f6b1ea41b46bc63f667f9b30d939b49734c20b0 (patch) | |
| tree | a7cd8e40aaa07578267242aba8f04db65887f171 /net | |
| parent | 19443178fbfbf40db15c86012fc37df1a44ab857 (diff) | |
| download | linux-3.10-5f6b1ea41b46bc63f667f9b30d939b49734c20b0.tar.gz linux-3.10-5f6b1ea41b46bc63f667f9b30d939b49734c20b0.tar.bz2 linux-3.10-5f6b1ea41b46bc63f667f9b30d939b49734c20b0.zip | |
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')
| -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 13858e2675c..9d52ebfc196 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) list_del(&brdev->br2684_devs); write_unlock_irq(&devs_lock); unregister_netdev(net_dev); + free_netdev(net_dev); } return; } @@ -770,6 +771,7 @@ static void __exit br2684_exit(void) list_del(&brdev->br2684_devs); unregister_netdev(net_dev); + free_netdev(net_dev); } } |