forked from luck/tmp_suning_uos_patched
9e412ba763
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
131 lines
3.2 KiB
C
131 lines
3.2 KiB
C
#ifndef _NET_TCP_ECN_H_
|
|
#define _NET_TCP_ECN_H_ 1
|
|
|
|
#include <net/inet_ecn.h>
|
|
#include <net/request_sock.h>
|
|
|
|
#define TCP_HP_BITS (~(TCP_RESERVED_BITS|TCP_FLAG_PSH))
|
|
|
|
#define TCP_ECN_OK 1
|
|
#define TCP_ECN_QUEUE_CWR 2
|
|
#define TCP_ECN_DEMAND_CWR 4
|
|
|
|
static inline void TCP_ECN_queue_cwr(struct tcp_sock *tp)
|
|
{
|
|
if (tp->ecn_flags&TCP_ECN_OK)
|
|
tp->ecn_flags |= TCP_ECN_QUEUE_CWR;
|
|
}
|
|
|
|
|
|
/* Output functions */
|
|
|
|
static inline void TCP_ECN_send_synack(struct tcp_sock *tp,
|
|
struct sk_buff *skb)
|
|
{
|
|
TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_CWR;
|
|
if (!(tp->ecn_flags&TCP_ECN_OK))
|
|
TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_ECE;
|
|
}
|
|
|
|
static inline void TCP_ECN_send_syn(struct sock *sk, struct sk_buff *skb)
|
|
{
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
tp->ecn_flags = 0;
|
|
if (sysctl_tcp_ecn) {
|
|
TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_ECE|TCPCB_FLAG_CWR;
|
|
tp->ecn_flags = TCP_ECN_OK;
|
|
}
|
|
}
|
|
|
|
static __inline__ void
|
|
TCP_ECN_make_synack(struct request_sock *req, struct tcphdr *th)
|
|
{
|
|
if (inet_rsk(req)->ecn_ok)
|
|
th->ece = 1;
|
|
}
|
|
|
|
static inline void TCP_ECN_send(struct sock *sk, struct sk_buff *skb,
|
|
int tcp_header_len)
|
|
{
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
if (tp->ecn_flags & TCP_ECN_OK) {
|
|
/* Not-retransmitted data segment: set ECT and inject CWR. */
|
|
if (skb->len != tcp_header_len &&
|
|
!before(TCP_SKB_CB(skb)->seq, tp->snd_nxt)) {
|
|
INET_ECN_xmit(sk);
|
|
if (tp->ecn_flags&TCP_ECN_QUEUE_CWR) {
|
|
tp->ecn_flags &= ~TCP_ECN_QUEUE_CWR;
|
|
tcp_hdr(skb)->cwr = 1;
|
|
skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN;
|
|
}
|
|
} else {
|
|
/* ACK or retransmitted segment: clear ECT|CE */
|
|
INET_ECN_dontxmit(sk);
|
|
}
|
|
if (tp->ecn_flags & TCP_ECN_DEMAND_CWR)
|
|
tcp_hdr(skb)->ece = 1;
|
|
}
|
|
}
|
|
|
|
/* Input functions */
|
|
|
|
static inline void TCP_ECN_accept_cwr(struct tcp_sock *tp, struct sk_buff *skb)
|
|
{
|
|
if (tcp_hdr(skb)->cwr)
|
|
tp->ecn_flags &= ~TCP_ECN_DEMAND_CWR;
|
|
}
|
|
|
|
static inline void TCP_ECN_withdraw_cwr(struct tcp_sock *tp)
|
|
{
|
|
tp->ecn_flags &= ~TCP_ECN_DEMAND_CWR;
|
|
}
|
|
|
|
static inline void TCP_ECN_check_ce(struct tcp_sock *tp, struct sk_buff *skb)
|
|
{
|
|
if (tp->ecn_flags&TCP_ECN_OK) {
|
|
if (INET_ECN_is_ce(TCP_SKB_CB(skb)->flags))
|
|
tp->ecn_flags |= TCP_ECN_DEMAND_CWR;
|
|
/* Funny extension: if ECT is not set on a segment,
|
|
* it is surely retransmit. It is not in ECN RFC,
|
|
* but Linux follows this rule. */
|
|
else if (INET_ECN_is_not_ect((TCP_SKB_CB(skb)->flags)))
|
|
tcp_enter_quickack_mode((struct sock *)tp);
|
|
}
|
|
}
|
|
|
|
static inline void TCP_ECN_rcv_synack(struct tcp_sock *tp, struct tcphdr *th)
|
|
{
|
|
if ((tp->ecn_flags&TCP_ECN_OK) && (!th->ece || th->cwr))
|
|
tp->ecn_flags &= ~TCP_ECN_OK;
|
|
}
|
|
|
|
static inline void TCP_ECN_rcv_syn(struct tcp_sock *tp, struct tcphdr *th)
|
|
{
|
|
if ((tp->ecn_flags&TCP_ECN_OK) && (!th->ece || !th->cwr))
|
|
tp->ecn_flags &= ~TCP_ECN_OK;
|
|
}
|
|
|
|
static inline int TCP_ECN_rcv_ecn_echo(struct tcp_sock *tp, struct tcphdr *th)
|
|
{
|
|
if (th->ece && !th->syn && (tp->ecn_flags&TCP_ECN_OK))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
static inline void TCP_ECN_openreq_child(struct tcp_sock *tp,
|
|
struct request_sock *req)
|
|
{
|
|
tp->ecn_flags = inet_rsk(req)->ecn_ok ? TCP_ECN_OK : 0;
|
|
}
|
|
|
|
static __inline__ void
|
|
TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th)
|
|
{
|
|
if (sysctl_tcp_ecn && th->ece && th->cwr)
|
|
inet_rsk(req)->ecn_ok = 1;
|
|
}
|
|
|
|
#endif
|