diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-10-07 14:43:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-07 14:43:06 -0700 |
| commit | 33f5f57eeb0c6386fdd85f9c690dc8d700ba7928 (patch) | |
| tree | 4bd3421bfa3088018f8e355e6f47e43599748802 /net/ipv4/tcp.c | |
| parent | 654bed16cf86a9ef94495d9e6131b7ff7840a3dd (diff) | |
| download | kernel_samsung_aries-33f5f57eeb0c6386fdd85f9c690dc8d700ba7928.zip kernel_samsung_aries-33f5f57eeb0c6386fdd85f9c690dc8d700ba7928.tar.gz kernel_samsung_aries-33f5f57eeb0c6386fdd85f9c690dc8d700ba7928.tar.bz2 | |
tcp: kill pointless urg_mode
It all started from me noticing that this urgent check in
tcp_clean_rtx_queue is unnecessarily inside the loop. Then
I took a longer look to it and found out that the users of
urg_mode can trivially do without, well almost, there was
one gotcha.
Bonus: those funny people who use urg with >= 2^31 write_seq -
snd_una could now rejoice too (that's the only purpose for the
between being there, otherwise a simple compare would have done
the thing). Not that I assume that the rest of the tcp code
happily lives with such mind-boggling numbers :-). Alas, it
turned out to be impossible to set wmem to such numbers anyway,
yes I really tried a big sendfile after setting some wmem but
nothing happened :-). ...Tcp_wmem is int and so is sk_sndbuf...
So I hacked a bit variable to long and found out that it seems
to work... :-)
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 7d3fe57..eccb716 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -497,10 +497,8 @@ static inline void skb_entail(struct sock *sk, struct sk_buff *skb) static inline void tcp_mark_urg(struct tcp_sock *tp, int flags, struct sk_buff *skb) { - if (flags & MSG_OOB) { - tp->urg_mode = 1; + if (flags & MSG_OOB) tp->snd_up = tp->write_seq; - } } static inline void tcp_push(struct sock *sk, int flags, int mss_now, |