Skip to content

Commit db7119e

Browse files
edumazetgregkh
authored andcommitted
gro: use min_t() in skb_gro_reset_offset()
[ Upstream commit 7cfd5fd5a9813f1430290d20c0fead9b4582a307 ] 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: 1272ce87fa01 ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5169043 commit db7119e

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

net/core/dev.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4187,8 +4187,9 @@ static void skb_gro_reset_offset(struct sk_buff *skb)
41874187
pinfo->nr_frags &&
41884188
!PageHighMem(skb_frag_page(frag0))) {
41894189
NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0);
4190-
NAPI_GRO_CB(skb)->frag0_len = min(skb_frag_size(frag0),
4191-
skb->end - skb->tail);
4190+
NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int,
4191+
skb_frag_size(frag0),
4192+
skb->end - skb->tail);
41924193
}
41934194
}
41944195

0 commit comments

Comments
 (0)