diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-12-30 00:06:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-12-30 00:06:58 -0800 |
| commit | d027a95f37ec012ca4c8d5e42419c8eb7338dbbf (patch) | |
| tree | db8b856ed3dac472606fd68737e7e3a01f13c073 /include/linux/tcp.h | |
| parent | b2e95563794f81a3b2ccbeffcb59af1090fa00ef (diff) | |
| parent | 09fa6bcea48db8d55e9789585773cf367a899a75 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/tcp.h')
| -rw-r--r-- | include/linux/tcp.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 3a2e7bf3c44a..d25e5bd21c4d 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -386,7 +386,10 @@ struct tcp_sock { struct tcp_opt tcp; }; -#define tcp_sk(__sk) (&((struct tcp_sock *)__sk)->tcp) +static inline struct tcp_opt * tcp_sk(const struct sock *__sk) +{ + return &((struct tcp_sock *)__sk)->tcp; +} #endif |