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

Commit 56bb8059 authored by David S. Miller's avatar David S. Miller
Browse files

net: Break struct flowi out into AF specific instances. 



Now we have struct flowi4, flowi6, and flowidn for each address
family.  And struct flowi is just a union of them all.

It might have been troublesome to convert flow_cache_uli_match() but
as it turns out this function is completely unused and therefore can
be simply removed.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6281dcc9

include/net/dn.h

+2 −2
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ static inline void dn_dn2eth(unsigned char *ethaddr, __le16 addr) 


static inline void dn_sk_ports_copy(struct flowi *fl, struct dn_scp *scp)

{

	fl->uli_u.dnports.sport = scp->addrloc;

	fl->uli_u.dnports.dport = scp->addrrem;

	fl->u.dn.uli.ports.sport = scp->addrloc;

	fl->u.dn.uli.ports.dport = scp->addrrem;

}



extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);

include/net/flow.h

+57 −57
Original line number Diff line number Diff line
@@ -48,61 +48,68 @@ union flowi_uli { 
	} mht;

};



struct flowi {

struct flowi4 {

	struct flowi_common	__fl_common;

#define flowi_oif		__fl_common.flowic_oif

#define flowi_iif		__fl_common.flowic_iif

#define flowi_mark		__fl_common.flowic_mark

#define flowi_tos		__fl_common.flowic_tos

#define flowi_scope		__fl_common.flowic_scope

#define flowi_proto		__fl_common.flowic_proto

#define flowi_flags		__fl_common.flowic_flags

#define flowi_secid		__fl_common.flowic_secid



	union {

		struct {

	__be32			daddr;

	__be32			saddr;

		} ip4_u;

	union flowi_uli		uli;

};



		struct {

struct flowi6 {

	struct flowi_common	__fl_common;

	struct in6_addr		daddr;

	struct in6_addr		saddr;

	__be32			flowlabel;

		} ip6_u;

	union flowi_uli		uli;

};



		struct {

struct flowidn {

	struct flowi_common	__fl_common;

	__le16			daddr;

	__le16			saddr;

			__u8			scope;

		} dn_u;

	} nl_u;

#define fld_dst		nl_u.dn_u.daddr

#define fld_src		nl_u.dn_u.saddr

#define fld_scope	nl_u.dn_u.scope

#define fl6_dst		nl_u.ip6_u.daddr

#define fl6_src		nl_u.ip6_u.saddr

#define fl6_flowlabel	nl_u.ip6_u.flowlabel

#define fl4_dst		nl_u.ip4_u.daddr

#define fl4_src		nl_u.ip4_u.saddr

	union flowi_uli		uli;

};



struct flowi {

	union {

		struct flowi_common	__fl_common;

		struct flowi4		ip4;

		struct flowi6		ip6;

		struct flowidn		dn;

	} u;

#define flowi_oif	u.__fl_common.flowic_oif

#define flowi_iif	u.__fl_common.flowic_iif

#define flowi_mark	u.__fl_common.flowic_mark

#define flowi_tos	u.__fl_common.flowic_tos

#define flowi_scope	u.__fl_common.flowic_scope

#define flowi_proto	u.__fl_common.flowic_proto

#define flowi_flags	u.__fl_common.flowic_flags

#define flowi_secid	u.__fl_common.flowic_secid

#define fl4_tos		flowi_tos

#define fl4_scope	flowi_scope



	union flowi_uli uli_u;

#define fl4_sport	uli_u.ports.sport

#define fl4_dport	uli_u.ports.dport

#define fl4_icmp_type	uli_u.icmpt.type

#define fl4_icmp_code	uli_u.icmpt.code

#define fl4_ipsec_spi	uli_u.spi

#define fl4_mh_type	uli_u.mht.type

#define fl4_gre_key	uli_u.gre_key

#define fl6_sport	uli_u.ports.sport

#define fl6_dport	uli_u.ports.dport

#define fl6_icmp_type	uli_u.icmpt.type

#define fl6_icmp_code	uli_u.icmpt.code

#define fl6_ipsec_spi	uli_u.spi

#define fl6_mh_type	uli_u.mht.type

#define fl6_gre_key	uli_u.gre_key

#define fld_scope	flowi_scope



#define fld_dst		u.dn.daddr

#define fld_src		u.dn.saddr

#define fl6_dst		u.ip6.daddr

#define fl6_src		u.ip6.saddr

#define fl6_flowlabel	u.ip6.flowlabel

#define fl4_dst		u.ip4.daddr

#define fl4_src		u.ip4.saddr

#define fl4_sport	u.ip4.uli.ports.sport

#define fl4_dport	u.ip4.uli.ports.dport

#define fl4_icmp_type	u.ip4.uli.icmpt.type

#define fl4_icmp_code	u.ip4.uli.icmpt.code

#define fl4_ipsec_spi	u.ip4.uli.spi

#define fl4_mh_type	u.ip4.uli.mht.type

#define fl4_gre_key	u.ip4.uli.gre_key

#define fl6_sport	u.ip6.uli.ports.sport

#define fl6_dport	u.ip6.uli.ports.dport

#define fl6_icmp_type	u.ip6.uli.icmpt.type

#define fl6_icmp_code	u.ip6.uli.icmpt.code

#define fl6_ipsec_spi	u.ip6.uli.spi

#define fl6_mh_type	u.ip6.uli.mht.type

#define fl6_gre_key	u.ip6.uli.gre_key

} __attribute__((__aligned__(BITS_PER_LONG/8)));



#define FLOW_DIR_IN	0
@@ -134,11 +141,4 @@ extern struct flow_cache_object *flow_cache_lookup( 
extern void flow_cache_flush(void);

extern atomic_t flow_cache_genid;



static inline int flow_cache_uli_match(const struct flowi *fl1,

				       const struct flowi *fl2)

{

	return (fl1->flowi_proto == fl2->flowi_proto &&

		!memcmp(&fl1->uli_u, &fl2->uli_u, sizeof(fl1->uli_u)));

}



#endif

net/ipv4/xfrm4_state.c

+2 −2
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ __xfrm4_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl) 
{

	sel->daddr.a4 = fl->fl4_dst;

	sel->saddr.a4 = fl->fl4_src;

	sel->dport = xfrm_flowi_dport(fl, &fl->uli_u);

	sel->dport = xfrm_flowi_dport(fl, &fl->u.ip4.uli);

	sel->dport_mask = htons(0xffff);

	sel->sport = xfrm_flowi_sport(fl, &fl->uli_u);

	sel->sport = xfrm_flowi_sport(fl, &fl->u.ip4.uli);

	sel->sport_mask = htons(0xffff);

	sel->family = AF_INET;

	sel->prefixlen_d = 32;

net/ipv6/mip6.c

+2 −2
Original line number Diff line number Diff line
@@ -241,10 +241,10 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb, 
	sel.prefixlen_s = 128;

	sel.family = AF_INET6;

	sel.proto = fl->flowi_proto;

	sel.dport = xfrm_flowi_dport(fl, &fl->uli_u);

	sel.dport = xfrm_flowi_dport(fl, &fl->u.ip6.uli);

	if (sel.dport)

		sel.dport_mask = htons(~0);

	sel.sport = xfrm_flowi_sport(fl, &fl->uli_u);

	sel.sport = xfrm_flowi_sport(fl, &fl->u.ip6.uli);

	if (sel.sport)

		sel.sport_mask = htons(~0);

	sel.ifindex = fl->flowi_oif;

net/ipv6/xfrm6_state.c

+2 −2
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ __xfrm6_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl) 
	 * to current session. */

	ipv6_addr_copy((struct in6_addr *)&sel->daddr, &fl->fl6_dst);

	ipv6_addr_copy((struct in6_addr *)&sel->saddr, &fl->fl6_src);

	sel->dport = xfrm_flowi_dport(fl, &fl->uli_u);

	sel->dport = xfrm_flowi_dport(fl, &fl->u.ip6.uli);

	sel->dport_mask = htons(0xffff);

	sel->sport = xfrm_flowi_sport(fl, &fl->uli_u);

	sel->sport = xfrm_flowi_sport(fl, &fl->u.ip6.uli);

	sel->sport_mask = htons(0xffff);

	sel->family = AF_INET6;

	sel->prefixlen_d = 128;