summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2005-03-16 02:05:30 +0100
committerThomas Graf <tgraf@suug.ch>2005-03-16 02:05:30 +0100
commitcc008b4b048c81f5c63aef26ccbf73a1847851bc (patch)
treef28b4bd4781f7ed66b66c5dd71bd3d58c34ba5ab /include/net
parent7f96df9b98a901abe562f7da5e313e60034ce4e9 (diff)
[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>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 5d7997be7f60..c8db2d9ef64d 100644
--- 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)