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

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

inet: Pass flowi to ->queue_xmit(). 



This allows us to acquire the exact route keying information from the
protocol, however that might be managed.

It handles all of the possibilities, from the simplest case of storing
the key in inet->cork.fl to the more complex setup SCTP has where
individual transports determine the flow.

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

include/net/inet6_connection_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -41,5 +41,5 @@ extern void inet6_csk_reqsk_queue_hash_add(struct sock *sk, 


extern void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);



extern int inet6_csk_xmit(struct sk_buff *skb);

extern int inet6_csk_xmit(struct sk_buff *skb, struct flowi *fl);

#endif /* _INET6_CONNECTION_SOCK_H */

include/net/inet_connection_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct tcp_congestion_ops; 
 * (i.e. things that depend on the address family)

 */

struct inet_connection_sock_af_ops {

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

	int	    (*queue_xmit)(struct sk_buff *skb, struct flowi *fl);

	void	    (*send_check)(struct sock *sk, struct sk_buff *skb);

	int	    (*rebuild_header)(struct sock *sk);

	int	    (*conn_request)(struct sock *sk, struct sk_buff *skb);

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ extern int ip_do_nat(struct sk_buff *skb); 
extern void		ip_send_check(struct iphdr *ip);

extern int		__ip_local_out(struct sk_buff *skb);

extern int		ip_local_out(struct sk_buff *skb);

extern int		ip_queue_xmit(struct sk_buff *skb);

extern int		ip_queue_xmit(struct sk_buff *skb, struct flowi *fl);

extern void		ip_init(void);

extern int		ip_append_data(struct sock *sk,

				       int getfrag(void *from, char *to, int offset, int len,

net/dccp/output.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void dccp_skb_entail(struct sock *sk, struct sk_buff *skb) 
static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)

{

	if (likely(skb != NULL)) {

		const struct inet_sock *inet = inet_sk(sk);

		struct inet_sock *inet = inet_sk(sk);

		const struct inet_connection_sock *icsk = inet_csk(sk);

		struct dccp_sock *dp = dccp_sk(sk);

		struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
@@ -136,7 +136,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) 


		DCCP_INC_STATS(DCCP_MIB_OUTSEGS);



		err = icsk->icsk_af_ops->queue_xmit(skb);

		err = icsk->icsk_af_ops->queue_xmit(skb, &inet->cork.fl);

		return net_xmit_eval(err);

	}

	return -ENOBUFS;

net/ipv4/ip_output.c

+2 −2
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ int ip_output(struct sk_buff *skb) 
			    !(IPCB(skb)->flags & IPSKB_REROUTED));

}



int ip_queue_xmit(struct sk_buff *skb)

int ip_queue_xmit(struct sk_buff *skb, struct flowi *fl)

{

	struct sock *sk = skb->sk;

	struct inet_sock *inet = inet_sk(sk);
@@ -332,7 +332,7 @@ int ip_queue_xmit(struct sk_buff *skb) 
		goto packet_routed;



	/* Make sure we can route this packet. */

	fl4 = &inet->cork.fl.u.ip4;

	fl4 = &fl->u.ip4;

	rt = (struct rtable *)__sk_dst_check(sk, 0);

	if (rt == NULL) {

		__be32 daddr;