netvsc: don't overload variable in same function
authorstephen hemminger <stephen@networkplumber.org>
Mon, 27 Feb 2017 18:26:47 +0000 (10:26 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Mar 2017 01:13:13 +0000 (17:13 -0800)
There are two variables named packet in the same function. One is the
metadata descriptor from host (vmpacket_descriptor) and the other is
the control block in the skb used to hold metadata from send.
Change name to avoid possible confusion and bugs.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/hyperv/netvsc.c

index d35ebd993b385255eaa441fb67272c117e328e7f..5dedbc36c326373be951e4d644e2d32ad50dffce 100644 (file)
@@ -600,9 +600,9 @@ static inline void netvsc_free_send_slot(struct netvsc_device *net_device,
 static void netvsc_send_tx_complete(struct netvsc_device *net_device,
                                    struct vmbus_channel *incoming_channel,
                                    struct hv_device *device,
-                                   struct vmpacket_descriptor *packet)
+                                   const struct vmpacket_descriptor *desc)
 {
-       struct sk_buff *skb = (struct sk_buff *)(unsigned long)packet->trans_id;
+       struct sk_buff *skb = (struct sk_buff *)(unsigned long)desc->trans_id;
        struct net_device *ndev = hv_get_drvdata(device);
        struct net_device_context *net_device_ctx = netdev_priv(ndev);
        struct vmbus_channel *channel = device->channel;