|
@@ -708,7 +708,8 @@ release_sk1:
|
|
|
outside socket context is ugly, certainly. What can I do?
|
|
|
*/
|
|
|
|
|
|
-static void tcp_v4_send_ack(struct sk_buff *skb, u32 seq, u32 ack,
|
|
|
+static void tcp_v4_send_ack(struct net *net,
|
|
|
+ struct sk_buff *skb, u32 seq, u32 ack,
|
|
|
u32 win, u32 tsval, u32 tsecr, int oif,
|
|
|
struct tcp_md5sig_key *key,
|
|
|
int reply_flags, u8 tos)
|
|
@@ -723,7 +724,6 @@ static void tcp_v4_send_ack(struct sk_buff *skb, u32 seq, u32 ack,
|
|
|
];
|
|
|
} rep;
|
|
|
struct ip_reply_arg arg;
|
|
|
- struct net *net = dev_net(skb_dst(skb)->dev);
|
|
|
|
|
|
memset(&rep.th, 0, sizeof(struct tcphdr));
|
|
|
memset(&arg, 0, sizeof(arg));
|
|
@@ -785,7 +785,8 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
|
|
|
struct inet_timewait_sock *tw = inet_twsk(sk);
|
|
|
struct tcp_timewait_sock *tcptw = tcp_twsk(sk);
|
|
|
|
|
|
- tcp_v4_send_ack(skb, tcptw->tw_snd_nxt, tcptw->tw_rcv_nxt,
|
|
|
+ tcp_v4_send_ack(sock_net(sk), skb,
|
|
|
+ tcptw->tw_snd_nxt, tcptw->tw_rcv_nxt,
|
|
|
tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale,
|
|
|
tcp_time_stamp + tcptw->tw_ts_offset,
|
|
|
tcptw->tw_ts_recent,
|
|
@@ -804,8 +805,10 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
|
|
|
/* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV
|
|
|
* sk->sk_state == TCP_SYN_RECV -> for Fast Open.
|
|
|
*/
|
|
|
- tcp_v4_send_ack(skb, (sk->sk_state == TCP_LISTEN) ?
|
|
|
- tcp_rsk(req)->snt_isn + 1 : tcp_sk(sk)->snd_nxt,
|
|
|
+ u32 seq = (sk->sk_state == TCP_LISTEN) ? tcp_rsk(req)->snt_isn + 1 :
|
|
|
+ tcp_sk(sk)->snd_nxt;
|
|
|
+
|
|
|
+ tcp_v4_send_ack(sock_net(sk), skb, seq,
|
|
|
tcp_rsk(req)->rcv_nxt, req->rsk_rcv_wnd,
|
|
|
tcp_time_stamp,
|
|
|
req->ts_recent,
|