Commit 7cfd5fd5 authored Jan 10, 2017 by Eric Dumazet Committed by David S. Miller Jan 11, 2017

gro: use min_t() in skb_gro_reset_offset()



On 32bit arches, (skb->end - skb->data) is not 'unsigned int',
so we shall use min_t() instead of min() to avoid a compiler error.

Fixes: 1272ce87 ("gro: Enter slow-path if there is no tailroom")
Reported-by: kernel test robot <fengguang.wu@intel.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6c711c86

net/core/dev.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -4441,7 +4441,8 @@ static void skb_gro_reset_offset(struct sk_buff *skb)
		pinfo->nr_frags &&
		!PageHighMem(skb_frag_page(frag0))) {
		NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0);
		NAPI_GRO_CB(skb)->frag0_len = min(skb_frag_size(frag0),
		NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int,
		skb_frag_size(frag0),
		skb->end - skb->tail);
		}
		}