patch-2.4.22 linux-2.4.22/net/ipv4/netfilter/ip_nat_helper.c
Next file: linux-2.4.22/net/ipv4/netfilter/ip_nat_irc.c
Previous file: linux-2.4.22/net/ipv4/netfilter/ip_nat_ftp.c
Back to the patch index
Back to the overall index
- Lines: 31
- Date:
2003-08-25 04:44:44.000000000 -0700
- Orig file:
linux-2.4.21/net/ipv4/netfilter/ip_nat_helper.c
- Orig date:
2003-06-13 07:51:39.000000000 -0700
diff -urN linux-2.4.21/net/ipv4/netfilter/ip_nat_helper.c linux-2.4.22/net/ipv4/netfilter/ip_nat_helper.c
@@ -84,7 +84,6 @@
iph = (*skb)->nh.iph;
if (iph->protocol == IPPROTO_TCP) {
struct tcphdr *tcph = (void *)iph + iph->ihl*4;
- void *data = (void *)tcph + tcph->doff*4;
DEBUGP("ip_nat_resize_packet: Seq_offset before: ");
DUMP_OFFSET(this_way);
@@ -488,9 +487,9 @@
const char *tmp = me->me->name;
if (strlen(tmp) + 6 > MODULE_MAX_NAMELEN) {
- printk(__FUNCTION__ ": unable to "
+ printk("%s: unable to "
"compute conntrack helper name "
- "from %s\n", tmp);
+ "from %s\n", __FUNCTION__, tmp);
return -EBUSY;
}
tmp += 6;
@@ -573,7 +572,8 @@
&& ct_helper->me) {
__MOD_DEC_USE_COUNT(ct_helper->me);
} else
- printk(__FUNCTION__ ": unable to decrement usage count"
- " of conntrack helper %s\n", me->me->name);
+ printk("%s: unable to decrement usage count"
+ " of conntrack helper %s\n",
+ __FUNCTION__, me->me->name);
}
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)