ckrm E17 memory controller

[linux-2.6.git] / include / net / sock.h

diff --git a/include/net/sock.h b/include/net/sock.h
index 5c49711..55233cf 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -249,6 +249,7 @@ struct sock {
        struct timeval          sk_stamp;
        struct socket           *sk_socket;
        void                    *sk_user_data;
+       void                    *sk_ns; // For use by CKRM
        struct module           *sk_owner;
        struct page             *sk_sndmsg_page;
        __u32                   sk_sndmsg_off;
@@ -408,6 +409,7 @@ static inline int sock_flag(struct sock *sk, enum sock_flags flag)
        return test_bit(flag, &sk->sk_flags);
 }
 
+#ifndef CONFIG_ACCEPT_QUEUES
 static inline void sk_acceptq_removed(struct sock *sk)
 {
        sk->sk_ack_backlog--;
@@ -422,6 +424,7 @@ static inline int sk_acceptq_is_full(struct sock *sk)
 {
        return sk->sk_ack_backlog > sk->sk_max_ack_backlog;
 }
+#endif
 
 /*
  * Compute minimal free write space needed to queue new packets.