[NET] Convert sk_debug into SOCK_DBG flag

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index 5d7997be7f606181dbfb4225aafc18543545a6f7..c8db2d9ef64d5cbdb7f44bcc5f24b960f3bbc85a 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -61,10 +61,10 @@
  * the other protocols.
  */
 
-/* Define this to get the sk->sk_debug debugging facility. */
+/* Define this to get the SOCK_DBG debugging facility. */
 #define SOCK_DEBUGGING
 #ifdef SOCK_DEBUGGING
-#define SOCK_DEBUG(sk, msg...) do { if ((sk) && ((sk)->sk_debug)) \
+#define SOCK_DEBUG(sk, msg...) do { if ((sk) && sock_flag((sk), SOCK_DBG)) \
                                        printk(KERN_DEBUG msg); } while (0)
 #else
 #define SOCK_DEBUG(sk, msg...) do { } while (0)
@@ -134,7 +134,6 @@ struct sock_common {
   *    @sk_sndbuf - size of send buffer in bytes
   *    @sk_flags - %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, %SO_OOBINLINE settings
   *    @sk_no_check - %SO_NO_CHECK setting, wether or not checkup packets
-  *    @sk_debug - %SO_DEBUG setting
   *    @sk_rcvtstamp - %SO_TIMESTAMP setting
   *    @sk_no_largesend - whether to sent large segments or not
   *    @sk_route_caps - route capabilities (e.g. %NETIF_F_TSO)
@@ -208,7 +207,6 @@ struct sock {
        int                     sk_sndbuf;
        unsigned long           sk_flags;
        char                    sk_no_check;
-       unsigned char           sk_debug;
        unsigned char           sk_rcvtstamp;
        unsigned char           sk_no_largesend;
        int                     sk_route_caps;
@@ -389,6 +387,7 @@ enum sock_flags {
        SOCK_TIMESTAMP,
        SOCK_ZAPPED,
        SOCK_USE_WRITE_QUEUE, /* whether to call sk->sk_write_space in sock_wfree */
+       SOCK_DBG, /* %SO_DEBUG setting */
 };
 
 static inline void sock_set_flag(struct sock *sk, enum sock_flags flag)

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 00dcc9aac142b54ff921537b2b8664fd7f7f0561..dac4850dd9a8e5b9bd90630d0a56bf7e77656eb4 100644 (file)
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -867,10 +867,12 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev)
        sk->sk_protocol = osk->sk_protocol;
        sk->sk_rcvbuf   = osk->sk_rcvbuf;
        sk->sk_sndbuf   = osk->sk_sndbuf;
-       sk->sk_debug    = osk->sk_debug;
        sk->sk_state    = TCP_ESTABLISHED;
        sk->sk_sleep    = osk->sk_sleep;
 
+       if (sock_flag(osk, SOCK_DBG))
+               sock_set_flag(sk, SOCK_DBG);
+
        if (sock_flag(osk, SOCK_ZAPPED))
                sock_set_flag(sk, SOCK_ZAPPED);
 

diff --git a/net/core/sock.c b/net/core/sock.c
index c3e963c9c1c97a52a774e4ccbcc75be2b4c08ee4..6c5f84d5734c0cef2cb92a9f5123e224c4025037 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -228,8 +228,10 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
                        {
                                ret = -EACCES;
                        }
+                       else if (valbool)
+                               sock_set_flag(sk, SOCK_DBG);
                        else
-                               sk->sk_debug = valbool;
+                               sock_reset_flag(sk, SOCK_DBG);
                        break;
                case SO_REUSEADDR:
                        sk->sk_reuse = valbool;
@@ -466,7 +468,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
        switch(optname) 
        {
                case SO_DEBUG:          
-                       v.val = sk->sk_debug;
+                       v.val = sock_flag(sk, SOCK_DBG);
                        break;
                
                case SO_DONTROUTE:

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index cc0bf8d9365e7d6695a0d0b70d5958cd1766cc86..31307740e897b6db2641f99c9dce25943d84e19d 100644 (file)
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -475,13 +475,15 @@ static struct sock *nr_make_new(struct sock *osk)
        sk->sk_protocol = osk->sk_protocol;
        sk->sk_rcvbuf   = osk->sk_rcvbuf;
        sk->sk_sndbuf   = osk->sk_sndbuf;
-       sk->sk_debug    = osk->sk_debug;
        sk->sk_state    = TCP_ESTABLISHED;
        sk->sk_sleep    = osk->sk_sleep;
 
        if (sock_flag(osk, SOCK_ZAPPED))
                sock_set_flag(sk, SOCK_ZAPPED);
 
+       if (sock_flag(osk, SOCK_DBG))
+               sock_set_flag(sk, SOCK_DBG);
+
        skb_queue_head_init(&nr->ack_queue);
        skb_queue_head_init(&nr->reseq_queue);
        skb_queue_head_init(&nr->frag_queue);

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 8673c807371253e94dcba77ceef262029f57855c..4e8ba48834fdfa059df0249762b0a9213e0f3a40 100644 (file)
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -572,13 +572,15 @@ static struct sock *rose_make_new(struct sock *osk)
        sk->sk_protocol = osk->sk_protocol;
        sk->sk_rcvbuf   = osk->sk_rcvbuf;
        sk->sk_sndbuf   = osk->sk_sndbuf;
-       sk->sk_debug    = osk->sk_debug;
        sk->sk_state    = TCP_ESTABLISHED;
        sk->sk_sleep    = osk->sk_sleep;
 
        if (sock_flag(osk, SOCK_ZAPPED))
                sock_set_flag(sk, SOCK_ZAPPED);
 
+       if (sock_flag(osk, SOCK_DBG))
+               sock_set_flag(sk, SOCK_DBG);
+
        init_timer(&rose->timer);
        init_timer(&rose->idletimer);
 

diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c
index 838b7cf05cd8c82278b4c606dcf23f913fe8350c..6698c872c96b9e4ed522371fcacfe4544d135b4c 100644 (file)
--- a/net/wanrouter/af_wanpipe.c
+++ b/net/wanrouter/af_wanpipe.c
@@ -468,10 +468,12 @@ static struct sock *wanpipe_make_new(struct sock *osk)
        wp_sk(sk)->num  = wp_sk(osk)->num;
        sk->sk_rcvbuf   = osk->sk_rcvbuf;
        sk->sk_sndbuf   = osk->sk_sndbuf;
-       sk->sk_debug    = osk->sk_debug;
        sk->sk_state    = WANSOCK_CONNECTING;
        sk->sk_sleep    = osk->sk_sleep;
 
+       if (sock_flag(osk, SOCK_DBG))
+               sock_set_flag(sk, SOCK_DBG);
+
        return sk;
 }
 

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index c92362d13626b2ef9cdec733bce91170dbe0437e..ab367b36d8f04cda61b8d4207bfbc8f549a665f9 100644 (file)
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -525,13 +525,15 @@ static struct sock *x25_make_new(struct sock *osk)
        sk->sk_protocol    = osk->sk_protocol;
        sk->sk_rcvbuf      = osk->sk_rcvbuf;
        sk->sk_sndbuf      = osk->sk_sndbuf;
-       sk->sk_debug       = osk->sk_debug;
        sk->sk_state       = TCP_ESTABLISHED;
        sk->sk_sleep       = osk->sk_sleep;
        sk->sk_backlog_rcv = osk->sk_backlog_rcv;
 
        if (sock_flag(osk, SOCK_ZAPPED))
                sock_set_flag(sk, SOCK_ZAPPED);
+       
+       if (sock_flag(osk, SOCK_DBG))
+               sock_set_flag(sk, SOCK_DBG);
 
        ox25 = x25_sk(osk);
        x25->t21        = ox25->t21;