git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Make number of packet handler threads runtime configurable.
[sliver-openvswitch.git]
/
datapath
/
vport-gre.c
diff --git
a/datapath/vport-gre.c
b/datapath/vport-gre.c
index
4f7be00
..
5af6dbe
100644
(file)
--- a/
datapath/vport-gre.c
+++ b/
datapath/vport-gre.c
@@
-16,6
+16,8
@@
* 02110-1301, USA
*/
* 02110-1301, USA
*/
+#include <linux/kconfig.h>
+#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX)
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/if.h>
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/if.h>
@@
-33,10
+35,11
@@
#include <linux/kernel.h>
#include <linux/workqueue.h>
#include <linux/rculist.h>
#include <linux/kernel.h>
#include <linux/workqueue.h>
#include <linux/rculist.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
#include <net/route.h>
#include <net/xfrm.h>
#include <net/route.h>
#include <net/xfrm.h>
-
#include <net/icmp.h>
#include <net/ip.h>
#include <net/ip_tunnels.h>
#include <net/icmp.h>
#include <net/ip.h>
#include <net/ip_tunnels.h>
@@
-44,7
+47,6
@@
#include <net/protocol.h>
#include "datapath.h"
#include <net/protocol.h>
#include "datapath.h"
-#include "tunnel.h"
#include "vport.h"
/* Returns the least-significant 32 bits of a __be64. */
#include "vport.h"
/* Returns the least-significant 32 bits of a __be64. */
@@
-110,7
+112,7
@@
static int gre_rcv(struct sk_buff *skb,
return PACKET_REJECT;
key = key_to_tunnel_id(tpi->key, tpi->seq);
return PACKET_REJECT;
key = key_to_tunnel_id(tpi->key, tpi->seq);
-
tnl
_tun_key_init(&tun_key, ip_hdr(skb), key, filter_tnl_flags(tpi->flags));
+
ovs_flow
_tun_key_init(&tun_key, ip_hdr(skb), key, filter_tnl_flags(tpi->flags));
ovs_vport_receive(vport, skb, &tun_key);
return PACKET_RCVD;
ovs_vport_receive(vport, skb, &tun_key);
return PACKET_RCVD;
@@
-333,17
+335,19
@@
static __be32 be64_get_high32(__be64 x)
static int gre64_send(struct vport *vport, struct sk_buff *skb)
{
static int gre64_send(struct vport *vport, struct sk_buff *skb)
{
- int hlen;
+ int hlen = GRE_HEADER_SECTION + /* GRE Hdr */
+ GRE_HEADER_SECTION + /* GRE Key */
+ GRE_HEADER_SECTION; /* GRE SEQ */
__be32 seq;
if (unlikely(!OVS_CB(skb)->tun_key))
return -EINVAL;
__be32 seq;
if (unlikely(!OVS_CB(skb)->tun_key))
return -EINVAL;
-
hlen = ip_gre_calc_hlen(OVS_CB(skb)->tun_key->tun_flags
)
-
+
GRE_HEADER_SECTION;
+
if (OVS_CB(skb)->tun_key->tun_flags & TUNNEL_CSUM
)
+
hlen +=
GRE_HEADER_SECTION;
seq = be64_get_high32(OVS_CB(skb)->tun_key->tun_id);
seq = be64_get_high32(OVS_CB(skb)->tun_key->tun_id);
- return __send(vport, skb, hlen, seq,
TUNNEL_SEQ
);
+ return __send(vport, skb, hlen, seq,
(TUNNEL_KEY|TUNNEL_SEQ)
);
}
const struct vport_ops ovs_gre64_vport_ops = {
}
const struct vport_ops ovs_gre64_vport_ops = {
@@
-353,3
+357,4
@@
const struct vport_ops ovs_gre64_vport_ops = {
.get_name = gre_get_name,
.send = gre64_send,
};
.get_name = gre_get_name,
.send = gre64_send,
};
+#endif