Merge commit 'f71058439974f6236ecc0a8eeb58ccc2e8fc87f9' into upstream-merge

* commit 'f71058439974f6236ecc0a8eeb58ccc2e8fc87f9':
  net: refactor packet queueing code

Conflicts:
	net.c
	net.h

Signed-off-by: Mark McLoughlin <markmc@redhat.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 01830f3ff..ea568f519 100644
--- a/Makefile
+++ b/Makefile
@@ -133,7 +133,8 @@ obj-$(CONFIG_SSI_SD) += ssi-sd.o
 obj-$(CONFIG_SD) += sd.o
 obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
 obj-y += bt-hci-csr.o
-obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
+obj-y += buffered_file.o migration.o migration-tcp.o qemu-sockets.o
+obj-y += net.o net-queue.o
 obj-y += qemu-char.o aio.o net-checksum.o savevm.o
 obj-y += msmouse.o ps2.o
 obj-y += qdev.o qdev-properties.o