diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /include/net/sock.h | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 8a7889b35810..fd9876087651 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -180,6 +180,7 @@ struct sock_common { | |||
| 180 | * @sk_sndmsg_off: cached offset for sendmsg | 180 | * @sk_sndmsg_off: cached offset for sendmsg |
| 181 | * @sk_send_head: front of stuff to transmit | 181 | * @sk_send_head: front of stuff to transmit |
| 182 | * @sk_security: used by security modules | 182 | * @sk_security: used by security modules |
| 183 | * @sk_mark: generic packet mark | ||
| 183 | * @sk_write_pending: a write to stream socket waits to start | 184 | * @sk_write_pending: a write to stream socket waits to start |
| 184 | * @sk_state_change: callback to indicate change in the state of the sock | 185 | * @sk_state_change: callback to indicate change in the state of the sock |
| 185 | * @sk_data_ready: callback to indicate there is data to be processed | 186 | * @sk_data_ready: callback to indicate there is data to be processed |