diff options
| author | davem <davem> | 2001-12-05 09:10:35 +0000 |
|---|---|---|
| committer | davem <davem> | 2001-12-05 09:10:35 +0000 |
| commit | 0c3fc2be470a61cc411b070a85dca0592c415273 (patch) | |
| tree | 4675beffcb1a36da5b367e5f003ab1fc1fadf82f | |
| parent | dc179e38f644c565ffc09366701e72816fd1b1d6 (diff) | |
| download | netdev-vger-cvs-0c3fc2be470a61cc411b070a85dca0592c415273.tar.gz | |
Fix OOPS on module unload, from
Eran Man. Set NETIF_F_DYNALLOC in netdev features.
Do not kfree dev in vlan_dev_destruct.
| -rw-r--r-- | net/8021q/vlan.c | 1 | ||||
| -rw-r--r-- | net/8021q/vlan_dev.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 3a50dd791..f6be310ed 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -344,6 +344,7 @@ struct net_device *register_802_1Q_vlan_device(const char* eth_IF_name, /* set up method calls */ new_dev->init = vlan_dev_init; new_dev->destructor = vlan_dev_destruct; + new_dev->features |= NETIF_F_DYNALLOC ; /* new_dev->ifindex = 0; it will be set when added to * the global list. diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 8c6522cb7..7da75dbad 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -511,10 +511,6 @@ void vlan_dev_destruct(struct net_device *dev) VLAN_FMEM_DBG("dev->priv free, addr: %p\n", dev->priv); dev->priv = NULL; } - - kfree(dev); - VLAN_FMEM_DBG("net_device free, addr: %p\n", dev); - dev = NULL; } } |