evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drivers: net: hyperv: Get rid of the rndis_filter_packet structure

Browse source 
This structure is redundant; get rid of it make the code little more efficient -
get rid of the unnecessary indirection.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
KY Srinivasan 2014-02-16 16:38:43 -08:00 • committed by David S. Miller
parent c1b5994770
commit 86eedacc63
3 changed files with 4 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -846,12 +846,6 @@ struct rndis_message {
}; };
struct rndis_filter_packet {
void *completion_ctx;
void (*completion)(void *context);
struct rndis_message msg;
};
/* Handy macros */ /* Handy macros */
/* get the size of an RNDIS message. Pass in the message type, */ /* get the size of an RNDIS message. Pass in the message type, */

2
drivers/net/hyperv/netvsc_drv.c
View file

@ -146,7 +146,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
/* Allocate a netvsc packet based on # of frags. */ /* Allocate a netvsc packet based on # of frags. */
packet = kzalloc(sizeof(struct hv_netvsc_packet) + packet = kzalloc(sizeof(struct hv_netvsc_packet) +
(num_pages * sizeof(struct hv_page_buffer)) + (num_pages * sizeof(struct hv_page_buffer)) +
sizeof(struct rndis_filter_packet) + sizeof(struct rndis_message) +
NDIS_VLAN_PPI_SIZE, GFP_ATOMIC); NDIS_VLAN_PPI_SIZE, GFP_ATOMIC);
if (!packet) { if (!packet) {
/* out of memory, drop packet */ /* out of memory, drop packet */

41
drivers/net/hyperv/rndis_filter.c
View file

@ -58,9 +58,6 @@ struct rndis_request {
u8 request_ext[RNDIS_EXT_LEN]; u8 request_ext[RNDIS_EXT_LEN];
}; };
static void rndis_filter_send_completion(void *ctx);
static struct rndis_device *get_rndis_device(void) static struct rndis_device *get_rndis_device(void)
{ {
struct rndis_device *device; struct rndis_device *device;
@ -277,7 +274,7 @@ static void rndis_filter_receive_response(struct rndis_device *dev,
"rndis response buffer overflow " "rndis response buffer overflow "
"detected (size %u max %zu)\n", "detected (size %u max %zu)\n",
resp->msg_len, resp->msg_len,
sizeof(struct rndis_filter_packet)); sizeof(struct rndis_message));
if (resp->ndis_msg_type == if (resp->ndis_msg_type ==
RNDIS_MSG_RESET_C) { RNDIS_MSG_RESET_C) {
@ -898,17 +895,14 @@ int rndis_filter_close(struct hv_device *dev)
int rndis_filter_send(struct hv_device *dev, int rndis_filter_send(struct hv_device *dev,
struct hv_netvsc_packet *pkt) struct hv_netvsc_packet *pkt)
{ {
int ret;
struct rndis_filter_packet *filter_pkt;
struct rndis_message *rndis_msg; struct rndis_message *rndis_msg;
struct rndis_packet *rndis_pkt; struct rndis_packet *rndis_pkt;
u32 rndis_msg_size; u32 rndis_msg_size;
bool isvlan = pkt->vlan_tci & VLAN_TAG_PRESENT; bool isvlan = pkt->vlan_tci & VLAN_TAG_PRESENT;
/* Add the rndis header */ /* Add the rndis header */
filter_pkt = (struct rndis_filter_packet *)pkt->extension; rndis_msg = (struct rndis_message *)pkt->extension;
rndis_msg = &filter_pkt->msg;
rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet); rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet);
if (isvlan) if (isvlan)
rndis_msg_size += NDIS_VLAN_PPI_SIZE; rndis_msg_size += NDIS_VLAN_PPI_SIZE;
@ -961,34 +955,5 @@ int rndis_filter_send(struct hv_device *dev,
pkt->page_buf[1].len = rndis_msg_size - pkt->page_buf[0].len; pkt->page_buf[1].len = rndis_msg_size - pkt->page_buf[0].len;
} }
/* Save the packet send completion and context */ return netvsc_send(dev, pkt);
filter_pkt->completion = pkt->completion.send.send_completion;
filter_pkt->completion_ctx =
pkt->completion.send.send_completion_ctx;
/* Use ours */
pkt->completion.send.send_completion = rndis_filter_send_completion;
pkt->completion.send.send_completion_ctx = filter_pkt;
ret = netvsc_send(dev, pkt);
if (ret != 0) {
/*
* Reset the completion to originals to allow retries from
* above
*/
pkt->completion.send.send_completion =
filter_pkt->completion;
pkt->completion.send.send_completion_ctx =
filter_pkt->completion_ctx;
}
return ret;
}
static void rndis_filter_send_completion(void *ctx)
{
struct rndis_filter_packet *filter_pkt = ctx;
/* Pass it back to the original handler */
filter_pkt->completion(filter_pkt->completion_ctx);
} }