Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15e318bd authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

xfrm: simplify xfrm_address_t use 



In many places, the a6 field is typecasted to struct in6_addr. As the
fields are in union anyway, just add in6_addr type to the union and
get rid of the typecasting.

Modifying the uapi header is okay, the union has still the same size.

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f55db48

include/net/xfrm.h

+3 −3
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ xfrm_addr_any(const xfrm_address_t *addr, unsigned short family) 
	case AF_INET:

		return addr->a4 == 0;

	case AF_INET6:

		return ipv6_addr_any((struct in6_addr *)&addr->a6);

		return ipv6_addr_any(&addr->in6);

	}

	return 0;

}
@@ -1238,8 +1238,8 @@ void xfrm_flowi_addr_get(const struct flowi *fl, 
		memcpy(&daddr->a4, &fl->u.ip4.daddr, sizeof(daddr->a4));

		break;

	case AF_INET6:

		*(struct in6_addr *)saddr->a6 = fl->u.ip6.saddr;

		*(struct in6_addr *)daddr->a6 = fl->u.ip6.daddr;

		saddr->in6 = fl->u.ip6.saddr;

		daddr->in6 = fl->u.ip6.daddr;

		break;

	}

}

include/uapi/linux/xfrm.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_XFRM_H

#define _LINUX_XFRM_H



#include <linux/in6.h>

#include <linux/types.h>



/* All of the structures in this file may not change size as they are
@@ -13,6 +14,7 @@ 
typedef union {

	__be32		a4;

	__be32		a6[4];

	struct in6_addr	in6;

} xfrm_address_t;



/* Ident of a specific xfrm_state. It is used on input to lookup

net/ipv6/xfrm6_mode_beet.c

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb) 


	ip6h = ipv6_hdr(skb);

	ip6h->payload_len = htons(skb->len - size);

	ip6h->daddr = *(struct in6_addr *)&x->sel.daddr.a6;

	ip6h->saddr = *(struct in6_addr *)&x->sel.saddr.a6;

	ip6h->daddr = x->sel.daddr.in6;

	ip6h->saddr = x->sel.saddr.in6;

	err = 0;

out:

	return err;

net/ipv6/xfrm6_policy.c

+1 −3
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ static int xfrm6_get_saddr(struct net *net, 
		return -EHOSTUNREACH;



	dev = ip6_dst_idev(dst)->dev;

	ipv6_dev_get_saddr(dev_net(dev), dev,

			   (struct in6_addr *)&daddr->a6, 0,

			   (struct in6_addr *)&saddr->a6);

	ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, 0, &saddr->in6);

	dst_release(dst);

	return 0;

}

net/key/af_key.c

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static unsigned int pfkey_sockaddr_fill(const xfrm_address_t *xaddr, __be16 port 
		sin6->sin6_family = AF_INET6;

		sin6->sin6_port = port;

		sin6->sin6_flowinfo = 0;

		sin6->sin6_addr = *(struct in6_addr *)xaddr->a6;

		sin6->sin6_addr = xaddr->in6;

		sin6->sin6_scope_id = 0;

		return 128;

	    }