Patchwork [3/3] pfkey: add severity to printk

login
register
mail settings
Submitter stephen hemminger
Date May 12, 2010, 4:37 p.m.
Message ID <20100512163719.580801468@vyatta.com>
Download mbox | patch
Permalink /patch/52395/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - May 12, 2010, 4:37 p.m.
Put severity level on pfkey printk messages

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - May 18, 2010, 5:58 a.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 12 May 2010 09:37:07 -0700

> Put severity level on pfkey printk messages
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/net/key/af_key.c	2010-05-11 21:08:49.617719992 -0700
+++ b/net/key/af_key.c	2010-05-11 21:12:46.399325172 -0700
@@ -99,7 +99,7 @@  static void pfkey_sock_destruct(struct s
 	skb_queue_purge(&sk->sk_receive_queue);
 
 	if (!sock_flag(sk, SOCK_DEAD)) {
-		printk("Attempt to release alive pfkey socket: %p\n", sk);
+		pr_err("Attempt to release alive pfkey socket: %p\n", sk);
 		return;
 	}
 
@@ -1402,7 +1402,7 @@  static inline int event2poltype(int even
 	case XFRM_MSG_POLEXPIRE:
 	//	return SADB_X_SPDEXPIRE;
 	default:
-		printk("pfkey: Unknown policy event %d\n", event);
+		pr_err("pfkey: Unknown policy event %d\n", event);
 		break;
 	}
 
@@ -1421,7 +1421,7 @@  static inline int event2keytype(int even
 	case XFRM_MSG_EXPIRE:
 		return SADB_EXPIRE;
 	default:
-		printk("pfkey: Unknown SA event %d\n", event);
+		pr_err("pfkey: Unknown SA event %d\n", event);
 		break;
 	}
 
@@ -2969,7 +2969,7 @@  static int pfkey_send_notify(struct xfrm
 	case XFRM_MSG_NEWAE: /* not yet supported */
 		break;
 	default:
-		printk("pfkey: Unknown SA event %d\n", c->event);
+		pr_err("pfkey: Unknown SA event %d\n", c->event);
 		break;
 	}
 
@@ -2993,7 +2993,7 @@  static int pfkey_send_policy_notify(stru
 			break;
 		return key_notify_policy_flush(c);
 	default:
-		printk("pfkey: Unknown policy event %d\n", c->event);
+		pr_err("pfkey: Unknown policy event %d\n", c->event);
 		break;
 	}