adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Phonet: generate Netlink RTM_DELADDR when destroying a device

Browse source 
Netlink address deletion events were not sent when a network device
vanished neither when Phonet was unloaded.

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rémi Denis-Courmont 2009-06-24 01:07:45 +00:00 committed by David S. Miller
parent c7a1a4c80f
commit 2be6fa4c7e
1 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
net/phonet/pn_dev.c
View file

@ -69,10 +69,27 @@ static struct phonet_device *__phonet_get(struct net_device *dev)
return NULL; return NULL;
} }
static void __phonet_device_free(struct phonet_device *pnd) static void phonet_device_destroy(struct net_device *dev)
{ {
list_del(&pnd->list); struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
kfree(pnd); struct phonet_device *pnd;
ASSERT_RTNL();
spin_lock_bh(&pndevs->lock);
pnd = __phonet_get(dev);
if (pnd)
list_del(&pnd->list);
spin_unlock_bh(&pndevs->lock);
if (pnd) {
u8 addr;
for (addr = find_first_bit(pnd->addrs, 64); addr < 64;
addr = find_next_bit(pnd->addrs, 64, 1+addr))
phonet_address_notify(RTM_DELADDR, dev, addr);
kfree(pnd);
}
} }
struct net_device *phonet_device_get(struct net *net) struct net_device *phonet_device_get(struct net *net)
@ -126,8 +143,10 @@ int phonet_address_del(struct net_device *dev, u8 addr)
pnd = __phonet_get(dev); pnd = __phonet_get(dev);
if (!pnd || !test_and_clear_bit(addr >> 2, pnd->addrs)) if (!pnd || !test_and_clear_bit(addr >> 2, pnd->addrs))
err = -EADDRNOTAVAIL; err = -EADDRNOTAVAIL;
else if (bitmap_empty(pnd->addrs, 64)) else if (bitmap_empty(pnd->addrs, 64)) {
__phonet_device_free(pnd); list_del(&pnd->list);
kfree(pnd);
}
spin_unlock_bh(&pndevs->lock); spin_unlock_bh(&pndevs->lock);
return err; return err;
} }
@ -181,18 +200,8 @@ static int phonet_device_notify(struct notifier_block *me, unsigned long what,
{ {
struct net_device *dev = arg; struct net_device *dev = arg;
if (what == NETDEV_UNREGISTER) { if (what == NETDEV_UNREGISTER)
struct phonet_device_list *pndevs; phonet_device_destroy(dev);
struct phonet_device *pnd;
/* Destroy phonet-specific device data */
pndevs = phonet_device_list(dev_net(dev));
spin_lock_bh(&pndevs->lock);
pnd = __phonet_get(dev);
if (pnd)
__phonet_device_free(pnd);
spin_unlock_bh(&pndevs->lock);
}
return 0; return 0;
} }
@ -218,11 +227,12 @@ static int phonet_init_net(struct net *net)
static void phonet_exit_net(struct net *net) static void phonet_exit_net(struct net *net)
{ {
struct phonet_net *pnn = net_generic(net, phonet_net_id); struct phonet_net *pnn = net_generic(net, phonet_net_id);
struct phonet_device *pnd, *n; struct net_device *dev;
list_for_each_entry_safe(pnd, n, &pnn->pndevs.list, list)
__phonet_device_free(pnd);
rtnl_lock();
for_each_netdev(net, dev)
phonet_device_destroy(dev);
rtnl_unlock();
kfree(pnn); kfree(pnn);
} }