rocker: linearize skb in case frags would not fit into tx descriptor

Suggested-by: Scott Feldman <[email protected]>
Signed-off-by: Jiri Pirko <[email protected]>
Acked-by: Scott Feldman <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 730bdc01b94488a540244e54c4c88c4fadb9a7ce..4cd5a71ad45e577d8cc4fb68c6b0c6d3d20e9b28 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4157,8 +4157,11 @@ static netdev_tx_t rocker_port_xmit(struct sk_buff *skb, struct net_device *dev)
                                          skb->data, skb_headlen(skb));
        if (err)
                goto nest_cancel;
-       if (skb_shinfo(skb)->nr_frags > ROCKER_TX_FRAGS_MAX)
-               goto nest_cancel;
+       if (skb_shinfo(skb)->nr_frags > ROCKER_TX_FRAGS_MAX) {
+               err = skb_linearize(skb);
+               if (err)
+                       goto unmap_frags;
+       }
 
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];