diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-05 23:23:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-05 23:23:37 -0700 |
| commit | e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 (patch) | |
| tree | 83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0 /include/net/sock.h | |
| parent | 7329f0d58de01878d9ce4f0be7a76e136f223eef (diff) | |
| parent | 712ae51afd55b20c04c5383d02ba5d10233313b1 (diff) | |
| download | op-kernel-dev-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.zip op-kernel-dev-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index ebbc0ba..ae56da6 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -179,7 +179,6 @@ struct sock_common { * @sk_dst_cache: destination cache * @sk_dst_lock: destination cache lock * @sk_policy: flow policy - * @sk_rmem_alloc: receive queue bytes committed * @sk_receive_queue: incoming packets * @sk_wmem_alloc: transmit queue bytes committed * @sk_write_queue: Packet sending queue |
