Re: [PATCH 1/1] infiniband: nes: return value of skb_linearize should be handled

[Doug Ledford]

On 12/7/2016 2:30 AM, Zhouyi Zhou wrote:
> Return value of skb_linearize should be handled in function 
> nes_netdev_start_xmit.
> 
> Compiled in x86_64
> Signed-off-by: Zhouyi Zhou 
> Reviewed-by: Yuval Shaia  
> Reviewed-by: Eric Dumazet 

Applied, thanks.

-- 
Doug Ledford 
GPG Key ID: 0E572FDD



signature.asc
Description: OpenPGP digital signature

Re: [PATCH 1/1] infiniband: nes: return value of skb_linearize should be handled

[Doug Ledford]

On 12/7/2016 2:30 AM, Zhouyi Zhou wrote:
> Return value of skb_linearize should be handled in function 
> nes_netdev_start_xmit.
> 
> Compiled in x86_64
> Signed-off-by: Zhouyi Zhou 
> Reviewed-by: Yuval Shaia  
> Reviewed-by: Eric Dumazet 

Applied, thanks.

-- 
Doug Ledford 
GPG Key ID: 0E572FDD



signature.asc
Description: OpenPGP digital signature

[PATCH 1/1] infiniband: nes: return value of skb_linearize should be handled

[Zhouyi Zhou]

Return value of skb_linearize should be handled in function 
nes_netdev_start_xmit.

Compiled in x86_64
Signed-off-by: Zhouyi Zhou 
Reviewed-by: Yuval Shaia  
Reviewed-by: Eric Dumazet 

---
 drivers/infiniband/hw/nes/nes_nic.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/nes/nes_nic.c 
b/drivers/infiniband/hw/nes/nes_nic.c
index 2b27d13..dfd1f57 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -662,10 +662,14 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, 
struct net_device *netdev)
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))
-- 
1.9.1

[PATCH 1/1] infiniband: nes: return value of skb_linearize should be handled

[Zhouyi Zhou]

Return value of skb_linearize should be handled in function 
nes_netdev_start_xmit.

Compiled in x86_64
Signed-off-by: Zhouyi Zhou 
Reviewed-by: Yuval Shaia  
Reviewed-by: Eric Dumazet 

---
 drivers/infiniband/hw/nes/nes_nic.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/nes/nes_nic.c 
b/drivers/infiniband/hw/nes/nes_nic.c
index 2b27d13..dfd1f57 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -662,10 +662,14 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, 
struct net_device *netdev)
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))
-- 
1.9.1