Cleanup the xfrm4_tunnel_(un)register
Subsystems (2)
PATCH 3/4 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 <[email protected]>
---
net/ipv4/tunnel4.c +7 -4
@@ -18,6 +18,11 @@ static struct xfrm_tunnel *tunnel4_handlers;static struct xfrm_tunnel *tunnel64_handlers;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) {struct xfrm_tunnel **pprev;
@@ -26,8 +31,7 @@ int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family)mutex_lock (&tunnel4_mutex); -for (pprev = (family ==AF_INET ) ? &tunnel4_handlers : &tunnel64_handlers; - *pprev; pprev = &(*pprev)->next) { +for (pprev =fam_handlers (family); *pprev; pprev = &(*pprev)->next) {if ((*pprev)->priority > priority)break ;if ((*pprev)->priority == priority)
@@ -54,8 +58,7 @@ int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family)mutex_lock (&tunnel4_mutex); -for (pprev = (family ==AF_INET ) ? &tunnel4_handlers : &tunnel64_handlers; - *pprev; pprev = &(*pprev)->next) { +for (pprev =fam_handlers (family); *pprev; pprev = &(*pprev)->next) {if (*pprev == handler) { *pprev = handler->next; ret =0 ;
Signature · 1 line
1.5.3.4
From: Pavel Emelyanov <[email protected]>
Date: Fri, 09 Nov 2007 16:16:23 +0300
Quoted 4 lines
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 <[email protected]>
Applied, thanks.