diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2011-03-01 02:36:47 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-03-01 12:35:02 -0800 |
| commit | 1470ddf7f8cecf776921e5ccee72e3d2b3d60cbc (patch) | |
| tree | 723eb6971efd9603908354ef1642cb9c8ed04e23 /include/net/inet_sock.h | |
| parent | inet: Remove unused sk_sndmsg_* from UFO (diff) | |
| download | linux-dev-1470ddf7f8cecf776921e5ccee72e3d2b3d60cbc.tar.xz linux-dev-1470ddf7f8cecf776921e5ccee72e3d2b3d60cbc.zip | |
inet: Remove explicit write references to sk/inet in ip_append_data
In order to allow simultaneous calls to ip_append_data on the same
socket, it must not modify any shared state in sk or inet (other
than those that are designed to allow that such as atomic counters).
This patch abstracts out write references to sk and inet_sk in
ip_append_data and its friends so that we may use the underlying
code in parallel.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_sock.h')
| -rw-r--r-- | include/net/inet_sock.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 6e6dfd757682..7a37369f8ea3 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -86,6 +86,19 @@ static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk) return (struct inet_request_sock *)sk; } +struct inet_cork { + unsigned int flags; + unsigned int fragsize; + struct ip_options *opt; + struct dst_entry *dst; + int length; /* Total length of all frames */ + __be32 addr; + struct flowi fl; + struct page *page; + u32 off; + u8 tx_flags; +}; + struct ip_mc_socklist; struct ipv6_pinfo; struct rtable; @@ -143,15 +156,7 @@ struct inet_sock { int mc_index; __be32 mc_addr; struct ip_mc_socklist __rcu *mc_list; - struct { - unsigned int flags; - unsigned int fragsize; - struct ip_options *opt; - struct dst_entry *dst; - int length; /* Total length of all frames */ - __be32 addr; - struct flowi fl; - } cork; + struct inet_cork cork; }; #define IPCORK_OPT 1 /* ip-options has been held in ipcork.opt */ |