Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 654d0fbd authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Patrick McHardy
Browse files

netfilter: cleanup printk messages 



Make sure all printk messages have a severity level.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent af567603

net/ipv4/netfilter/arp_tables.c

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static unsigned int 
arpt_error(struct sk_buff *skb, const struct xt_action_param *par)

{

	if (net_ratelimit())

		printk("arp_tables: error: '%s'\n",

		pr_err("arp_tables: error: '%s'\n",

		       (const char *)par->targinfo);



	return NF_DROP;
@@ -385,7 +385,7 @@ static int mark_source_chains(const struct xt_table_info *newinfo, 
			int visited = e->comefrom & (1 << hook);



			if (e->comefrom & (1 << NF_ARP_NUMHOOKS)) {

				printk("arptables: loop hook %u pos %u %08X.\n",

				pr_notice("arptables: loop hook %u pos %u %08X.\n",

				       hook, pos, e->comefrom);

				return 0;

			}

net/ipv4/netfilter/ip_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ mark_source_chains(const struct xt_table_info *newinfo, 
			int visited = e->comefrom & (1 << hook);



			if (e->comefrom & (1 << NF_INET_NUMHOOKS)) {

				printk("iptables: loop hook %u pos %u %08X.\n",

				pr_err("iptables: loop hook %u pos %u %08X.\n",

				       hook, pos, e->comefrom);

				return 0;

			}

net/ipv4/netfilter/iptable_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int __init iptable_filter_init(void) 
	int ret;



	if (forward < 0 || forward > NF_MAX_VERDICT) {

		printk("iptables forward must be 0 or 1\n");

		pr_err("iptables forward must be 0 or 1\n");

		return -EINVAL;

	}

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+5 −5
Original line number Diff line number Diff line
@@ -382,32 +382,32 @@ static int __init nf_conntrack_l3proto_ipv4_init(void) 


	ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_tcp4);

	if (ret < 0) {

		printk("nf_conntrack_ipv4: can't register tcp.\n");

		pr_err("nf_conntrack_ipv4: can't register tcp.\n");

		goto cleanup_sockopt;

	}



	ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_udp4);

	if (ret < 0) {

		printk("nf_conntrack_ipv4: can't register udp.\n");

		pr_err("nf_conntrack_ipv4: can't register udp.\n");

		goto cleanup_tcp;

	}



	ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_icmp);

	if (ret < 0) {

		printk("nf_conntrack_ipv4: can't register icmp.\n");

		pr_err("nf_conntrack_ipv4: can't register icmp.\n");

		goto cleanup_udp;

	}



	ret = nf_conntrack_l3proto_register(&nf_conntrack_l3proto_ipv4);

	if (ret < 0) {

		printk("nf_conntrack_ipv4: can't register ipv4\n");

		pr_err("nf_conntrack_ipv4: can't register ipv4\n");

		goto cleanup_icmp;

	}



	ret = nf_register_hooks(ipv4_conntrack_ops,

				ARRAY_SIZE(ipv4_conntrack_ops));

	if (ret < 0) {

		printk("nf_conntrack_ipv4: can't register hooks.\n");

		pr_err("nf_conntrack_ipv4: can't register hooks.\n");

		goto cleanup_ipv4;

	}

#if defined(CONFIG_PROC_FS) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)

net/ipv4/netfilter/nf_nat_h323.c

+8 −8
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static int set_addr(struct sk_buff *skb, 
					      addroff, sizeof(buf),

					      (char *) &buf, sizeof(buf))) {

			if (net_ratelimit())

				printk("nf_nat_h323: nf_nat_mangle_tcp_packet"

				pr_notice("nf_nat_h323: nf_nat_mangle_tcp_packet"

				       " error\n");

			return -1;

		}
@@ -59,7 +59,7 @@ static int set_addr(struct sk_buff *skb, 
					      addroff, sizeof(buf),

					      (char *) &buf, sizeof(buf))) {

			if (net_ratelimit())

				printk("nf_nat_h323: nf_nat_mangle_udp_packet"

				pr_notice("nf_nat_h323: nf_nat_mangle_udp_packet"

				       " error\n");

			return -1;

		}
@@ -215,7 +215,7 @@ static int nat_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct, 
	/* Run out of expectations */

	if (i >= H323_RTP_CHANNEL_MAX) {

		if (net_ratelimit())

			printk("nf_nat_h323: out of expectations\n");

			pr_notice("nf_nat_h323: out of expectations\n");

		return 0;

	}
@@ -234,7 +234,7 @@ static int nat_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct, 


	if (nated_port == 0) {	/* No port available */

		if (net_ratelimit())

			printk("nf_nat_h323: out of RTP ports\n");

			pr_notice("nf_nat_h323: out of RTP ports\n");

		return 0;

	}
@@ -291,7 +291,7 @@ static int nat_t120(struct sk_buff *skb, struct nf_conn *ct, 


	if (nated_port == 0) {	/* No port available */

		if (net_ratelimit())

			printk("nf_nat_h323: out of TCP ports\n");

			pr_notice("nf_nat_h323: out of TCP ports\n");

		return 0;

	}
@@ -341,7 +341,7 @@ static int nat_h245(struct sk_buff *skb, struct nf_conn *ct, 


	if (nated_port == 0) {	/* No port available */

		if (net_ratelimit())

			printk("nf_nat_q931: out of TCP ports\n");

			pr_notice("nf_nat_q931: out of TCP ports\n");

		return 0;

	}
@@ -425,7 +425,7 @@ static int nat_q931(struct sk_buff *skb, struct nf_conn *ct, 


	if (nated_port == 0) {	/* No port available */

		if (net_ratelimit())

			printk("nf_nat_ras: out of TCP ports\n");

			pr_notice("nf_nat_ras: out of TCP ports\n");

		return 0;

	}
@@ -507,7 +507,7 @@ static int nat_callforwarding(struct sk_buff *skb, struct nf_conn *ct, 


	if (nated_port == 0) {	/* No port available */

		if (net_ratelimit())

			printk("nf_nat_q931: out of TCP ports\n");

			pr_notice("nf_nat_q931: out of TCP ports\n");

		return 0;

	}