diff options
| author | Zhouyi Zhou <zhouzhouyi@gmail.com> | 2016-12-07 08:30:05 +0100 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-12-14 20:26:49 +0100 |
| commit | 6a3a1056d66e6a64446930b0d9de2430d835d38f (patch) | |
| tree | a74407d72cb26a6a5d4da1a5e6fda04eca0fef0e /drivers/infiniband/hw/nes/nes_nic.c | |
| parent | MAINTAINERS: Update Intel RDMA RNIC driver maintainers (diff) | |
| download | linux-6a3a1056d66e6a64446930b0d9de2430d835d38f.tar.xz linux-6a3a1056d66e6a64446930b0d9de2430d835d38f.zip | |
infiniband: nes: return value of skb_linearize should be handled
Return value of skb_linearize should be handled in function
nes_netdev_start_xmit.
Compiled in x86_64
Signed-off-by: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_nic.c')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_nic.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 311b4ba1cade..4dcfe669ebad 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c @@ -662,10 +662,14 @@ tso_sq_no_longer_full: nesnic->sq_head &= nesnic->sq_size-1; } } else { - nesvnic->linearized_skbs++; hoffset = skb_transport_header(skb) - skb->data; nhoffset = skb_network_header(skb) - skb->data; - skb_linearize(skb); + if (skb_linearize(skb)) { + nesvnic->tx_sw_dropped++; + kfree_skb(skb); + return NETDEV_TX_OK; + } + nesvnic->linearized_skbs++; skb_set_transport_header(skb, hoffset); skb_set_network_header(skb, nhoffset); if (!nes_nic_send(skb, netdev)) |