[PATCH] [AX25]: Kill ax25_bind() user triggable printk.

[PATCH] [AX25]: Kill ax25_bind() user triggable printk.

[maximilian attems]

on the last run overlooked that sfuzz triggable message.
move the message to the corresponding comment.

Signed-off-by: maximilian attems <max@stro.at>
---
 net/ax25/af_ax25.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index b4725ff..a2cc7c1 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1038,16 +1038,13 @@ static int ax25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 	int err = 0;
 
 	if (addr_len != sizeof(struct sockaddr_ax25) &&
-	    addr_len != sizeof(struct full_sockaddr_ax25)) {
-		/* support for old structure may go away some time */
+	    addr_len != sizeof(struct full_sockaddr_ax25))
+		/* support for old structure may go away some time
+		 * ax25_bind(): uses old (6 digipeater) socket structure.
+		 */
 		if ((addr_len < sizeof(struct sockaddr_ax25) + sizeof(ax25_address) * 6) ||
-		    (addr_len > sizeof(struct full_sockaddr_ax25))) {
+		    (addr_len > sizeof(struct full_sockaddr_ax25)))
 			return -EINVAL;
-	}
-
-		printk(KERN_WARNING "ax25_bind(): %s uses old (6 digipeater) socket structure.\n",
-			current->comm);
-	}
 
 	if (addr->fsa_ax25.sax25_family != AF_AX25)
 		return -EINVAL;
-- 
1.5.4.rc4

[PATCH] [AX25]: Beautify x25_init() version printk.

[maximilian attems]

kill ref to old version and dup Linux.

Signed-off-by: maximilian attems <max@stro.at>
---
 net/x25/af_x25.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 92cfe8e..d0dbce0 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1652,7 +1652,7 @@ static int __init x25_init(void)
 
 	register_netdevice_notifier(&x25_dev_notifier);
 
-	printk(KERN_INFO "X.25 for Linux. Version 0.2 for Linux 2.1.15\n");
+	printk(KERN_INFO "X.25 for Linux Version 0.2\n");
 
 #ifdef CONFIG_SYSCTL
 	x25_register_sysctl();
-- 
1.5.4.rc4

Re: [PATCH] [AX25]: Beautify x25_init() version printk.

[David Miller]

From: maximilian attems <max@stro.at>
Date: Mon, 28 Jan 2008 18:31:10 +0100

> kill ref to old version and dup Linux.
> 
> Signed-off-by: maximilian attems <max@stro.at>

Applied

Re: [PATCH] [AX25]: Kill ax25_bind() user triggable printk.

[David Miller]

From: maximilian attems <max@stro.at>
Date: Mon, 28 Jan 2008 18:31:09 +0100

> on the last run overlooked that sfuzz triggable message.
> move the message to the corresponding comment.
> 
> Signed-off-by: maximilian attems <max@stro.at>

Applied.