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

Commit 4e15ed4d authored by Shan Wei's avatar Shan Wei Committed by David S. Miller
Browse files

net: replace ipfragok with skb->local_df 



As Herbert Xu said: we should be able to simply replace ipfragok
with skb->local_df. commit f88037(sctp: Drop ipfargok in sctp_xmit function)
has droped ipfragok and set local_df value properly.

The patch kills the ipfragok parameter of .queue_xmit().

Signed-off-by: default avatarShan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0eecb784

include/net/inet6_connection_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -38,5 +38,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, int ipfragok);

extern int inet6_csk_xmit(struct sk_buff *skb);

#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 ipfragok);

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

	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
@@ -101,7 +101,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, int ipfragok);

extern int		ip_queue_xmit(struct sk_buff *skb);

extern void		ip_init(void);

extern int		ip_append_data(struct sock *sk,

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

include/net/ipv6.h

+1 −2
Original line number Diff line number Diff line
@@ -482,8 +482,7 @@ extern int ip6_rcv_finish(struct sk_buff *skb); 
extern int			ip6_xmit(struct sock *sk,

					 struct sk_buff *skb,

					 struct flowi *fl,

					 struct ipv6_txoptions *opt,

					 int ipfragok);

					 struct ipv6_txoptions *opt);



extern int			ip6_nd_hdr(struct sock *sk,

					   struct sk_buff *skb,

net/dccp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req, 
							 &ireq6->loc_addr,

							 &ireq6->rmt_addr);

		ipv6_addr_copy(&fl.fl6_dst, &ireq6->rmt_addr);

		err = ip6_xmit(sk, skb, &fl, opt, 0);

		err = ip6_xmit(sk, skb, &fl, opt);

		err = net_xmit_eval(err);

	}
@@ -347,7 +347,7 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) 
	if (!ip6_dst_lookup(ctl_sk, &dst, &fl)) {

		if (xfrm_lookup(net, &dst, &fl, NULL, 0) >= 0) {

			skb_dst_set(skb, dst);

			ip6_xmit(ctl_sk, skb, &fl, NULL, 0);

			ip6_xmit(ctl_sk, skb, &fl, NULL);

			DCCP_INC_STATS_BH(DCCP_MIB_OUTSEGS);

			DCCP_INC_STATS_BH(DCCP_MIB_OUTRSTS);

			return;