diff options
author | Jerry Snitselaar <jsnitsel@redhat.com> | 2015-05-04 13:57:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-05 17:31:09 -0400 |
commit | 7aab5159fa0100ee3f80d1b0f55cd7e9b5823270 (patch) | |
tree | 4fcea0e87e0009061007f25085459713ffcfc91e /drivers/net | |
parent | b7ba7b469a4ffc2907c355a3c0873173567d9038 (diff) |
hv_netvsc: remove unused variable in netvsc_send()
With commit b56fc3c53654 ("hv_netvsc: Fix a bug in netvsc_start_xmit()"),
skb variable is no longer used in netvsc_send. Remove variable and dead
code that depended on it.
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/hyperv/netvsc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 2d9ef533cc48..ea091bc5ff09 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c | |||
@@ -826,7 +826,6 @@ int netvsc_send(struct hv_device *device, | |||
826 | u16 q_idx = packet->q_idx; | 826 | u16 q_idx = packet->q_idx; |
827 | u32 pktlen = packet->total_data_buflen, msd_len = 0; | 827 | u32 pktlen = packet->total_data_buflen, msd_len = 0; |
828 | unsigned int section_index = NETVSC_INVALID_INDEX; | 828 | unsigned int section_index = NETVSC_INVALID_INDEX; |
829 | struct sk_buff *skb = NULL; | ||
830 | unsigned long flag; | 829 | unsigned long flag; |
831 | struct multi_send_data *msdp; | 830 | struct multi_send_data *msdp; |
832 | struct hv_netvsc_packet *msd_send = NULL, *cur_send = NULL; | 831 | struct hv_netvsc_packet *msd_send = NULL, *cur_send = NULL; |
@@ -924,12 +923,8 @@ int netvsc_send(struct hv_device *device, | |||
924 | if (cur_send) | 923 | if (cur_send) |
925 | ret = netvsc_send_pkt(cur_send, net_device); | 924 | ret = netvsc_send_pkt(cur_send, net_device); |
926 | 925 | ||
927 | if (ret != 0) { | 926 | if (ret != 0 && section_index != NETVSC_INVALID_INDEX) |
928 | if (section_index != NETVSC_INVALID_INDEX) | 927 | netvsc_free_send_slot(net_device, section_index); |
929 | netvsc_free_send_slot(net_device, section_index); | ||
930 | } else if (skb) { | ||
931 | dev_kfree_skb_any(skb); | ||
932 | } | ||
933 | 928 | ||
934 | return ret; | 929 | return ret; |
935 | } | 930 | } |