diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2015-08-08 08:51:47 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-10 23:03:54 +0200 |
| commit | b2acd1dc3949cd60c571844d495594f05f0351f4 (patch) | |
| tree | a92b35a1aa868b517673a1d6b465689cf6f1a9a9 /include/net/gre.h | |
| parent | ip_gre: Add support to collect tunnel metadata. (diff) | |
| download | linux-b2acd1dc3949cd60c571844d495594f05f0351f4.tar.xz linux-b2acd1dc3949cd60c571844d495594f05f0351f4.zip | |
openvswitch: Use regular GRE net_device instead of vport
Using GRE tunnel meta data collection feature, we can implement
OVS GRE vport. This patch removes all of the OVS
specific GRE code and make OVS use a ip_gre net_device.
Minimal GRE vport is kept to handle compatibility with
current userspace application.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/gre.h')
| -rw-r--r-- | include/net/gre.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/net/gre.h b/include/net/gre.h index b53182018743..e3e08459bf67 100644 --- a/include/net/gre.h +++ b/include/net/gre.h @@ -33,16 +33,8 @@ struct gre_cisco_protocol { int gre_cisco_register(struct gre_cisco_protocol *proto); int gre_cisco_unregister(struct gre_cisco_protocol *proto); -void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi, - int hdr_len); - -static inline struct sk_buff *gre_handle_offloads(struct sk_buff *skb, - bool csum) -{ - return iptunnel_handle_offloads(skb, csum, - csum ? SKB_GSO_GRE_CSUM : SKB_GSO_GRE); -} - +struct net_device *gretap_fb_dev_create(struct net *net, const char *name, + u8 name_assign_type); static inline int ip_gre_calc_hlen(__be16 o_flags) { |