Commit 6fc68624 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller

[NETFILTER]: Consolidate masq_inet_event and masq_device_event.

They do exactly the same job.
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5811769c
...@@ -139,18 +139,8 @@ static int masq_inet_event(struct notifier_block *this, ...@@ -139,18 +139,8 @@ static int masq_inet_event(struct notifier_block *this,
unsigned long event, unsigned long event,
void *ptr) void *ptr)
{ {
const struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev; struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
return masq_device_event(this, event, dev);
if (event == NETDEV_DOWN) {
/* IP address was deleted. Search entire table for
conntracks which were associated with that device,
and forget them. */
NF_CT_ASSERT(dev->ifindex != 0);
nf_ct_iterate_cleanup(device_cmp, (void *)(long)dev->ifindex);
}
return NOTIFY_DONE;
} }
static struct notifier_block masq_dev_notifier = { static struct notifier_block masq_dev_notifier = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment