diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-06-13 01:23:15 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-13 02:03:24 +0400 |
| commit | 5b9b6263775d45ccc0c8b27344bfb1a97cf6f725 (patch) | |
| tree | 6664e2814ca41e796f7b20cfe42539db7eb7479c /net/ipv4/af_inet.c | |
| parent | 4a2e667ac15edd19b02321bc030acb3ebeb22ab6 (diff) | |
| download | linux-5b9b6263775d45ccc0c8b27344bfb1a97cf6f725.tar.xz | |
gro: remove a sparse error
Fix following sparse error :
net/ipv4/af_inet.c:1410:59: warning: restricted __be16 degrades to
integer
added in commit db8caf3dbc77599
("gro: should aggregate frames without DF")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
From: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 5598b06d62db..b4d0be2b7ce9 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1407,7 +1407,7 @@ static struct sk_buff **inet_gro_receive(struct sk_buff **head, NAPI_GRO_CB(p)->flush |= (iph->ttl ^ iph2->ttl) | (iph->tos ^ iph2->tos) | - ((iph->frag_off ^ iph2->frag_off) & htons(IP_DF)) | + (__force int)((iph->frag_off ^ iph2->frag_off) & htons(IP_DF)) | ((u16)(ntohs(iph2->id) + NAPI_GRO_CB(p)->count) ^ id); NAPI_GRO_CB(p)->flush |= flush; |