ice: Get rid of ice_cleanup_header (133f4883) · Commits · 戴 / test

drivers/net/ethernet/intel/ice/ice_txrx.c

+2 −25

Original line number	Diff line number	Diff line
		@@ -944,27 +944,6 @@ static void ice_put_rx_buf(struct ice_ring rx_ring, struct ice_rx_buf rx_buf)
		rx_buf->skb = NULL;
		}

		/**
		* ice_cleanup_headers - Correct empty headers
		* @skb: pointer to current skb being fixed
		*
		* Also address the case where we are pulling data in on pages only
		* and as such no data is present in the skb header.
		*
		* In addition if skb is not at least 60 bytes we need to pad it so that
		* it is large enough to qualify as a valid Ethernet frame.
		*
		* Returns true if an error was encountered and skb was freed.
		*/
		static bool ice_cleanup_headers(struct sk_buff *skb)
		{
		/* if eth_skb_pad returns an error the skb was freed */
		if (eth_skb_pad(skb))
		return true;

		return false;
		}

		/**
		* ice_is_non_eop - process handling of non-EOP buffers
		* @rx_ring: Rx ring being processed
		@@ -1124,10 +1103,8 @@ construct_skb:
		if (ice_test_staterr(rx_desc, stat_err_bits))
		vlan_tag = le16_to_cpu(rx_desc->wb.l2tag1);

		/* correct empty headers and pad skb if needed (to make valid
		* ethernet frame
		*/
		if (ice_cleanup_headers(skb)) {
		/* pad the skb if needed, to make a valid ethernet frame */
		if (eth_skb_pad(skb)) {
		skb = NULL;
		continue;
		}