Commit e4f7dbb1 authored Feb 21, 2013 by Alexander Duyck Committed by Jeff Kirsher Mar 05, 2013

igb: Drop BUILD_BUG_ON check from igb_build_rx_buffer

On s390 the igb driver was throwing a build error due to the fact that a frame
built using build_skb would be larger than 2K. Since this is not likely to
change at any point in the future we are better off just dropping the check
since we already had a check in igb_set_rx_buffer_len that will just disable
the usage of build_skb anyway.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent e08f626b

drivers/net/ethernet/intel/igb/igb_main.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -6227,13 +6227,6 @@ static struct sk_buff igb_build_rx_buffer(struct igb_ring rx_ring,
		/* If we spanned a buffer we have a huge mess so test for it */
		BUG_ON(unlikely(!igb_test_staterr(rx_desc, E1000_RXD_STAT_EOP)));

		/* Guarantee this function can be used by verifying buffer sizes */
		BUILD_BUG_ON(SKB_WITH_OVERHEAD(IGB_RX_BUFSZ) < (NET_SKB_PAD +
		NET_IP_ALIGN +
		IGB_TS_HDR_LEN +
		ETH_FRAME_LEN +
		ETH_FCS_LEN));

		rx_buffer = &rx_ring->rx_buffer_info[rx_ring->next_to_clean];
		page = rx_buffer->page;
		prefetchw(page);