diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-10-24 18:57:05 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2010-10-24 18:57:05 +0200 |
| commit | 6d4121f6c20a0e86231d52f535f1c82423b3326f (patch) | |
| tree | 5c235cac699ca86b504850aa663ddadde0455a61 /include/net/gre.h | |
| parent | SLUB: Fix memory hotplug with !NUMA (diff) | |
| parent | Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-6d4121f6c20a0e86231d52f535f1c82423b3326f.tar.xz linux-6d4121f6c20a0e86231d52f535f1c82423b3326f.zip | |
Merge branch 'master' into for-linus
Conflicts:
include/linux/percpu.h
mm/percpu.c
Diffstat (limited to 'include/net/gre.h')
| -rw-r--r-- | include/net/gre.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/net/gre.h b/include/net/gre.h new file mode 100644 index 000000000000..82665474bcb7 --- /dev/null +++ b/include/net/gre.h @@ -0,0 +1,18 @@ +#ifndef __LINUX_GRE_H +#define __LINUX_GRE_H + +#include <linux/skbuff.h> + +#define GREPROTO_CISCO 0 +#define GREPROTO_PPTP 1 +#define GREPROTO_MAX 2 + +struct gre_protocol { + int (*handler)(struct sk_buff *skb); + void (*err_handler)(struct sk_buff *skb, u32 info); +}; + +int gre_add_protocol(const struct gre_protocol *proto, u8 version); +int gre_del_protocol(const struct gre_protocol *proto, u8 version); + +#endif |