be2net: Remove unnecessary frag list traversing. (ebc8d2ab) · Commits · 戴 / test

This driver does not indicate support for frag lists. Furthermore, even if it did, the code is walking the frag lists incorrectly. The idiom is: for (iter = skb_shinfo(skb)->frag_list; iter; iter = iter->next) but it's doing: for (iter = skb_shinfo(skb)->frag_list; iter; iter = skb_shinfo(iter)->frag_list) which would never work. And this proves that this driver never saw an SKB with active frag lists. So just remove the code altogether and the driver TX path becomes much simpler. Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/benet/be_main.c

+25 −31

Original line number	Diff line number	Diff line
		@@ -337,13 +337,10 @@ static void be_tx_stats_update(struct be_adapter *adapter,
		/* Determine number of WRB entries needed to xmit data in an skb */
		static u32 wrb_cnt_for_skb(struct sk_buff skb, bool dummy)
		{
		int cnt = 0;
		while (skb) {
		if (skb->len > skb->data_len)
		cnt++;
		int cnt = (skb->len > skb->data_len);

		cnt += skb_shinfo(skb)->nr_frags;
		skb = skb_shinfo(skb)->frag_list;
		}

		/* to account for hdr wrb */
		cnt++;
		if (cnt & 1) {
		@@ -409,7 +406,6 @@ static int make_tx_wrbs(struct be_adapter *adapter,
		hdr = queue_head_node(txq);
		queue_head_inc(txq);

		while (skb) {
		if (skb->len > skb->data_len) {
		int len = skb->len - skb->data_len;
		busaddr = pci_map_single(pdev, skb->data, len,
		@@ -433,8 +429,6 @@ static int make_tx_wrbs(struct be_adapter *adapter,
		queue_head_inc(txq);
		copied += frag->size;
		}
		skb = skb_shinfo(skb)->frag_list;
		}

		if (dummy_wrb) {
		wrb = queue_head_node(txq);

Admin message