git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: Convert DEBUGP to pr_debug
[safe/jmp/linux-2.6]
/
net
/
ipv4
/
netfilter
/
nf_nat_proto_gre.c
diff --git
a/net/ipv4/netfilter/nf_nat_proto_gre.c
b/net/ipv4/netfilter/nf_nat_proto_gre.c
index
c3908bc
..
2e40cc8
100644
(file)
--- a/
net/ipv4/netfilter/nf_nat_proto_gre.c
+++ b/
net/ipv4/netfilter/nf_nat_proto_gre.c
@@
-36,13
+36,6
@@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");
MODULE_DESCRIPTION("Netfilter NAT protocol helper module for GRE");
MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");
MODULE_DESCRIPTION("Netfilter NAT protocol helper module for GRE");
-#if 0
-#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s: " format, __FILE__, \
- __FUNCTION__, ## args)
-#else
-#define DEBUGP(x, args...)
-#endif
-
/* is key in given range between min and max */
static int
gre_in_range(const struct nf_conntrack_tuple *tuple,
/* is key in given range between min and max */
static int
gre_in_range(const struct nf_conntrack_tuple *tuple,
@@
-83,7
+76,7
@@
gre_unique_tuple(struct nf_conntrack_tuple *tuple,
keyptr = &tuple->dst.u.gre.key;
if (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED)) {
keyptr = &tuple->dst.u.gre.key;
if (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED)) {
-
DEBUGP
("%p: NATing GRE PPTP\n", conntrack);
+
pr_debug
("%p: NATing GRE PPTP\n", conntrack);
min = 1;
range_size = 0xffff;
} else {
min = 1;
range_size = 0xffff;
} else {
@@
-91,7
+84,7
@@
gre_unique_tuple(struct nf_conntrack_tuple *tuple,
range_size = ntohs(range->max.gre.key) - min + 1;
}
range_size = ntohs(range->max.gre.key) - min + 1;
}
-
DEBUGP
("min = %u, range_size = %u\n", min, range_size);
+
pr_debug
("min = %u, range_size = %u\n", min, range_size);
for (i = 0; i < range_size; i++, key++) {
*keyptr = htons(min + key % range_size);
for (i = 0; i < range_size; i++, key++) {
*keyptr = htons(min + key % range_size);
@@
-99,7
+92,7
@@
gre_unique_tuple(struct nf_conntrack_tuple *tuple,
return 1;
}
return 1;
}
-
DEBUGP
("%p: no NAT mapping\n", conntrack);
+
pr_debug
("%p: no NAT mapping\n", conntrack);
return 0;
}
return 0;
}
@@
-132,11
+125,11
@@
gre_manip_pkt(struct sk_buff **pskb, unsigned int iphdroff,
* Try to behave like "nf_nat_proto_unknown" */
break;
case GRE_VERSION_PPTP:
* Try to behave like "nf_nat_proto_unknown" */
break;
case GRE_VERSION_PPTP:
-
DEBUGP
("call_id -> 0x%04x\n", ntohs(tuple->dst.u.gre.key));
+
pr_debug
("call_id -> 0x%04x\n", ntohs(tuple->dst.u.gre.key));
pgreh->call_id = tuple->dst.u.gre.key;
break;
default:
pgreh->call_id = tuple->dst.u.gre.key;
break;
default:
-
DEBUGP
("can't nat unknown GRE version\n");
+
pr_debug
("can't nat unknown GRE version\n");
return 0;
}
return 1;
return 0;
}
return 1;