Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
net
/
l2tpv3.c
diff --git
a/qemu/net/l2tpv3.c
b/qemu/net/l2tpv3.c
index
4f9bcee
..
5c668f7
100644
(file)
--- a/
qemu/net/l2tpv3.c
+++ b/
qemu/net/l2tpv3.c
@@
-23,9
+23,9
@@
* THE SOFTWARE.
*/
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <linux/ip.h>
#include <netdb.h>
#include <linux/ip.h>
#include <netdb.h>
-#include "config-host.h"
#include "net/net.h"
#include "clients.h"
#include "qemu-common.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 {
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) {
}
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;
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;
if (l2tpv3->has_ipv6 && l2tpv3->ipv6) {
s->ipv6 = l2tpv3->ipv6;