]> Pileus Git - ~andy/linux/commitdiff
gro: remove a sparse error
authorEric Dumazet <edumazet@google.com>
Wed, 12 Jun 2013 21:23:15 +0000 (14:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Jun 2013 22:03:24 +0000 (15:03 -0700)
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>
net/ipv4/af_inet.c

index 5598b06d62dbc20394207c8245f688b4b9534a08..b4d0be2b7ce94ada2582bd6faf0d1dd29a8920f4 100644 (file)
@@ -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;