git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_nat_snmp_basic.c
diff --git
a/net/ipv4/netfilter/ip_nat_snmp_basic.c
b/net/ipv4/netfilter/ip_nat_snmp_basic.c
index
c332442
..
df57e7a
100644
(file)
--- a/
net/ipv4/netfilter/ip_nat_snmp_basic.c
+++ b/
net/ipv4/netfilter/ip_nat_snmp_basic.c
@@
-250,7
+250,6
@@
static unsigned char asn1_header_decode(struct asn1_ctx *ctx,
if (!asn1_id_decode(ctx, cls, con, tag))
return 0;
if (!asn1_id_decode(ctx, cls, con, tag))
return 0;
- def = len = 0;
if (!asn1_length_decode(ctx, &def, &len))
return 0;
if (!asn1_length_decode(ctx, &def, &len))
return 0;
@@
-670,7
+669,7
@@
static unsigned char snmp_object_decode(struct asn1_ctx *ctx,
unsigned char *eoc, *end, *p;
unsigned long *lp, *id;
unsigned long ul;
unsigned char *eoc, *end, *p;
unsigned long *lp, *id;
unsigned long ul;
- long l;
+ long
l;
*obj = NULL;
id = NULL;
*obj = NULL;
id = NULL;
@@
-700,13
+699,11
@@
static unsigned char snmp_object_decode(struct asn1_ctx *ctx,
return 0;
}
return 0;
}
- type = 0;
if (!snmp_tag_cls2syntax(tag, cls, &type)) {
kfree(id);
return 0;
}
if (!snmp_tag_cls2syntax(tag, cls, &type)) {
kfree(id);
return 0;
}
- l = 0;
switch (type) {
case SNMP_INTEGER:
len = sizeof(long);
switch (type) {
case SNMP_INTEGER:
len = sizeof(long);
@@
-768,7
+765,6
@@
static unsigned char snmp_object_decode(struct asn1_ctx *ctx,
len *= sizeof(unsigned long);
*obj = kmalloc(sizeof(struct snmp_object) + len, GFP_ATOMIC);
if (*obj == NULL) {
len *= sizeof(unsigned long);
*obj = kmalloc(sizeof(struct snmp_object) + len, GFP_ATOMIC);
if (*obj == NULL) {
- kfree(lp);
kfree(id);
if (net_ratelimit())
printk("OOM in bsalg (%d)\n", __LINE__);
kfree(id);
if (net_ratelimit())
printk("OOM in bsalg (%d)\n", __LINE__);
@@
-1324,7
+1320,7
@@
static struct ip_conntrack_helper snmp_trap_helper = {
*
*****************************************************************************/
*
*****************************************************************************/
-static int __init i
p_nat_snmp_basic_i
nit(void)
+static int __init init(void)
{
int ret = 0;
{
int ret = 0;
@@
-1339,13
+1335,13
@@
static int __init ip_nat_snmp_basic_init(void)
return ret;
}
return ret;
}
-static void __exit
ip_nat_snmp_basic_
fini(void)
+static void __exit fini(void)
{
ip_conntrack_helper_unregister(&snmp_helper);
ip_conntrack_helper_unregister(&snmp_trap_helper);
}
{
ip_conntrack_helper_unregister(&snmp_helper);
ip_conntrack_helper_unregister(&snmp_trap_helper);
}
-module_init(i
p_nat_snmp_basic_i
nit);
-module_exit(
ip_nat_snmp_basic_
fini);
+module_init(init);
+module_exit(fini);
module_param(debug, bool, 0600);
module_param(debug, bool, 0600);