aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet2017-01-10 21:52:43 -0600
committerDavid S. Miller2017-01-11 07:15:40 -0600
commit7cfd5fd5a9813f1430290d20c0fead9b4582a307 (patch)
tree8637effcdc8ce0086eef34afc7ed72e6ca5e7501
parent6c711c8691bf91d0e830ff4215b08e51c0626769 (diff)
downloadmkaricheri-ti-linux-kernel-7cfd5fd5a9813f1430290d20c0fead9b4582a307.tar.gz
mkaricheri-ti-linux-kernel-7cfd5fd5a9813f1430290d20c0fead9b4582a307.tar.xz
mkaricheri-ti-linux-kernel-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>
-rw-r--r--net/core/dev.c5
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)
4441 pinfo->nr_frags && 4441 pinfo->nr_frags &&
4442 !PageHighMem(skb_frag_page(frag0))) { 4442 !PageHighMem(skb_frag_page(frag0))) {
4443 NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0); 4443 NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0);
4444 NAPI_GRO_CB(skb)->frag0_len = min(skb_frag_size(frag0), 4444 NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int,
4445 skb->end - skb->tail); 4445 skb_frag_size(frag0),
4446 skb->end - skb->tail);
4446 } 4447 }
4447} 4448}
4448 4449