* [PATCH] hyperv: netvsc: Neaten netvsc_send_pkt by using a temporary
@ 2017-07-30 21:19 Joe Perches
2017-07-31 17:05 ` Stephen Hemminger
0 siblings, 1 reply; 3+ messages in thread
From: Joe Perches @ 2017-07-30 21:19 UTC (permalink / raw)
To: K. Y. Srinivasan, Haiyang Zhang, Stephen Hemminger
Cc: devel, netdev, linux-kernel
Repeated dereference of nvmsg.msg.v1_msg.send_rndis_pkt can be
shortened by using a temporary. Do so.
No change in object code.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/hyperv/netvsc.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 06f39a99da7c..fede1546cdc6 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -743,6 +743,7 @@ static inline int netvsc_send_pkt(
struct sk_buff *skb)
{
struct nvsp_message nvmsg;
+ struct nvsp_1_message_send_rndis_packet *rpkt;
struct netvsc_channel *nvchan
= &net_device->chan_table[packet->q_idx];
struct vmbus_channel *out_channel = nvchan->channel;
@@ -754,21 +755,17 @@ static inline int netvsc_send_pkt(
u32 ring_avail = hv_ringbuf_avail_percent(&out_channel->outbound);
nvmsg.hdr.msg_type = NVSP_MSG1_TYPE_SEND_RNDIS_PKT;
- if (skb != NULL) {
- /* 0 is RMC_DATA; */
- nvmsg.msg.v1_msg.send_rndis_pkt.channel_type = 0;
- } else {
- /* 1 is RMC_CONTROL; */
- nvmsg.msg.v1_msg.send_rndis_pkt.channel_type = 1;
- }
+ rpkt = &nvmsg.msg.v1_msg.send_rndis_pkt;
+ if (skb != NULL)
+ rpkt->channel_type = 0; /* 0 is RMC_DATA */
+ else
+ rpkt->channel_type = 1; /* 1 is RMC_CONTROL */
- nvmsg.msg.v1_msg.send_rndis_pkt.send_buf_section_index =
- packet->send_buf_index;
+ rpkt->send_buf_section_index = packet->send_buf_index;
if (packet->send_buf_index == NETVSC_INVALID_INDEX)
- nvmsg.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0;
+ rpkt->send_buf_section_size = 0;
else
- nvmsg.msg.v1_msg.send_rndis_pkt.send_buf_section_size =
- packet->total_data_buflen;
+ rpkt->send_buf_section_size = packet->total_data_buflen;
req_id = (ulong)skb;
@@ -776,8 +773,7 @@ static inline int netvsc_send_pkt(
return -ENODEV;
if (packet->page_buf_cnt) {
- pgbuf = packet->cp_partial ? (*pb) +
- packet->rmsg_pgcnt : (*pb);
+ pgbuf = packet->cp_partial ? *pb + packet->rmsg_pgcnt : *pb;
ret = vmbus_sendpacket_pagebuffer_ctl(out_channel,
pgbuf,
packet->page_buf_cnt,
--
2.10.0.rc2.1.g053435c
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] hyperv: netvsc: Neaten netvsc_send_pkt by using a temporary
2017-07-30 21:19 [PATCH] hyperv: netvsc: Neaten netvsc_send_pkt by using a temporary Joe Perches
@ 2017-07-31 17:05 ` Stephen Hemminger
2017-07-31 17:33 ` Joe Perches
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Hemminger @ 2017-07-31 17:05 UTC (permalink / raw)
To: Joe Perches
Cc: K. Y. Srinivasan, Haiyang Zhang, Stephen Hemminger, devel, netdev,
linux-kernel
On Sun, 30 Jul 2017 14:19:30 -0700
Joe Perches <joe@perches.com> wrote:
> Repeated dereference of nvmsg.msg.v1_msg.send_rndis_pkt can be
> shortened by using a temporary. Do so.
>
> No change in object code.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Looks good, several other places also suffer from to long.variable.name.wordiness.
Please rebase this on net-next.
> ---
> drivers/net/hyperv/netvsc.c | 24 ++++++++++--------------
> 1 file changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
> index 06f39a99da7c..fede1546cdc6 100644
> --- a/drivers/net/hyperv/netvsc.c
> +++ b/drivers/net/hyperv/netvsc.c
> @@ -743,6 +743,7 @@ static inline int netvsc_send_pkt(
> struct sk_buff *skb)
> {
> struct nvsp_message nvmsg;
> + struct nvsp_1_message_send_rndis_packet *rpkt;
const?
> struct netvsc_channel *nvchan
> = &net_device->chan_table[packet->q_idx];
> struct vmbus_channel *out_channel = nvchan->channel;
> @@ -754,21 +755,17 @@ static inline int netvsc_send_pkt(
> u32 ring_avail = hv_ringbuf_avail_percent(&out_channel->outbound);
>
> nvmsg.hdr.msg_type = NVSP_MSG1_TYPE_SEND_RNDIS_PKT;
> - if (skb != NULL) {
> - /* 0 is RMC_DATA; */
> - nvmsg.msg.v1_msg.send_rndis_pkt.channel_type = 0;
> - } else {
> - /* 1 is RMC_CONTROL; */
> - nvmsg.msg.v1_msg.send_rndis_pkt.channel_type = 1;
> - }
> + rpkt = &nvmsg.msg.v1_msg.send_rndis_pkt;
> + if (skb != NULL)
> + rpkt->channel_type = 0; /* 0 is RMC_DATA */
> + else
> + rpkt->channel_type = 1; /* 1 is RMC_CONTROL */
>
> - nvmsg.msg.v1_msg.send_rndis_pkt.send_buf_section_index =
> - packet->send_buf_index;
> + rpkt->send_buf_section_index = packet->send_buf_index;
> if (packet->send_buf_index == NETVSC_INVALID_INDEX)
> - nvmsg.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0;
> + rpkt->send_buf_section_size = 0;
> else
> - nvmsg.msg.v1_msg.send_rndis_pkt.send_buf_section_size =
> - packet->total_data_buflen;
> + rpkt->send_buf_section_size = packet->total_data_buflen;
>
> req_id = (ulong)skb;
>
> @@ -776,8 +773,7 @@ static inline int netvsc_send_pkt(
> return -ENODEV;
>
> if (packet->page_buf_cnt) {
> - pgbuf = packet->cp_partial ? (*pb) +
> - packet->rmsg_pgcnt : (*pb);
> + pgbuf = packet->cp_partial ? *pb + packet->rmsg_pgcnt : *pb;
> ret = vmbus_sendpacket_pagebuffer_ctl(out_channel,
> pgbuf,
> packet->page_buf_cnt,
This part just changed (got rid of indirection) in net-next.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] hyperv: netvsc: Neaten netvsc_send_pkt by using a temporary
2017-07-31 17:05 ` Stephen Hemminger
@ 2017-07-31 17:33 ` Joe Perches
0 siblings, 0 replies; 3+ messages in thread
From: Joe Perches @ 2017-07-31 17:33 UTC (permalink / raw)
To: Stephen Hemminger
Cc: K. Y. Srinivasan, Haiyang Zhang, Stephen Hemminger, devel, netdev,
linux-kernel
On Mon, 2017-07-31 at 10:05 -0700, Stephen Hemminger wrote:
> On Sun, 30 Jul 2017 14:19:30 -0700 Joe Perches <joe@perches.com> wrote:
> > Repeated dereference of nvmsg.msg.v1_msg.send_rndis_pkt can be
> > shortened by using a temporary. Do so.
[]
> Looks good, several other places also suffer from to long.variable.name.wordiness.
My suggestion is to identify and fix those when you've time.
> > diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
[]
> > @@ -743,6 +743,7 @@ static inline int netvsc_send_pkt(
> > struct sk_buff *skb)
> > {
> > struct nvsp_message nvmsg;
> > + struct nvsp_1_message_send_rndis_packet *rpkt;
>
> const?
I suppose. It's an unusual style in the kernel though.
> This part just changed (got rid of indirection) in net-next.
No worries.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-31 17:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-30 21:19 [PATCH] hyperv: netvsc: Neaten netvsc_send_pkt by using a temporary Joe Perches
2017-07-31 17:05 ` Stephen Hemminger
2017-07-31 17:33 ` Joe Perches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox