Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[karo-tx-linux.git] / include / net / sock.h

diff --git a/include/net/sock.h b/include/net/sock.h
index 48e4d5c38f855433c4e41af9b4ebac6eea8bb754..f69c8c2782dfba68c6f080902cbf5feb0a40a2f0 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -246,6 +246,7 @@ struct sock_common {
   *    @sk_policy: flow policy
   *    @sk_receive_queue: incoming packets
   *    @sk_wmem_alloc: transmit queue bytes committed
+  *    @sk_tsq_flags: TCP Small Queues flags
   *    @sk_write_queue: Packet sending queue
   *    @sk_omem_alloc: "o" is "option" or "other"
   *    @sk_wmem_queued: persistent queue size
@@ -257,6 +258,7 @@ struct sock_common {
   *    @sk_pacing_status: Pacing status (requested, handled by sch_fq)
   *    @sk_max_pacing_rate: Maximum pacing rate (%SO_MAX_PACING_RATE)
   *    @sk_sndbuf: size of send buffer in bytes
+  *    @__sk_flags_offset: empty field used to determine location of bitfield
   *    @sk_padding: unused element for alignment
   *    @sk_no_check_tx: %SO_NO_CHECK setting, set checksum in TX packets
   *    @sk_no_check_rx: allow zero checksum in RX packets
@@ -277,6 +279,7 @@ struct sock_common {
   *    @sk_drops: raw/udp drops counter
   *    @sk_ack_backlog: current listen backlog
   *    @sk_max_ack_backlog: listen backlog set in listen()
+  *    @sk_uid: user id of owner
   *    @sk_priority: %SO_PRIORITY setting
   *    @sk_type: socket type (%SOCK_STREAM, etc)
   *    @sk_protocol: which protocol this socket belongs in this network family
@@ -1697,6 +1700,7 @@ static inline void sock_orphan(struct sock *sk)
 
 static inline void sock_graft(struct sock *sk, struct socket *parent)
 {
+       WARN_ON(parent->sk);
        write_lock_bh(&sk->sk_callback_lock);
        sk->sk_wq = parent->wq;
        parent->sk = sk;