Commit 7cfd5fd5 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: default avatarkernel test robot <>
Signed-off-by: default avatarEric Dumazet <>
Signed-off-by: default avatarDavid S. Miller <>
parent 6c711c86
......@@ -4441,8 +4441,9 @@ 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),
skb->end - skb->tail);
NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int,
skb->end - skb->tail);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment