diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-01-10 19:52:43 -0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2017-01-26 17:40:28 +0100 |
| commit | bb7927f5df7bd4f1814880fb6c794dab8bad24e6 (patch) | |
| tree | 74013428ab69351b10408a748c7f87d87ed2fd00 | |
| parent | 40e60967a4521c3706da84e5cef49eef4c977d45 (diff) | |
| download | linux-stable-bb7927f5df7bd4f1814880fb6c794dab8bad24e6.tar.gz linux-stable-bb7927f5df7bd4f1814880fb6c794dab8bad24e6.tar.bz2 linux-stable-bb7927f5df7bd4f1814880fb6c794dab8bad24e6.zip | |
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: Jiri Slaby <jslaby@suse.cz>
| -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 3595e536e0fd..6b0ddf661f92 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3969,8 +3969,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); } } |