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
[GFS2] Fix up merge of Linus' kernel into GFS2
[pandora-kernel.git]
/
include
/
linux
/
netfilter_ipv6
/
ip6_tables.h
diff --git
a/include/linux/netfilter_ipv6/ip6_tables.h
b/include/linux/netfilter_ipv6/ip6_tables.h
index
d0d5d1e
..
d7a8e9c
100644
(file)
--- a/
include/linux/netfilter_ipv6/ip6_tables.h
+++ b/
include/linux/netfilter_ipv6/ip6_tables.h
@@
-300,8
+300,7
@@
extern unsigned int ip6t_do_table(struct sk_buff **pskb,
unsigned int hook,
const struct net_device *in,
const struct net_device *out,
- struct ip6t_table *table,
- void *userdata);
+ struct ip6t_table *table);
/* Check for an extension */
extern int ip6t_ext_hdr(u8 nexthdr);