Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2201a21 authored by Mintz, Yuval's avatar Mintz, Yuval Committed by David S. Miller
Browse files

qed: No need for LL2 frags indication 



This is a legacy leftover; There's no current flow where 'frags_mapped'
would be set.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0518c12f

drivers/net/ethernet/qlogic/qed/qed_ll2.c

+8 −23
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ struct qed_cb_ll2_info { 
	int rx_cnt;

	u32 rx_size;

	u8 handle;

	bool frags_mapped;



	/* Lock protecting LL2 buffer lists in sleepless context */

	spinlock_t lock;
@@ -108,12 +107,6 @@ static void qed_ll2b_complete_tx_packet(void *cxt, 
		cdev->ll2->cbs->tx_cb(cdev->ll2->cb_cookie, skb,

				      b_last_fragment);



	if (cdev->ll2->frags_mapped)

		/* Case where mapped frags were received, need to

		 * free skb with nr_frags marked as 0

		 */

		skb_shinfo(skb)->nr_frags = 0;



	dev_kfree_skb_any(skb);

}
@@ -2100,7 +2093,6 @@ static int qed_ll2_start(struct qed_dev *cdev, struct qed_ll2_params *params) 
	spin_lock_init(&cdev->ll2->lock);

	cdev->ll2->rx_size = NET_SKB_PAD + ETH_HLEN +

			     L1_CACHE_BYTES + params->mtu;

	cdev->ll2->frags_mapped = params->frags_mapped;



	/*Allocate memory for LL2 */

	DP_INFO(cdev, "Allocating LL2 buffers of size %08x bytes\n",
@@ -2313,22 +2305,15 @@ static int qed_ll2_start_xmit(struct qed_dev *cdev, struct sk_buff *skb) 


	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

		frag = &skb_shinfo(skb)->frags[i];

		if (!cdev->ll2->frags_mapped) {



		mapping = skb_frag_dma_map(&cdev->pdev->dev, frag, 0,

						   skb_frag_size(frag),

						   DMA_TO_DEVICE);

					   skb_frag_size(frag), DMA_TO_DEVICE);



			if (unlikely(dma_mapping_error(&cdev->pdev->dev,

						       mapping))) {

		if (unlikely(dma_mapping_error(&cdev->pdev->dev, mapping))) {

			DP_NOTICE(cdev,

				  "Unable to map frag - dropping packet\n");

				rc = -ENOMEM;

			goto err;

		}

		} else {

			mapping = page_to_phys(skb_frag_page(frag)) |

			    frag->page_offset;

		}



		rc = qed_ll2_set_fragment_of_tx_packet(QED_LEADING_HWFN(cdev),

						       cdev->ll2->handle,