leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hv_netvsc: use single existing drop path in netvsc_start_xmit

Browse Source 
... which validly uses dev_kfree_skb_any() instead of dev_kfree_skb().

Setting ret to -EFAULT and -ENOMEM have no real meaning here (we need to set
it to anything but -EAGAIN) as we drop the packet and return NETDEV_TX_OK
anyway.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vitaly Kuznetsov
2015-04-08 17:54:05 +02:00
committed by David S. Miller
parent 8ae178fb1c
commit 981a1bd85a
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/hyperv/netvsc_drv.c
View File

@@ -370,7 +370,7 @@ not_ip:
static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
{ {
struct net_device_context *net_device_ctx = netdev_priv(net); struct net_device_context *net_device_ctx = netdev_priv(net);
struct hv_netvsc_packet *packet; struct hv_netvsc_packet *packet = NULL;
int ret; int ret;
unsigned int num_data_pgs; unsigned int num_data_pgs;
struct rndis_message *rndis_msg; struct rndis_message *rndis_msg;
@@ -396,9 +396,8 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
num_data_pgs = netvsc_get_slots(skb) + 2; num_data_pgs = netvsc_get_slots(skb) + 2;
if (num_data_pgs > MAX_PAGE_BUFFER_COUNT) { if (num_data_pgs > MAX_PAGE_BUFFER_COUNT) {
netdev_err(net, "Packet too big: %u\n", skb->len); netdev_err(net, "Packet too big: %u\n", skb->len);
dev_kfree_skb(skb); ret = -EFAULT;
net->stats.tx_dropped++; goto drop;
return NETDEV_TX_OK;
} }
pkt_sz = sizeof(struct hv_netvsc_packet) + RNDIS_AND_PPI_SIZE; pkt_sz = sizeof(struct hv_netvsc_packet) + RNDIS_AND_PPI_SIZE;
@@ -408,9 +407,8 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
if (!packet) { if (!packet) {
/* out of memory, drop packet */ /* out of memory, drop packet */
netdev_err(net, "unable to alloc hv_netvsc_packet\n"); netdev_err(net, "unable to alloc hv_netvsc_packet\n");
dev_kfree_skb(skb); ret = -ENOMEM;
net->stats.tx_dropped++; goto drop;
return NETDEV_TX_OK;
} }
packet->part_of_skb = false; packet->part_of_skb = false;
} else { } else {
@@ -574,7 +572,7 @@ drop:
net->stats.tx_bytes += skb_length; net->stats.tx_bytes += skb_length;
net->stats.tx_packets++; net->stats.tx_packets++;
} else { } else {
if (!packet->part_of_skb) if (packet && !packet->part_of_skb)
kfree(packet); kfree(packet);
if (ret != -EAGAIN) { if (ret != -EAGAIN) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);