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 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
net
/
ipv6
/
netfilter
/
nf_defrag_ipv6_hooks.c
diff --git
a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
index
97c5b21
..
cdd6d04
100644
(file)
--- a/
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
+++ b/
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
@@
-71,7
+71,7
@@
static unsigned int ipv6_defrag(unsigned int hooknum,
if (reasm == NULL)
return NF_STOLEN;
- /* error occured or not fragmented */
+ /* error occur
r
ed or not fragmented */
if (reasm == skb)
return NF_ACCEPT;