1 From foo@baz Tue Jul 14 10:59:56 PDT 2009
2 Date: Tue, 14 Jul 2009 10:59:56 -0700
3 From: Greg Kroah-Hartman <gregkh@suse.de>
4 Subject: Staging: hv: make the Hyper-V virtual network driver build
6 From: Greg Kroah-Hartman <gregkh@suse.de>
8 The #define KERNEL_2_6_27 needs to be set, and I adjusted the include
9 directories a bit to get things to build properly.
11 The driver was changed to use net_device_ops, as that is needed to build
12 and operate properly now.
14 The hv_netvsc code should now build with no errors.
16 Cc: Hank Janssen <hjanssen@microsoft.com>
17 Cc: Haiyang Zhang <haiyangz@microsoft.com>
18 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
21 drivers/staging/hv/NetVsc.c | 3 ++-
22 drivers/staging/hv/NetVsc.h | 8 ++++----
23 drivers/staging/hv/RndisFilter.c | 5 +++--
24 drivers/staging/hv/RndisFilter.h | 4 ++--
25 drivers/staging/hv/include/nvspprotocol.h | 2 +-
26 drivers/staging/hv/netvsc_drv.c | 7 ++++---
27 6 files changed, 16 insertions(+), 13 deletions(-)
29 --- a/drivers/staging/hv/NetVsc.c
30 +++ b/drivers/staging/hv/NetVsc.c
35 +#define KERNEL_2_6_27
38 +#include "include/logging.h"
40 #include "RndisFilter.h"
42 --- a/drivers/staging/hv/NetVsc.h
43 +++ b/drivers/staging/hv/NetVsc.h
48 -#include "VmbusPacketFormat.h"
49 -#include "nvspprotocol.h"
50 +#include "include/VmbusPacketFormat.h"
51 +#include "include/nvspprotocol.h"
54 +#include "include/List.h"
56 -#include "NetVscApi.h"
57 +#include "include/NetVscApi.h"
61 --- a/drivers/staging/hv/RndisFilter.c
62 +++ b/drivers/staging/hv/RndisFilter.c
67 +#define KERNEL_2_6_27
70 +#include "include/logging.h"
72 -#include "NetVscApi.h"
73 +#include "include/NetVscApi.h"
74 #include "RndisFilter.h"
77 --- a/drivers/staging/hv/RndisFilter.h
78 +++ b/drivers/staging/hv/RndisFilter.h
81 #define __struct_bcount(x)
84 +#include "include/osd.h"
88 +#include "include/rndis.h"
90 #define RNDIS_HEADER_SIZE (sizeof(RNDIS_MESSAGE) - sizeof(RNDIS_MESSAGE_CONTAINER))
92 --- a/drivers/staging/hv/include/nvspprotocol.h
93 +++ b/drivers/staging/hv/include/nvspprotocol.h
98 -#include <VmbusChannelInterface.h>
99 +#include "VmbusChannelInterface.h"
101 #define NVSP_INVALID_PROTOCOL_VERSION ((UINT32)0xFFFFFFFF)
103 --- a/drivers/staging/hv/netvsc_drv.c
104 +++ b/drivers/staging/hv/netvsc_drv.c
109 +#define KERNEL_2_6_27
111 #include <linux/init.h>
112 #include <linux/module.h>
114 #include <net/sock.h>
115 #include <net/pkt_sched.h>
117 -#include "logging.h"
119 +#include "include/logging.h"
120 +#include "include/vmbus.h"
122 -#include "NetVscApi.h"
123 +#include "include/NetVscApi.h"
125 MODULE_LICENSE("GPL");