diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-01-11 04:52:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-11 14:15:40 +0100 |
| commit | 7cfd5fd5a9813f1430290d20c0fead9b4582a307 (patch) | |
| tree | 8637effcdc8ce0086eef34afc7ed72e6ca5e7501 /net/core | |
| parent | Merge branch 'mlx5-fixes' (diff) | |
| download | linux-7cfd5fd5a9813f1430290d20c0fead9b4582a307.tar.xz linux-7cfd5fd5a9813f1430290d20c0fead9b4582a307.zip | |
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: 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>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 88d2907ca2cd..07b307b0b414 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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_frag_size(frag0), + skb->end - skb->tail); } } |