Skip to content

Commit

Permalink
[NETFILTER]: Consolidate masq_inet_event and masq_device_event.
Browse files Browse the repository at this point in the history
They do exactly the same job.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Denis V. Lunev authored and David S. Miller committed Feb 29, 2008
1 parent 5811769 commit 6fc6862
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions net/ipv4/netfilter/ipt_MASQUERADE.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,8 @@ static int masq_inet_event(struct notifier_block *this,
unsigned long event,
void *ptr)
{
const struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->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;
struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
return masq_device_event(this, event, dev);
}

static struct notifier_block masq_dev_notifier = {
Expand Down

0 comments on commit 6fc6862

Please sign in to comment.