git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SK_BUFF]: Introduce tcp_hdr(), remove skb->h.th
[pandora-kernel.git]
/
net
/
ipv4
/
tcp_ipv4.c
diff --git
a/net/ipv4/tcp_ipv4.c
b/net/ipv4/tcp_ipv4.c
index
0ba74bb
..
617a5e4
100644
(file)
--- a/
net/ipv4/tcp_ipv4.c
+++ b/
net/ipv4/tcp_ipv4.c
@@
-125,10
+125,10
@@
void tcp_unhash(struct sock *sk)
static inline __u32 tcp_v4_init_sequence(struct sk_buff *skb)
{
static inline __u32 tcp_v4_init_sequence(struct sk_buff *skb)
{
- return secure_tcp_sequence_number(
skb->nh.iph
->daddr,
-
skb->nh.iph
->saddr,
-
skb->h.th
->dest,
-
skb->h.th
->source);
+ return secure_tcp_sequence_number(
ip_hdr(skb)
->daddr,
+
ip_hdr(skb)
->saddr,
+
tcp_hdr(skb)
->dest,
+
tcp_hdr(skb)
->source);
}
int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
}
int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
@@
-149,7
+149,7
@@
int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
*/
if (tcptw->tw_ts_recent_stamp &&
(twp == NULL || (sysctl_tcp_tw_reuse &&
*/
if (tcptw->tw_ts_recent_stamp &&
(twp == NULL || (sysctl_tcp_tw_reuse &&
-
xtime.tv_sec
- tcptw->tw_ts_recent_stamp > 1))) {
+
get_seconds()
- tcptw->tw_ts_recent_stamp > 1))) {
tp->write_seq = tcptw->tw_snd_nxt + 65535 + 2;
if (tp->write_seq == 0)
tp->write_seq = 1;
tp->write_seq = tcptw->tw_snd_nxt + 65535 + 2;
if (tp->write_seq == 0)
tp->write_seq = 1;
@@
-224,7
+224,7
@@
int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
* when trying new connection.
*/
if (peer != NULL &&
* when trying new connection.
*/
if (peer != NULL &&
- peer->tcp_ts_stamp + TCP_PAWS_MSL >=
xtime.tv_sec
) {
+ peer->tcp_ts_stamp + TCP_PAWS_MSL >=
get_seconds()
) {
tp->rx_opt.ts_recent_stamp = peer->tcp_ts_stamp;
tp->rx_opt.ts_recent = peer->tcp_ts;
}
tp->rx_opt.ts_recent_stamp = peer->tcp_ts_stamp;
tp->rx_opt.ts_recent = peer->tcp_ts;
}
@@
-354,8
+354,8
@@
void tcp_v4_err(struct sk_buff *skb, u32 info)
struct tcphdr *th = (struct tcphdr *)(skb->data + (iph->ihl << 2));
struct tcp_sock *tp;
struct inet_sock *inet;
struct tcphdr *th = (struct tcphdr *)(skb->data + (iph->ihl << 2));
struct tcp_sock *tp;
struct inet_sock *inet;
-
int type = skb->h.icmph
->type;
-
int code = skb->h.icmph
->code;
+
const int type = icmp_hdr(skb)
->type;
+
const int code = icmp_hdr(skb)
->code;
struct sock *sk;
__u32 seq;
int err;
struct sock *sk;
__u32 seq;
int err;
@@
-499,7
+499,7
@@
out:
void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb)
{
struct inet_sock *inet = inet_sk(sk);
void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb)
{
struct inet_sock *inet = inet_sk(sk);
- struct tcphdr *th =
skb->h.th
;
+ struct tcphdr *th =
tcp_hdr(skb)
;
if (skb->ip_summed == CHECKSUM_PARTIAL) {
th->check = ~tcp_v4_check(len, inet->saddr,
if (skb->ip_summed == CHECKSUM_PARTIAL) {
th->check = ~tcp_v4_check(len, inet->saddr,
@@
-515,14
+515,14
@@
void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb)
int tcp_v4_gso_send_check(struct sk_buff *skb)
{
int tcp_v4_gso_send_check(struct sk_buff *skb)
{
- struct iphdr *iph;
+
const
struct iphdr *iph;
struct tcphdr *th;
if (!pskb_may_pull(skb, sizeof(*th)))
return -EINVAL;
struct tcphdr *th;
if (!pskb_may_pull(skb, sizeof(*th)))
return -EINVAL;
- iph =
skb->nh.iph
;
- th =
skb->h.th
;
+ iph =
ip_hdr(skb)
;
+ th =
tcp_hdr(skb)
;
th->check = 0;
th->check = ~tcp_v4_check(skb->len, iph->saddr, iph->daddr, 0);
th->check = 0;
th->check = ~tcp_v4_check(skb->len, iph->saddr, iph->daddr, 0);
@@
-546,7
+546,7
@@
int tcp_v4_gso_send_check(struct sk_buff *skb)
static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
{
static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
{
- struct tcphdr *th =
skb->h.th
;
+ struct tcphdr *th =
tcp_hdr(skb)
;
struct {
struct tcphdr th;
#ifdef CONFIG_TCP_MD5SIG
struct {
struct tcphdr th;
#ifdef CONFIG_TCP_MD5SIG
@@
-585,7
+585,7
@@
static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
arg.iov[0].iov_len = sizeof(rep.th);
#ifdef CONFIG_TCP_MD5SIG
arg.iov[0].iov_len = sizeof(rep.th);
#ifdef CONFIG_TCP_MD5SIG
- key = sk ? tcp_v4_md5_do_lookup(sk,
skb->nh.iph
->daddr) : NULL;
+ key = sk ? tcp_v4_md5_do_lookup(sk,
ip_hdr(skb)
->daddr) : NULL;
if (key) {
rep.opt[0] = htonl((TCPOPT_NOP << 24) |
(TCPOPT_NOP << 16) |
if (key) {
rep.opt[0] = htonl((TCPOPT_NOP << 24) |
(TCPOPT_NOP << 16) |
@@
-597,14
+597,14
@@
static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
tcp_v4_do_calc_md5_hash((__u8 *)&rep.opt[1],
key,
tcp_v4_do_calc_md5_hash((__u8 *)&rep.opt[1],
key,
-
skb->nh.iph
->daddr,
-
skb->nh.iph
->saddr,
+
ip_hdr(skb)
->daddr,
+
ip_hdr(skb)
->saddr,
&rep.th, IPPROTO_TCP,
arg.iov[0].iov_len);
}
#endif
&rep.th, IPPROTO_TCP,
arg.iov[0].iov_len);
}
#endif
- arg.csum = csum_tcpudp_nofold(
skb->nh.iph
->daddr,
-
skb->nh.iph
->saddr, /* XXX */
+ arg.csum = csum_tcpudp_nofold(
ip_hdr(skb)
->daddr,
+
ip_hdr(skb)
->saddr, /* XXX */
sizeof(struct tcphdr), IPPROTO_TCP, 0);
arg.csumoffset = offsetof(struct tcphdr, check) / 2;
sizeof(struct tcphdr), IPPROTO_TCP, 0);
arg.csumoffset = offsetof(struct tcphdr, check) / 2;
@@
-622,7
+622,7
@@
static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk,
struct sk_buff *skb, u32 seq, u32 ack,
u32 win, u32 ts)
{
struct sk_buff *skb, u32 seq, u32 ack,
u32 win, u32 ts)
{
- struct tcphdr *th =
skb->h.th
;
+ struct tcphdr *th =
tcp_hdr(skb)
;
struct {
struct tcphdr th;
__be32 opt[(TCPOLEN_TSTAMP_ALIGNED >> 2)
struct {
struct tcphdr th;
__be32 opt[(TCPOLEN_TSTAMP_ALIGNED >> 2)
@@
-670,7
+670,7
@@
static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk,
* skb->sk) holds true, but we program defensively.
*/
if (!twsk && skb->sk) {
* skb->sk) holds true, but we program defensively.
*/
if (!twsk && skb->sk) {
- key = tcp_v4_md5_do_lookup(skb->sk,
skb->nh.iph
->daddr);
+ key = tcp_v4_md5_do_lookup(skb->sk,
ip_hdr(skb)
->daddr);
} else if (twsk && twsk->tw_md5_keylen) {
tw_key.key = twsk->tw_md5_key;
tw_key.keylen = twsk->tw_md5_keylen;
} else if (twsk && twsk->tw_md5_keylen) {
tw_key.key = twsk->tw_md5_key;
tw_key.keylen = twsk->tw_md5_keylen;
@@
-690,14
+690,14
@@
static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk,
tcp_v4_do_calc_md5_hash((__u8 *)&rep.opt[offset],
key,
tcp_v4_do_calc_md5_hash((__u8 *)&rep.opt[offset],
key,
-
skb->nh.iph
->daddr,
-
skb->nh.iph
->saddr,
+
ip_hdr(skb)
->daddr,
+
ip_hdr(skb)
->saddr,
&rep.th, IPPROTO_TCP,
arg.iov[0].iov_len);
}
#endif
&rep.th, IPPROTO_TCP,
arg.iov[0].iov_len);
}
#endif
- arg.csum = csum_tcpudp_nofold(
skb->nh.iph
->daddr,
-
skb->nh.iph
->saddr, /* XXX */
+ arg.csum = csum_tcpudp_nofold(
ip_hdr(skb)
->daddr,
+
ip_hdr(skb)
->saddr, /* XXX */
arg.iov[0].iov_len, IPPROTO_TCP, 0);
arg.csumoffset = offsetof(struct tcphdr, check) / 2;
arg.iov[0].iov_len, IPPROTO_TCP, 0);
arg.csumoffset = offsetof(struct tcphdr, check) / 2;
@@
-745,7
+745,7
@@
static int tcp_v4_send_synack(struct sock *sk, struct request_sock *req,
skb = tcp_make_synack(sk, dst, req);
if (skb) {
skb = tcp_make_synack(sk, dst, req);
if (skb) {
- struct tcphdr *th =
skb->h.th
;
+ struct tcphdr *th =
tcp_hdr(skb)
;
th->check = tcp_v4_check(skb->len,
ireq->loc_addr,
th->check = tcp_v4_check(skb->len,
ireq->loc_addr,
@@
-781,7
+781,7
@@
static void syn_flood_warning(struct sk_buff *skb)
warntime = jiffies;
printk(KERN_INFO
"possible SYN flooding on port %d. Sending cookies.\n",
warntime = jiffies;
printk(KERN_INFO
"possible SYN flooding on port %d. Sending cookies.\n",
- ntohs(
skb->h.th
->dest));
+ ntohs(
tcp_hdr(skb)
->dest));
}
}
#endif
}
}
#endif
@@
-1133,8
+1133,8
@@
static int tcp_v4_inbound_md5_hash(struct sock *sk, struct sk_buff *skb)
*/
__u8 *hash_location = NULL;
struct tcp_md5sig_key *hash_expected;
*/
__u8 *hash_location = NULL;
struct tcp_md5sig_key *hash_expected;
-
struct iphdr *iph = skb->nh.iph
;
- struct tcphdr *th =
skb->h.th
;
+
const struct iphdr *iph = ip_hdr(skb)
;
+ struct tcphdr *th =
tcp_hdr(skb)
;
int length = (th->doff << 2) - sizeof(struct tcphdr);
int genhash;
unsigned char *ptr;
int length = (th->doff << 2) - sizeof(struct tcphdr);
int genhash;
unsigned char *ptr;
@@
-1251,8
+1251,8
@@
int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
struct inet_request_sock *ireq;
struct tcp_options_received tmp_opt;
struct request_sock *req;
struct inet_request_sock *ireq;
struct tcp_options_received tmp_opt;
struct request_sock *req;
- __be32 saddr =
skb->nh.iph
->saddr;
- __be32 daddr =
skb->nh.iph
->daddr;
+ __be32 saddr =
ip_hdr(skb)
->saddr;
+ __be32 daddr =
ip_hdr(skb)
->daddr;
__u32 isn = TCP_SKB_CB(skb)->when;
struct dst_entry *dst = NULL;
#ifdef CONFIG_SYN_COOKIES
__u32 isn = TCP_SKB_CB(skb)->when;
struct dst_entry *dst = NULL;
#ifdef CONFIG_SYN_COOKIES
@@
-1327,7
+1327,7
@@
int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
ireq->rmt_addr = saddr;
ireq->opt = tcp_v4_save_options(sk, skb);
if (!want_cookie)
ireq->rmt_addr = saddr;
ireq->opt = tcp_v4_save_options(sk, skb);
if (!want_cookie)
- TCP_ECN_create_request(req,
skb->h.th
);
+ TCP_ECN_create_request(req,
tcp_hdr(skb)
);
if (want_cookie) {
#ifdef CONFIG_SYN_COOKIES
if (want_cookie) {
#ifdef CONFIG_SYN_COOKIES
@@
-1351,7
+1351,7
@@
int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
(dst = inet_csk_route_req(sk, req)) != NULL &&
(peer = rt_get_peer((struct rtable *)dst)) != NULL &&
peer->v4daddr == saddr) {
(dst = inet_csk_route_req(sk, req)) != NULL &&
(peer = rt_get_peer((struct rtable *)dst)) != NULL &&
peer->v4daddr == saddr) {
- if (
xtime.tv_sec
< peer->tcp_ts_stamp + TCP_PAWS_MSL &&
+ if (
get_seconds()
< peer->tcp_ts_stamp + TCP_PAWS_MSL &&
(s32)(peer->tcp_ts - req->ts_recent) >
TCP_PAWS_WINDOW) {
NET_INC_STATS_BH(LINUX_MIB_PAWSPASSIVEREJECTED);
(s32)(peer->tcp_ts - req->ts_recent) >
TCP_PAWS_WINDOW) {
NET_INC_STATS_BH(LINUX_MIB_PAWSPASSIVEREJECTED);
@@
-1375,7
+1375,7
@@
int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
LIMIT_NETDEBUG(KERN_DEBUG "TCP: drop open "
"request from %u.%u.%u.%u/%u\n",
NIPQUAD(saddr),
LIMIT_NETDEBUG(KERN_DEBUG "TCP: drop open "
"request from %u.%u.%u.%u/%u\n",
NIPQUAD(saddr),
- ntohs(
skb->h.th
->source));
+ ntohs(
tcp_hdr(skb)
->source));
dst_release(dst);
goto drop_and_free;
}
dst_release(dst);
goto drop_and_free;
}
@@
-1439,7
+1439,7
@@
struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
newinet->opt = ireq->opt;
ireq->opt = NULL;
newinet->mc_index = inet_iif(skb);
newinet->opt = ireq->opt;
ireq->opt = NULL;
newinet->mc_index = inet_iif(skb);
- newinet->mc_ttl =
skb->nh.iph
->ttl;
+ newinet->mc_ttl =
ip_hdr(skb)
->ttl;
inet_csk(newsk)->icsk_ext_hdr_len = 0;
if (newinet->opt)
inet_csk(newsk)->icsk_ext_hdr_len = newinet->opt->optlen;
inet_csk(newsk)->icsk_ext_hdr_len = 0;
if (newinet->opt)
inet_csk(newsk)->icsk_ext_hdr_len = newinet->opt->optlen;
@@
-1481,8
+1481,8
@@
exit:
static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
{
static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
{
- struct tcphdr *th =
skb->h.th
;
-
struct iphdr *iph = skb->nh.iph
;
+ struct tcphdr *th =
tcp_hdr(skb)
;
+
const struct iphdr *iph = ip_hdr(skb)
;
struct sock *nsk;
struct request_sock **prev;
/* Find possible connection requests. */
struct sock *nsk;
struct request_sock **prev;
/* Find possible connection requests. */
@@
-1491,9
+1491,8
@@
static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
if (req)
return tcp_check_req(sk, skb, req, prev);
if (req)
return tcp_check_req(sk, skb, req, prev);
- nsk = inet_lookup_established(&tcp_hashinfo, skb->nh.iph->saddr,
- th->source, skb->nh.iph->daddr,
- th->dest, inet_iif(skb));
+ nsk = inet_lookup_established(&tcp_hashinfo, iph->saddr, th->source,
+ iph->daddr, th->dest, inet_iif(skb));
if (nsk) {
if (nsk->sk_state != TCP_TIME_WAIT) {
if (nsk) {
if (nsk->sk_state != TCP_TIME_WAIT) {
@@
-1513,15
+1512,17
@@
static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
static __sum16 tcp_v4_checksum_init(struct sk_buff *skb)
{
static __sum16 tcp_v4_checksum_init(struct sk_buff *skb)
{
+ const struct iphdr *iph = ip_hdr(skb);
+
if (skb->ip_summed == CHECKSUM_COMPLETE) {
if (skb->ip_summed == CHECKSUM_COMPLETE) {
- if (!tcp_v4_check(skb->len,
skb->nh.
iph->saddr,
-
skb->nh.
iph->daddr, skb->csum)) {
+ if (!tcp_v4_check(skb->len, iph->saddr,
+ iph->daddr, skb->csum)) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
return 0;
}
}
skb->ip_summed = CHECKSUM_UNNECESSARY;
return 0;
}
}
- skb->csum = csum_tcpudp_nofold(
skb->nh.iph->saddr, skb->nh.
iph->daddr,
+ skb->csum = csum_tcpudp_nofold(
iph->saddr,
iph->daddr,
skb->len, IPPROTO_TCP, 0);
if (skb->len <= 76) {
skb->len, IPPROTO_TCP, 0);
if (skb->len <= 76) {
@@
-1555,7
+1556,7
@@
int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
TCP_CHECK_TIMER(sk);
if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
TCP_CHECK_TIMER(sk);
- if (tcp_rcv_established(sk, skb,
skb->h.th
, skb->len)) {
+ if (tcp_rcv_established(sk, skb,
tcp_hdr(skb)
, skb->len)) {
rsk = sk;
goto reset;
}
rsk = sk;
goto reset;
}
@@
-1563,7
+1564,7
@@
int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
return 0;
}
return 0;
}
- if (skb->len <
(skb->h.th->doff << 2
) || tcp_checksum_complete(skb))
+ if (skb->len <
tcp_hdrlen(skb
) || tcp_checksum_complete(skb))
goto csum_err;
if (sk->sk_state == TCP_LISTEN) {
goto csum_err;
if (sk->sk_state == TCP_LISTEN) {
@@
-1581,7
+1582,7
@@
int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
}
TCP_CHECK_TIMER(sk);
}
TCP_CHECK_TIMER(sk);
- if (tcp_rcv_state_process(sk, skb,
skb->h.th
, skb->len)) {
+ if (tcp_rcv_state_process(sk, skb,
tcp_hdr(skb)
, skb->len)) {
rsk = sk;
goto reset;
}
rsk = sk;
goto reset;
}
@@
-1610,6
+1611,7
@@
csum_err:
int tcp_v4_rcv(struct sk_buff *skb)
{
int tcp_v4_rcv(struct sk_buff *skb)
{
+ const struct iphdr *iph;
struct tcphdr *th;
struct sock *sk;
int ret;
struct tcphdr *th;
struct sock *sk;
int ret;
@@
-1623,7
+1625,7
@@
int tcp_v4_rcv(struct sk_buff *skb)
if (!pskb_may_pull(skb, sizeof(struct tcphdr)))
goto discard_it;
if (!pskb_may_pull(skb, sizeof(struct tcphdr)))
goto discard_it;
- th =
skb->h.th
;
+ th =
tcp_hdr(skb)
;
if (th->doff < sizeof(struct tcphdr) / 4)
goto bad_packet;
if (th->doff < sizeof(struct tcphdr) / 4)
goto bad_packet;
@@
-1638,19
+1640,18
@@
int tcp_v4_rcv(struct sk_buff *skb)
tcp_v4_checksum_init(skb)))
goto bad_packet;
tcp_v4_checksum_init(skb)))
goto bad_packet;
- th = skb->h.th;
+ th = tcp_hdr(skb);
+ iph = ip_hdr(skb);
TCP_SKB_CB(skb)->seq = ntohl(th->seq);
TCP_SKB_CB(skb)->end_seq = (TCP_SKB_CB(skb)->seq + th->syn + th->fin +
skb->len - th->doff * 4);
TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq);
TCP_SKB_CB(skb)->when = 0;
TCP_SKB_CB(skb)->seq = ntohl(th->seq);
TCP_SKB_CB(skb)->end_seq = (TCP_SKB_CB(skb)->seq + th->syn + th->fin +
skb->len - th->doff * 4);
TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq);
TCP_SKB_CB(skb)->when = 0;
- TCP_SKB_CB(skb)->flags =
skb->nh.
iph->tos;
+ TCP_SKB_CB(skb)->flags = iph->tos;
TCP_SKB_CB(skb)->sacked = 0;
TCP_SKB_CB(skb)->sacked = 0;
- sk = __inet_lookup(&tcp_hashinfo, skb->nh.iph->saddr, th->source,
- skb->nh.iph->daddr, th->dest,
- inet_iif(skb));
-
+ sk = __inet_lookup(&tcp_hashinfo, iph->saddr, th->source,
+ iph->daddr, th->dest, inet_iif(skb));
if (!sk)
goto no_tcp_socket;
if (!sk)
goto no_tcp_socket;
@@
-1724,8
+1725,7
@@
do_time_wait:
switch (tcp_timewait_state_process(inet_twsk(sk), skb, th)) {
case TCP_TW_SYN: {
struct sock *sk2 = inet_lookup_listener(&tcp_hashinfo,
switch (tcp_timewait_state_process(inet_twsk(sk), skb, th)) {
case TCP_TW_SYN: {
struct sock *sk2 = inet_lookup_listener(&tcp_hashinfo,
- skb->nh.iph->daddr,
- th->dest,
+ iph->daddr, th->dest,
inet_iif(skb));
if (sk2) {
inet_twsk_deschedule(inet_twsk(sk), &tcp_death_row);
inet_iif(skb));
if (sk2) {
inet_twsk_deschedule(inet_twsk(sk), &tcp_death_row);
@@
-1770,7
+1770,7
@@
int tcp_v4_remember_stamp(struct sock *sk)
if (peer) {
if ((s32)(peer->tcp_ts - tp->rx_opt.ts_recent) <= 0 ||
if (peer) {
if ((s32)(peer->tcp_ts - tp->rx_opt.ts_recent) <= 0 ||
- (peer->tcp_ts_stamp + TCP_PAWS_MSL <
xtime.tv_sec
&&
+ (peer->tcp_ts_stamp + TCP_PAWS_MSL <
get_seconds()
&&
peer->tcp_ts_stamp <= tp->rx_opt.ts_recent_stamp)) {
peer->tcp_ts_stamp = tp->rx_opt.ts_recent_stamp;
peer->tcp_ts = tp->rx_opt.ts_recent;
peer->tcp_ts_stamp <= tp->rx_opt.ts_recent_stamp)) {
peer->tcp_ts_stamp = tp->rx_opt.ts_recent_stamp;
peer->tcp_ts = tp->rx_opt.ts_recent;
@@
-1791,7
+1791,7
@@
int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw)
const struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);
if ((s32)(peer->tcp_ts - tcptw->tw_ts_recent) <= 0 ||
const struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);
if ((s32)(peer->tcp_ts - tcptw->tw_ts_recent) <= 0 ||
- (peer->tcp_ts_stamp + TCP_PAWS_MSL <
xtime.tv_sec
&&
+ (peer->tcp_ts_stamp + TCP_PAWS_MSL <
get_seconds()
&&
peer->tcp_ts_stamp <= tcptw->tw_ts_recent_stamp)) {
peer->tcp_ts_stamp = tcptw->tw_ts_recent_stamp;
peer->tcp_ts = tcptw->tw_ts_recent;
peer->tcp_ts_stamp <= tcptw->tw_ts_recent_stamp)) {
peer->tcp_ts_stamp = tcptw->tw_ts_recent_stamp;
peer->tcp_ts = tcptw->tw_ts_recent;
@@
-1890,7
+1890,7
@@
int tcp_v4_destroy_sock(struct sock *sk)
tcp_cleanup_congestion_control(sk);
/* Cleanup up the write buffer. */
tcp_cleanup_congestion_control(sk);
/* Cleanup up the write buffer. */
-
sk_stream_write
queue_purge(sk);
+
tcp_write_
queue_purge(sk);
/* Cleans up our, hopefully empty, out_of_order_queue. */
__skb_queue_purge(&tp->out_of_order_queue);
/* Cleans up our, hopefully empty, out_of_order_queue. */
__skb_queue_purge(&tp->out_of_order_queue);
@@
-2293,13
+2293,13
@@
static void get_openreq4(struct sock *sk, struct request_sock *req,
req);
}
req);
}
-static void get_tcp4_sock(struct sock *s
p
, char *tmpbuf, int i)
+static void get_tcp4_sock(struct sock *s
k
, char *tmpbuf, int i)
{
int timer_active;
unsigned long timer_expires;
{
int timer_active;
unsigned long timer_expires;
- struct tcp_sock *tp = tcp_sk(s
p
);
- const struct inet_connection_sock *icsk = inet_csk(s
p
);
- struct inet_sock *inet = inet_sk(s
p
);
+ struct tcp_sock *tp = tcp_sk(s
k
);
+ const struct inet_connection_sock *icsk = inet_csk(s
k
);
+ struct inet_sock *inet = inet_sk(s
k
);
__be32 dest = inet->daddr;
__be32 src = inet->rcv_saddr;
__u16 destp = ntohs(inet->dport);
__be32 dest = inet->daddr;
__be32 src = inet->rcv_saddr;
__u16 destp = ntohs(inet->dport);
@@
-2311,9
+2311,9
@@
static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i)
} else if (icsk->icsk_pending == ICSK_TIME_PROBE0) {
timer_active = 4;
timer_expires = icsk->icsk_timeout;
} else if (icsk->icsk_pending == ICSK_TIME_PROBE0) {
timer_active = 4;
timer_expires = icsk->icsk_timeout;
- } else if (timer_pending(&s
p
->sk_timer)) {
+ } else if (timer_pending(&s
k
->sk_timer)) {
timer_active = 2;
timer_active = 2;
- timer_expires = s
p
->sk_timer.expires;
+ timer_expires = s
k
->sk_timer.expires;
} else {
timer_active = 0;
timer_expires = jiffies;
} else {
timer_active = 0;
timer_expires = jiffies;
@@
-2321,17
+2321,17
@@
static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i)
sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "
"%08X %5d %8d %lu %d %p %u %u %u %u %d",
sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "
"%08X %5d %8d %lu %d %p %u %u %u %u %d",
- i, src, srcp, dest, destp, s
p
->sk_state,
+ i, src, srcp, dest, destp, s
k
->sk_state,
tp->write_seq - tp->snd_una,
tp->write_seq - tp->snd_una,
- s
p->sk_state == TCP_LISTEN ? sp
->sk_ack_backlog :
+ s
k->sk_state == TCP_LISTEN ? sk
->sk_ack_backlog :
(tp->rcv_nxt - tp->copied_seq),
timer_active,
jiffies_to_clock_t(timer_expires - jiffies),
icsk->icsk_retransmits,
(tp->rcv_nxt - tp->copied_seq),
timer_active,
jiffies_to_clock_t(timer_expires - jiffies),
icsk->icsk_retransmits,
- sock_i_uid(s
p
),
+ sock_i_uid(s
k
),
icsk->icsk_probes_out,
icsk->icsk_probes_out,
- sock_i_ino(s
p
),
- atomic_read(&s
p->sk_refcnt), sp
,
+ sock_i_ino(s
k
),
+ atomic_read(&s
k->sk_refcnt), sk
,
icsk->icsk_rto,
icsk->icsk_ack.ato,
(icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
icsk->icsk_rto,
icsk->icsk_ack.ato,
(icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,