]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/suse-2.6.27.31/patches.drivers/staging-hv-make-the-hyper-v-virtual-network-driver-build.patch
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.drivers / staging-hv-make-the-hyper-v-virtual-network-driver-build.patch
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
5
6 From: Greg Kroah-Hartman <gregkh@suse.de>
7
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.
10
11 The driver was changed to use net_device_ops, as that is needed to build
12 and operate properly now.
13
14 The hv_netvsc code should now build with no errors.
15
16 Cc: Hank Janssen <hjanssen@microsoft.com>
17 Cc: Haiyang Zhang <haiyangz@microsoft.com>
18 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19
20 ---
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(-)
28
29 --- a/drivers/staging/hv/NetVsc.c
30 +++ b/drivers/staging/hv/NetVsc.c
31 @@ -20,8 +20,9 @@
32 *
33 */
34
35 +#define KERNEL_2_6_27
36
37 -#include "logging.h"
38 +#include "include/logging.h"
39 #include "NetVsc.h"
40 #include "RndisFilter.h"
41
42 --- a/drivers/staging/hv/NetVsc.h
43 +++ b/drivers/staging/hv/NetVsc.h
44 @@ -24,12 +24,12 @@
45 #ifndef _NETVSC_H_
46 #define _NETVSC_H_
47
48 -#include "VmbusPacketFormat.h"
49 -#include "nvspprotocol.h"
50 +#include "include/VmbusPacketFormat.h"
51 +#include "include/nvspprotocol.h"
52
53 -#include "List.h"
54 +#include "include/List.h"
55
56 -#include "NetVscApi.h"
57 +#include "include/NetVscApi.h"
58 //
59 // #defines
60 //
61 --- a/drivers/staging/hv/RndisFilter.c
62 +++ b/drivers/staging/hv/RndisFilter.c
63 @@ -21,10 +21,11 @@
64 *
65 */
66
67 +#define KERNEL_2_6_27
68
69 -#include "logging.h"
70 +#include "include/logging.h"
71
72 -#include "NetVscApi.h"
73 +#include "include/NetVscApi.h"
74 #include "RndisFilter.h"
75
76 //
77 --- a/drivers/staging/hv/RndisFilter.h
78 +++ b/drivers/staging/hv/RndisFilter.h
79 @@ -27,10 +27,10 @@
80
81 #define __struct_bcount(x)
82
83 -#include "osd.h"
84 +#include "include/osd.h"
85 #include "NetVsc.h"
86
87 -#include "rndis.h"
88 +#include "include/rndis.h"
89
90 #define RNDIS_HEADER_SIZE (sizeof(RNDIS_MESSAGE) - sizeof(RNDIS_MESSAGE_CONTAINER))
91
92 --- a/drivers/staging/hv/include/nvspprotocol.h
93 +++ b/drivers/staging/hv/include/nvspprotocol.h
94 @@ -24,7 +24,7 @@
95
96 #pragma once
97
98 -#include <VmbusChannelInterface.h>
99 +#include "VmbusChannelInterface.h"
100
101 #define NVSP_INVALID_PROTOCOL_VERSION ((UINT32)0xFFFFFFFF)
102
103 --- a/drivers/staging/hv/netvsc_drv.c
104 +++ b/drivers/staging/hv/netvsc_drv.c
105 @@ -20,6 +20,7 @@
106 *
107 */
108
109 +#define KERNEL_2_6_27
110
111 #include <linux/init.h>
112 #include <linux/module.h>
113 @@ -41,10 +42,10 @@
114 #include <net/sock.h>
115 #include <net/pkt_sched.h>
116
117 -#include "logging.h"
118 -#include "vmbus.h"
119 +#include "include/logging.h"
120 +#include "include/vmbus.h"
121
122 -#include "NetVscApi.h"
123 +#include "include/NetVscApi.h"
124
125 MODULE_LICENSE("GPL");
126