Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 162278
b: refs/heads/master
c: ce9ea4c
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Sep 15, 2009
1 parent 979d473 commit b28dfac
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 21a8082043aa474107f4ed62fb62651ffad8e2f6
refs/heads/master: ce9ea4cf49b0ba4c67be71550d6cd955b718e967
56 changes: 28 additions & 28 deletions trunk/drivers/staging/hv/NetVsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device);

static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device);

static int NetVscDestroySendBuffer(struct NETVSC_DEVICE *NetDevice);
static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice);

static int NetVscDestroyReceiveBuffer(struct NETVSC_DEVICE *NetDevice);
static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice);

static int NetVscConnectToVsp(struct hv_device *Device);

Expand All @@ -71,11 +71,11 @@ static void NetVscSendReceiveCompletion(struct hv_device *Device,
u64 TransactionId);


static struct NETVSC_DEVICE *AllocNetDevice(struct hv_device *Device)
static struct netvsc_device *AllocNetDevice(struct hv_device *Device)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;

netDevice = kzalloc(sizeof(struct NETVSC_DEVICE), GFP_KERNEL);
netDevice = kzalloc(sizeof(struct netvsc_device), GFP_KERNEL);
if (!netDevice)
return NULL;

Expand All @@ -88,7 +88,7 @@ static struct NETVSC_DEVICE *AllocNetDevice(struct hv_device *Device)
return netDevice;
}

static void FreeNetDevice(struct NETVSC_DEVICE *Device)
static void FreeNetDevice(struct netvsc_device *Device)
{
ASSERT(atomic_read(&Device->RefCount) == 0);
Device->Device->Extension = NULL;
Expand All @@ -97,9 +97,9 @@ static void FreeNetDevice(struct NETVSC_DEVICE *Device)


/* Get the net device object iff exists and its refcount > 1 */
static struct NETVSC_DEVICE *GetOutboundNetDevice(struct hv_device *Device)
static struct netvsc_device *GetOutboundNetDevice(struct hv_device *Device)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;

netDevice = Device->Extension;
if (netDevice && atomic_read(&netDevice->RefCount) > 1)
Expand All @@ -111,9 +111,9 @@ static struct NETVSC_DEVICE *GetOutboundNetDevice(struct hv_device *Device)
}

/* Get the net device object iff exists and its refcount > 0 */
static struct NETVSC_DEVICE *GetInboundNetDevice(struct hv_device *Device)
static struct netvsc_device *GetInboundNetDevice(struct hv_device *Device)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;

netDevice = Device->Extension;
if (netDevice && atomic_read(&netDevice->RefCount))
Expand All @@ -126,17 +126,17 @@ static struct NETVSC_DEVICE *GetInboundNetDevice(struct hv_device *Device)

static void PutNetDevice(struct hv_device *Device)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;

netDevice = Device->Extension;
ASSERT(netDevice);

atomic_dec(&netDevice->RefCount);
}

static struct NETVSC_DEVICE *ReleaseOutboundNetDevice(struct hv_device *Device)
static struct netvsc_device *ReleaseOutboundNetDevice(struct hv_device *Device)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;

netDevice = Device->Extension;
if (netDevice == NULL)
Expand All @@ -149,9 +149,9 @@ static struct NETVSC_DEVICE *ReleaseOutboundNetDevice(struct hv_device *Device)
return netDevice;
}

static struct NETVSC_DEVICE *ReleaseInboundNetDevice(struct hv_device *Device)
static struct netvsc_device *ReleaseInboundNetDevice(struct hv_device *Device)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;

netDevice = Device->Extension;
if (netDevice == NULL)
Expand Down Expand Up @@ -208,7 +208,7 @@ int NetVscInitialize(struct hv_driver *drv)
static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
{
int ret = 0;
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
struct nvsp_message *initPacket;

DPRINT_ENTER(NETVSC);
Expand Down Expand Up @@ -339,7 +339,7 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
{
int ret = 0;
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
struct nvsp_message *initPacket;

DPRINT_ENTER(NETVSC);
Expand Down Expand Up @@ -431,7 +431,7 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
return ret;
}

static int NetVscDestroyReceiveBuffer(struct NETVSC_DEVICE *NetDevice)
static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
{
struct nvsp_message *revokePacket;
int ret = 0;
Expand Down Expand Up @@ -511,7 +511,7 @@ static int NetVscDestroyReceiveBuffer(struct NETVSC_DEVICE *NetDevice)
return ret;
}

static int NetVscDestroySendBuffer(struct NETVSC_DEVICE *NetDevice)
static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
{
struct nvsp_message *revokePacket;
int ret = 0;
Expand Down Expand Up @@ -589,7 +589,7 @@ static int NetVscDestroySendBuffer(struct NETVSC_DEVICE *NetDevice)
static int NetVscConnectToVsp(struct hv_device *Device)
{
int ret;
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
struct nvsp_message *initPacket;
int ndisVersion;

Expand Down Expand Up @@ -693,7 +693,7 @@ static int NetVscConnectToVsp(struct hv_device *Device)
return ret;
}

static void NetVscDisconnectFromVsp(struct NETVSC_DEVICE *NetDevice)
static void NetVscDisconnectFromVsp(struct netvsc_device *NetDevice)
{
DPRINT_ENTER(NETVSC);

Expand All @@ -710,7 +710,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
{
int ret = 0;
int i;
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
struct hv_netvsc_packet *packet;
LIST_ENTRY *entry;
struct netvsc_driver *netDriver =
Expand Down Expand Up @@ -813,7 +813,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
*/
static int NetVscOnDeviceRemove(struct hv_device *Device)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
struct hv_netvsc_packet *netvscPacket;
LIST_ENTRY *entry;

Expand Down Expand Up @@ -881,7 +881,7 @@ static void NetVscOnCleanup(struct hv_driver *drv)
static void NetVscOnSendCompletion(struct hv_device *Device,
struct vmpacket_descriptor *Packet)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
struct nvsp_message *nvspPacket;
struct hv_netvsc_packet *nvscPacket;

Expand Down Expand Up @@ -931,7 +931,7 @@ static void NetVscOnSendCompletion(struct hv_device *Device,
static int NetVscOnSend(struct hv_device *Device,
struct hv_netvsc_packet *Packet)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
int ret = 0;

struct nvsp_message sendMessage;
Expand Down Expand Up @@ -990,7 +990,7 @@ static int NetVscOnSend(struct hv_device *Device,
static void NetVscOnReceive(struct hv_device *Device,
struct vmpacket_descriptor *Packet)
{
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
struct vmtransfer_page_packet_header *vmxferpagePacket;
struct nvsp_message *nvspPacket;
struct hv_netvsc_packet *netvscPacket = NULL;
Expand Down Expand Up @@ -1255,7 +1255,7 @@ static void NetVscOnReceiveCompletion(void *Context)
{
struct hv_netvsc_packet *packet = Context;
struct hv_device *device = (struct hv_device *)packet->Device;
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
u64 transactionId = 0;
bool fSendReceiveComp = false;
unsigned long flags;
Expand Down Expand Up @@ -1312,7 +1312,7 @@ void NetVscOnChannelCallback(void *Context)
const int netPacketSize = 2048;
int ret;
struct hv_device *device = Context;
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
u32 bytesRecvd;
u64 requestId;
unsigned char packet[netPacketSize];
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/hv/NetVsc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ struct nvsp_message {


/* Per netvsc channel-specific */
struct NETVSC_DEVICE {
struct netvsc_device {
struct hv_device *Device;

atomic_t RefCount;
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/staging/hv/RndisFilter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ enum rndis_device_state {
};

struct rndis_device {
struct NETVSC_DEVICE *NetDevice;
struct netvsc_device *NetDevice;

enum rndis_device_state State;
u32 LinkStatus;
Expand Down Expand Up @@ -390,7 +390,7 @@ static void RndisFilterReceiveData(struct rndis_device *Device,
static int RndisFilterOnReceive(struct hv_device *Device,
struct hv_netvsc_packet *Packet)
{
struct NETVSC_DEVICE *netDevice = Device->Extension;
struct netvsc_device *netDevice = Device->Extension;
struct rndis_device *rndisDevice;
struct rndis_message rndisMessage;
struct rndis_message *rndisHeader;
Expand Down Expand Up @@ -791,7 +791,7 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,
void *AdditionalInfo)
{
int ret;
struct NETVSC_DEVICE *netDevice;
struct netvsc_device *netDevice;
struct rndis_device *rndisDevice;
struct netvsc_device_info *deviceInfo = AdditionalInfo;

Expand Down Expand Up @@ -867,7 +867,7 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,

static int RndisFilterOnDeviceRemove(struct hv_device *Device)
{
struct NETVSC_DEVICE *netDevice = Device->Extension;
struct netvsc_device *netDevice = Device->Extension;
struct rndis_device *rndisDevice = netDevice->Extension;

DPRINT_ENTER(NETVSC);
Expand Down Expand Up @@ -896,7 +896,7 @@ static void RndisFilterOnCleanup(struct hv_driver *Driver)
static int RndisFilterOnOpen(struct hv_device *Device)
{
int ret;
struct NETVSC_DEVICE *netDevice = Device->Extension;
struct netvsc_device *netDevice = Device->Extension;

DPRINT_ENTER(NETVSC);

Expand All @@ -911,7 +911,7 @@ static int RndisFilterOnOpen(struct hv_device *Device)
static int RndisFilterOnClose(struct hv_device *Device)
{
int ret;
struct NETVSC_DEVICE *netDevice = Device->Extension;
struct netvsc_device *netDevice = Device->Extension;

DPRINT_ENTER(NETVSC);

Expand Down

0 comments on commit b28dfac

Please sign in to comment.