Commit 90b5ca17 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: ipmr/ip6mr: update lastuse on entry change 



Currently lastuse is updated on entry creation and cache hit, but it should
also be updated on entry change. Since both on add and update the ttl array
is updated we can simply update the lastuse in ipmr_update_thresholds.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
CC: Roopa Prabhu <roopa@cumulusnetworks.com>
CC: Donald Sharp <sharpd@cumulusnetworks.com>
CC: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3a3b626

net/ipv4/ipmr.c

+1 −1
Original line number Diff line number Diff line
@@ -722,6 +722,7 @@ static void ipmr_update_thresholds(struct mr_table *mrt, struct mfc_cache *cache 
				cache->mfc_un.res.maxvif = vifi + 1;

		}

	}

	cache->mfc_un.res.lastuse = jiffies;

}



static int vif_add(struct net *net, struct mr_table *mrt,
@@ -1150,7 +1151,6 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt, 
	c->mfc_origin = mfc->mfcc_origin.s_addr;

	c->mfc_mcastgrp = mfc->mfcc_mcastgrp.s_addr;

	c->mfc_parent = mfc->mfcc_parent;

	c->mfc_un.res.lastuse = jiffies;

	ipmr_update_thresholds(mrt, c, mfc->mfcc_ttls);

	if (!mrtsock)

		c->mfc_flags |= MFC_STATIC;

net/ipv6/ip6mr.c

+1 −1
Original line number Diff line number Diff line
@@ -921,6 +921,7 @@ static void ip6mr_update_thresholds(struct mr6_table *mrt, struct mfc6_cache *ca 
				cache->mfc_un.res.maxvif = vifi + 1;

		}

	}

	cache->mfc_un.res.lastuse = jiffies;

}



static int mif6_add(struct net *net, struct mr6_table *mrt,
@@ -1500,7 +1501,6 @@ static int ip6mr_mfc_add(struct net *net, struct mr6_table *mrt, 
	c->mf6c_origin = mfc->mf6cc_origin.sin6_addr;

	c->mf6c_mcastgrp = mfc->mf6cc_mcastgrp.sin6_addr;

	c->mf6c_parent = mfc->mf6cc_parent;

	c->mfc_un.res.lastuse = jiffies;

	ip6mr_update_thresholds(mrt, c, ttls);

	if (!mrtsock)

		c->mfc_flags |= MFC_STATIC;

CRA Git | Maintained and supported by SUSTech CRA and CCSE