From: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Date: Wed, 26 Sep 2007 22:38:55 +0000 (-0300)
Subject: [CCID3]: Remove ifdef surrounding BUG_ON
X-Git-Tag: v2.6.24-rc1~1454^2~346
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb293e6a24cc2031f74775d95925e003e7250232;p=linux-2.6

[CCID3]: Remove ifdef surrounding BUG_ON

As suggested by DaveM.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
---

diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h
index ae99ec4303..0cdc982cfe 100644
--- a/net/dccp/ccids/ccid3.h
+++ b/net/dccp/ccids/ccid3.h
@@ -120,9 +120,7 @@ struct ccid3_hc_tx_sock {
 static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk)
 {
     struct ccid3_hc_tx_sock *hctx = ccid_priv(dccp_sk(sk)->dccps_hc_tx_ccid);
-#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
     BUG_ON(hctx == NULL);
-#endif
     return hctx;
 }
 
@@ -173,9 +171,7 @@ struct ccid3_hc_rx_sock {
 static inline struct ccid3_hc_rx_sock *ccid3_hc_rx_sk(const struct sock *sk)
 {
     struct ccid3_hc_rx_sock *hcrx = ccid_priv(dccp_sk(sk)->dccps_hc_rx_ccid);
-#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
     BUG_ON(hcrx == NULL);
-#endif
     return hcrx;
 }