projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
[linux-2.6-microblaze.git]
/
include
/
linux
/
netfilter
/
nf_conntrack_proto_gre.h
diff --git
a/include/linux/netfilter/nf_conntrack_proto_gre.h
b/include/linux/netfilter/nf_conntrack_proto_gre.h
index
14edb79
..
6989e2e
100644
(file)
--- a/
include/linux/netfilter/nf_conntrack_proto_gre.h
+++ b/
include/linux/netfilter/nf_conntrack_proto_gre.h
@@
-41,7
+41,5
@@
int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir,
/* delete keymap entries */
void nf_ct_gre_keymap_destroy(struct nf_conn *ct);
-void nf_nat_need_gre(void);
-
#endif /* __KERNEL__ */
#endif /* _CONNTRACK_PROTO_GRE_H */