diff options
Diffstat (limited to 'qemu/net/l2tpv3.c')
-rw-r--r-- | qemu/net/l2tpv3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qemu/net/l2tpv3.c b/qemu/net/l2tpv3.c index 4f9bceecc..5c668f737 100644 --- a/qemu/net/l2tpv3.c +++ b/qemu/net/l2tpv3.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include <linux/ip.h> #include <netdb.h> -#include "config-host.h" #include "net/net.h" #include "clients.h" #include "qemu-common.h" @@ -325,7 +325,7 @@ static int l2tpv3_verify_header(NetL2TPV3State *s, uint8_t *buf) if (s->cookie_is_64) { cookie = ldq_be_p(buf + s->cookie_offset); } else { - cookie = ldl_be_p(buf + s->cookie_offset); + cookie = ldl_be_p(buf + s->cookie_offset) & 0xffffffffULL; } if (cookie != s->rx_cookie) { if (!s->header_mismatch) { @@ -545,8 +545,8 @@ int net_init_l2tpv3(const NetClientOptions *opts, s->queue_tail = 0; s->header_mismatch = false; - assert(opts->kind == NET_CLIENT_OPTIONS_KIND_L2TPV3); - l2tpv3 = opts->l2tpv3; + assert(opts->type == NET_CLIENT_OPTIONS_KIND_L2TPV3); + l2tpv3 = opts->u.l2tpv3.data; if (l2tpv3->has_ipv6 && l2tpv3->ipv6) { s->ipv6 = l2tpv3->ipv6; |