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
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_conntrack_amanda.c
diff --git
a/net/ipv4/netfilter/ip_conntrack_amanda.c
b/net/ipv4/netfilter/ip_conntrack_amanda.c
index
ae1bc25
..
4e8f4d8
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_amanda.c
+++ b/
net/ipv4/netfilter/ip_conntrack_amanda.c
@@
-107,7
+107,7
@@
static int help(struct sk_buff *skb,
exp->mask.dst.u.tcp.port = 0xFFFF;
exp_amanda_info = &exp->help.exp_amanda_info;
- exp_amanda_info->offset =
data
- amanda_buffer;
+ exp_amanda_info->offset =
tmp
- amanda_buffer;
exp_amanda_info->port = port;
exp_amanda_info->len = len;