aboutsummaryrefslogtreecommitdiff
path: root/net/dccp
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-08-18 21:12:02 -0300
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 16:02:26 -0700
commitc59eab4637dbc3f832503be4ccb9213b0f323d92 (patch)
tree95bf99ecc5150dc9a97c63f20b9e5d90a61edc13 /net/dccp
parent5480855bfbc125f34d9b752689bb9a64da7e1fc6 (diff)
[DCCP]: Use LIMIT_NETDEBUG in some debugging printks
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/input.c11
-rw-r--r--net/dccp/ipv4.c23
2 files changed, 19 insertions, 15 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 68b6e72551e..3c4cbff82e9 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -118,8 +118,8 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb)
lawl = dp->dccps_awl;
if (dh->dccph_type == DCCP_PKT_CLOSEREQ ||
- dh->dccph_type == DCCP_PKT_CLOSE ||
- dh->dccph_type == DCCP_PKT_RESET) {
+ dh->dccph_type == DCCP_PKT_CLOSE ||
+ dh->dccph_type == DCCP_PKT_RESET) {
lswl = dp->dccps_gsr;
dccp_inc_seqno(&lswl);
lawl = dp->dccps_gar;
@@ -136,7 +136,8 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb)
DCCP_PKT_WITHOUT_ACK_SEQ))
dp->dccps_gar = DCCP_SKB_CB(skb)->dccpd_ack_seq;
} else {
- LIMIT_NETDEBUG("Step 6 failed, sending SYNC...\n");
+ LIMIT_NETDEBUG(KERN_WARNING "DCCP: Step 6 failed, "
+ "sending SYNC...\n");
dccp_send_sync(sk, DCCP_SKB_CB(skb)->dccpd_seq, DCCP_PKT_SYNC);
return -1;
}
@@ -168,8 +169,8 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
if (dccp_ackpkts_add(dp->dccps_hc_rx_ackpkts,
DCCP_SKB_CB(skb)->dccpd_seq,
DCCP_ACKPKTS_STATE_RECEIVED)) {
- LIMIT_NETDEBUG(KERN_INFO "DCCP: acknowledgeable "
- "packets buffer full!\n");
+ LIMIT_NETDEBUG(KERN_WARNING "DCCP: acknowledgeable "
+ "packets buffer full!\n");
ap->dccpap_ack_seqno = DCCP_MAX_SEQNO + 1;
inet_csk_schedule_ack(sk);
inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 335e00e9631..cc5d60d9afa 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1008,7 +1008,7 @@ static inline int dccp_invalid_packet(struct sk_buff *skb)
return 1;
if (!pskb_may_pull(skb, sizeof(struct dccp_hdr))) {
- printk(KERN_WARNING "DCCP: pskb_may_pull failed\n");
+ LIMIT_NETDEBUG(KERN_WARNING "DCCP: pskb_may_pull failed\n");
return 1;
}
@@ -1016,7 +1016,7 @@ static inline int dccp_invalid_packet(struct sk_buff *skb)
/* If the packet type is not understood, drop packet and return */
if (dh->dccph_type >= DCCP_PKT_INVALID) {
- printk(KERN_WARNING "DCCP: invalid packet type\n");
+ LIMIT_NETDEBUG(KERN_WARNING "DCCP: invalid packet type\n");
return 1;
}
@@ -1025,14 +1025,16 @@ static inline int dccp_invalid_packet(struct sk_buff *skb)
* packet, drop packet and return
*/
if (dh->dccph_doff < dccp_hdr_len(skb) / sizeof(u32)) {
- printk(KERN_WARNING "DCCP: Offset(%u) too small 1\n",
- dh->dccph_doff);
+ LIMIT_NETDEBUG(KERN_WARNING "DCCP: P.Data Offset(%u) "
+ "too small 1\n",
+ dh->dccph_doff);
return 1;
}
if (!pskb_may_pull(skb, dh->dccph_doff * sizeof(u32))) {
- printk(KERN_WARNING "DCCP: P.Data Offset(%u) too small 2\n",
- dh->dccph_doff);
+ LIMIT_NETDEBUG(KERN_WARNING "DCCP: P.Data Offset(%u) "
+ "too small 2\n",
+ dh->dccph_doff);
return 1;
}
@@ -1046,16 +1048,17 @@ static inline int dccp_invalid_packet(struct sk_buff *skb)
dh->dccph_type != DCCP_PKT_DATA &&
dh->dccph_type != DCCP_PKT_ACK &&
dh->dccph_type != DCCP_PKT_DATAACK) {
- printk(KERN_WARNING "DCCP: P.type (%s) not Data, Ack nor "
- "DataAck and P.X == 0\n",
- dccp_packet_name(dh->dccph_type));
+ LIMIT_NETDEBUG(KERN_WARNING "DCCP: P.type (%s) not Data, Ack "
+ "nor DataAck and P.X == 0\n",
+ dccp_packet_name(dh->dccph_type));
return 1;
}
/* If the header checksum is incorrect, drop packet and return */
if (dccp_v4_verify_checksum(skb, skb->nh.iph->saddr,
skb->nh.iph->daddr) < 0) {
- printk(KERN_WARNING "DCCP: header checksum is incorrect\n");
+ LIMIT_NETDEBUG(KERN_WARNING "DCCP: header checksum is "
+ "incorrect\n");
return 1;
}