diff options
| author | Gonglei | 2014-07-01 14:58:08 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-07-01 18:42:23 +0200 |
| commit | 015a33bd05b7fd69f400d4e0e4a9925af9292548 (patch) | |
| tree | a1ac8883dc8ccff13eb6e129880f0aab7e2d87a6 /net/net.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140701-1' into s... (diff) | |
| download | qemu-015a33bd05b7fd69f400d4e0e4a9925af9292548.tar.gz qemu-015a33bd05b7fd69f400d4e0e4a9925af9292548.tar.xz qemu-015a33bd05b7fd69f400d4e0e4a9925af9292548.zip | |
net: add mmsghdr struct check for L2TPV3
The mmsghdr struct is only introduced in Linux 2.6.32; add a
configure check for it and disable L2TPV3 on hosts which are
too old to provide it, rather than simply failing to compile.
Reported-by: chenliang <chenliang88@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1404219488-11196-1-git-send-email-arei.gonglei@huawei.com
[PMM: cleaned up commit message and corrected kernel version number]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -806,7 +806,7 @@ static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])( #ifdef CONFIG_VHOST_NET_USED [NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user, #endif -#ifdef CONFIG_LINUX +#ifdef CONFIG_L2TPV3 [NET_CLIENT_OPTIONS_KIND_L2TPV3] = net_init_l2tpv3, #endif }; @@ -845,7 +845,7 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) #ifdef CONFIG_VHOST_NET_USED case NET_CLIENT_OPTIONS_KIND_VHOST_USER: #endif -#ifdef CONFIG_LINUX +#ifdef CONFIG_L2TPV3 case NET_CLIENT_OPTIONS_KIND_L2TPV3: #endif break; |