git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
net
/
ipv4
/
netfilter
/
nf_conntrack_proto_icmp.c
diff --git
a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index
7404bde
..
ab5b27a
100644
(file)
--- a/
net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/
net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@
-160,7
+160,7
@@
icmp_error_message(struct net *net, struct nf_conn *tmpl, struct sk_buff *skb,
/* Update skb to refer to this connection */
skb->nfct = &nf_ct_tuplehash_to_ctrack(h)->ct_general;
skb->nfctinfo = *ctinfo;
- return
-
NF_ACCEPT;
+ return NF_ACCEPT;
}
/* Small and modified version of icmp_rcv */