mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 18:39:59 +00:00
Code Issues Releases Wiki Activity

Drivers: net: hyperv: Cleanup the netvsc receive callback functio

Browse source 
Get rid of the buffer allocation in the receive path for normal packets.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
KY Srinivasan 2014-02-16 16:38:45 -08:00 committed by David S. Miller
parent 97c1723a61
commit ee0c4c39c5
2 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/hyperv/hyperv_net.h
View file

@ -506,6 +506,8 @@ struct netvsc_device {
/* Holds rndis device info */ /* Holds rndis device info */
void *extension; void *extension;
/* The recive buffer for this device */
unsigned char cb_buffer[NETVSC_PACKET_SIZE];
}; };
/* NdisInitialize message */ /* NdisInitialize message */

33
drivers/net/hyperv/netvsc.c
View file

@ -795,22 +795,16 @@ static void netvsc_channel_cb(void *context)
struct netvsc_device *net_device; struct netvsc_device *net_device;
u32 bytes_recvd; u32 bytes_recvd;
u64 request_id; u64 request_id;
unsigned char *packet;
struct vmpacket_descriptor *desc; struct vmpacket_descriptor *desc;
unsigned char *buffer; unsigned char *buffer;
int bufferlen = NETVSC_PACKET_SIZE; int bufferlen = NETVSC_PACKET_SIZE;
struct net_device *ndev; struct net_device *ndev;
packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char),
GFP_ATOMIC);
if (!packet)
return;
buffer = packet;
net_device = get_inbound_net_device(device); net_device = get_inbound_net_device(device);
if (!net_device) if (!net_device)
goto out; return;
ndev = net_device->ndev; ndev = net_device->ndev;
buffer = net_device->cb_buffer;
do { do {
ret = vmbus_recvpacket_raw(device->channel, buffer, bufferlen, ret = vmbus_recvpacket_raw(device->channel, buffer, bufferlen,
@ -838,23 +832,16 @@ static void netvsc_channel_cb(void *context)
break; break;
} }
/* reset */
if (bufferlen > NETVSC_PACKET_SIZE) {
kfree(buffer);
buffer = packet;
bufferlen = NETVSC_PACKET_SIZE;
}
} else { } else {
/* reset */ /*
if (bufferlen > NETVSC_PACKET_SIZE) { * We are done for this pass.
kfree(buffer); */
buffer = packet;
bufferlen = NETVSC_PACKET_SIZE;
}
break; break;
} }
} else if (ret == -ENOBUFS) { } else if (ret == -ENOBUFS) {
if (bufferlen > NETVSC_PACKET_SIZE)
kfree(buffer);
/* Handle large packet */ /* Handle large packet */
buffer = kmalloc(bytes_recvd, GFP_ATOMIC); buffer = kmalloc(bytes_recvd, GFP_ATOMIC);
if (buffer == NULL) { if (buffer == NULL) {
@ -869,8 +856,8 @@ static void netvsc_channel_cb(void *context)
} }
} while (1); } while (1);
out: if (bufferlen > NETVSC_PACKET_SIZE)
kfree(buffer); kfree(buffer);
return; return;
} }