diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-14 07:10:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-14 07:10:38 -0800 |
| commit | d50485cb64f3f8558cf678bae9624e8d0ad8960d (patch) | |
| tree | ed13c1013f077e2296d97030eeaef18bfb1e36bc /include/net | |
| parent | 8c736c01cc90e7f22ae6aa6af4a78b1ebf7cb17a (diff) | |
| parent | 18e71a890416aec33a259971b3f66e43b6714262 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/tcp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 7355606725d4..0c62cdc5b2f0 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1039,6 +1039,7 @@ static inline void tcp_reset_xmit_timer(struct sock *sk, int what, unsigned long #ifdef TCP_DEBUG printk(tcp_timer_bug_msg); #endif + return; }; } |