[INET]: Cleanup the xfrm4_tunnel_(un)register
Both check for the family to select an appropriate tunnel list. Consolidate this check and make the for() loop more readable. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
99f933263a
commit
358352b8b8
|
@ -17,6 +17,11 @@ static struct xfrm_tunnel *tunnel4_handlers;
|
||||||
static struct xfrm_tunnel *tunnel64_handlers;
|
static struct xfrm_tunnel *tunnel64_handlers;
|
||||||
static DEFINE_MUTEX(tunnel4_mutex);
|
static DEFINE_MUTEX(tunnel4_mutex);
|
||||||
|
|
||||||
|
static inline struct xfrm_tunnel **fam_handlers(unsigned short family)
|
||||||
|
{
|
||||||
|
return (family == AF_INET) ? &tunnel4_handlers : &tunnel64_handlers;
|
||||||
|
}
|
||||||
|
|
||||||
int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family)
|
int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family)
|
||||||
{
|
{
|
||||||
struct xfrm_tunnel **pprev;
|
struct xfrm_tunnel **pprev;
|
||||||
|
@ -25,8 +30,7 @@ int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family)
|
||||||
|
|
||||||
mutex_lock(&tunnel4_mutex);
|
mutex_lock(&tunnel4_mutex);
|
||||||
|
|
||||||
for (pprev = (family == AF_INET) ? &tunnel4_handlers : &tunnel64_handlers;
|
for (pprev = fam_handlers(family); *pprev; pprev = &(*pprev)->next) {
|
||||||
*pprev; pprev = &(*pprev)->next) {
|
|
||||||
if ((*pprev)->priority > priority)
|
if ((*pprev)->priority > priority)
|
||||||
break;
|
break;
|
||||||
if ((*pprev)->priority == priority)
|
if ((*pprev)->priority == priority)
|
||||||
|
@ -53,8 +57,7 @@ int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family)
|
||||||
|
|
||||||
mutex_lock(&tunnel4_mutex);
|
mutex_lock(&tunnel4_mutex);
|
||||||
|
|
||||||
for (pprev = (family == AF_INET) ? &tunnel4_handlers : &tunnel64_handlers;
|
for (pprev = fam_handlers(family); *pprev; pprev = &(*pprev)->next) {
|
||||||
*pprev; pprev = &(*pprev)->next) {
|
|
||||||
if (*pprev == handler) {
|
if (*pprev == handler) {
|
||||||
*pprev = handler->next;
|
*pprev = handler->next;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
Loading…
Reference in New Issue