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

Commit 3dd5d7e3 authored by Joe Perches's avatar Joe Perches Committed by Patrick McHardy
Browse files

x_tables: Convert printk to pr_err 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent dd7669a9

net/netfilter/x_tables.c

+8 −8
Original line number Diff line number Diff line
@@ -364,14 +364,14 @@ int xt_check_match(struct xt_mtchk_param *par, 
		 * ebt_among is exempt from centralized matchsize checking

		 * because it uses a dynamic-size data set.

		 */

		printk("%s_tables: %s match: invalid size %Zu != %u\n",

		pr_err("%s_tables: %s match: invalid size %Zu != %u\n",

		       xt_prefix[par->family], par->match->name,

		       XT_ALIGN(par->match->matchsize), size);

		return -EINVAL;

	}

	if (par->match->table != NULL &&

	    strcmp(par->match->table, par->table) != 0) {

		printk("%s_tables: %s match: only valid in %s table, not %s\n",

		pr_err("%s_tables: %s match: only valid in %s table, not %s\n",

		       xt_prefix[par->family], par->match->name,

		       par->match->table, par->table);

		return -EINVAL;
@@ -379,7 +379,7 @@ int xt_check_match(struct xt_mtchk_param *par, 
	if (par->match->hooks && (par->hook_mask & ~par->match->hooks) != 0) {

		char used[64], allow[64];



		printk("%s_tables: %s match: used from hooks %s, but only "

		pr_err("%s_tables: %s match: used from hooks %s, but only "

		       "valid from %s\n",

		       xt_prefix[par->family], par->match->name,

		       textify_hooks(used, sizeof(used), par->hook_mask),
@@ -387,7 +387,7 @@ int xt_check_match(struct xt_mtchk_param *par, 
		return -EINVAL;

	}

	if (par->match->proto && (par->match->proto != proto || inv_proto)) {

		printk("%s_tables: %s match: only valid for protocol %u\n",

		pr_err("%s_tables: %s match: only valid for protocol %u\n",

		       xt_prefix[par->family], par->match->name,

		       par->match->proto);

		return -EINVAL;
@@ -514,14 +514,14 @@ int xt_check_target(struct xt_tgchk_param *par, 
		    unsigned int size, u_int8_t proto, bool inv_proto)

{

	if (XT_ALIGN(par->target->targetsize) != size) {

		printk("%s_tables: %s target: invalid size %Zu != %u\n",

		pr_err("%s_tables: %s target: invalid size %Zu != %u\n",

		       xt_prefix[par->family], par->target->name,

		       XT_ALIGN(par->target->targetsize), size);

		return -EINVAL;

	}

	if (par->target->table != NULL &&

	    strcmp(par->target->table, par->table) != 0) {

		printk("%s_tables: %s target: only valid in %s table, not %s\n",

		pr_err("%s_tables: %s target: only valid in %s table, not %s\n",

		       xt_prefix[par->family], par->target->name,

		       par->target->table, par->table);

		return -EINVAL;
@@ -529,7 +529,7 @@ int xt_check_target(struct xt_tgchk_param *par, 
	if (par->target->hooks && (par->hook_mask & ~par->target->hooks) != 0) {

		char used[64], allow[64];



		printk("%s_tables: %s target: used from hooks %s, but only "

		pr_err("%s_tables: %s target: used from hooks %s, but only "

		       "usable from %s\n",

		       xt_prefix[par->family], par->target->name,

		       textify_hooks(used, sizeof(used), par->hook_mask),
@@ -537,7 +537,7 @@ int xt_check_target(struct xt_tgchk_param *par, 
		return -EINVAL;

	}

	if (par->target->proto && (par->target->proto != proto || inv_proto)) {

		printk("%s_tables: %s target: only valid for protocol %u\n",

		pr_err("%s_tables: %s target: only valid for protocol %u\n",

		       xt_prefix[par->family], par->target->name,

		       par->target->proto);

		return -EINVAL;