diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-01-10 19:52:43 -0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-06-17 15:49:27 +0200 |
| commit | 29fcb08d193b5c4b5631f21d55ed0eef20ab2377 (patch) | |
| tree | 27dfa7e4d3361388646c46d6edc87e82dbe613dd /net/core | |
| parent | 4e3ba2f54de1770eac5acc445a2a88c7afbc2aa6 (diff) | |
gro: use min_t() in skb_gro_reset_offset()
commit 7cfd5fd5a9813f1430290d20c0fead9b4582a307 upstream.
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: Willy Tarreau <w@1wt.eu>
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 fb7273ec1..ea136f344 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3912,8 +3912,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); } } |