Commit db7119ea authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman

gro: use min_t() in skb_gro_reset_offset()

[ Upstream commit 7cfd5fd5 ]

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 <fengguang.wu@intel.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5169043e
...@@ -4187,8 +4187,9 @@ static void skb_gro_reset_offset(struct sk_buff *skb) ...@@ -4187,8 +4187,9 @@ static void skb_gro_reset_offset(struct sk_buff *skb)
pinfo->nr_frags && pinfo->nr_frags &&
!PageHighMem(skb_frag_page(frag0))) { !PageHighMem(skb_frag_page(frag0))) {
NAPI_GRO_CB(skb)->frag0 = skb_frag_address(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->end - skb->tail); skb_frag_size(frag0),
skb->end - skb->tail);
} }
} }
......
Markdown is supported
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