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

Commit 6700c270 authored by David S. Miller's avatar David S. Miller
Browse files

net: Pass optional SKB and SK arguments to dst_ops->{update_pmtu,redirect}() 



This will be used so that we can compose a full flow key.

Even though we have a route in this context, we need more.  In the
future the routes will be without destination address, source address,
etc. keying.  One ipv4 route will cover entire subnets, etc.

In this environment we have to have a way to possess persistent storage
for redirects and PMTU information.  This persistent storage will exist
in the FIB tables, and that's why we'll need to be able to rebuild a
full lookup flow key here.  Using that flow key will do a fib_lookup()
and create/update the persistent entry.

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

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ void ipoib_cm_skb_too_long(struct net_device *dev, struct sk_buff *skb, 
	int e = skb_queue_empty(&priv->cm.skb_queue);



	if (skb_dst(skb))

		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), mtu);

		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);



	skb_queue_tail(&priv->cm.skb_queue, skb);

	if (e)

include/net/dst_ops.h

+4 −2
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ struct dst_ops { 
					  struct net_device *dev, int how);

	struct dst_entry *	(*negative_advice)(struct dst_entry *);

	void			(*link_failure)(struct sk_buff *);

	void			(*update_pmtu)(struct dst_entry *dst, u32 mtu);

	void			(*redirect)(struct dst_entry *dst, struct sk_buff *skb);

	void			(*update_pmtu)(struct dst_entry *dst, struct sock *sk,

					       struct sk_buff *skb, u32 mtu);

	void			(*redirect)(struct dst_entry *dst, struct sock *sk,

					    struct sk_buff *skb);

	int			(*local_out)(struct sk_buff *skb);

	struct neighbour *	(*neigh_lookup)(const struct dst_entry *dst,

						struct sk_buff *skb,

net/bridge/br_netfilter.c

+4 −2
Original line number Diff line number Diff line
@@ -111,11 +111,13 @@ static inline __be16 pppoe_proto(const struct sk_buff *skb) 
	 pppoe_proto(skb) == htons(PPP_IPV6) && \

	 brnf_filter_pppoe_tagged)



static void fake_update_pmtu(struct dst_entry *dst, u32 mtu)

static void fake_update_pmtu(struct dst_entry *dst, struct sock *sk,

			     struct sk_buff *skb, u32 mtu)

{

}



static void fake_redirect(struct dst_entry *dst, struct sk_buff *skb)

static void fake_redirect(struct dst_entry *dst, struct sock *sk,

			  struct sk_buff *skb)

{

}

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void dccp_do_redirect(struct sk_buff *skb, struct sock *sk) 
	struct dst_entry *dst = __sk_dst_check(sk, 0);



	if (dst)

		dst->ops->redirect(dst, skb);

		dst->ops->redirect(dst, sk, skb);

}



/*

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
		struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie);



		if (dst)

			dst->ops->redirect(dst, skb);

			dst->ops->redirect(dst, sk, skb);

	}



	if (type == ICMPV6_PKT_TOOBIG) {