diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-02-05 00:31:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-05 11:40:22 +0300 |
| commit | f4575d3534617eec98c7eb8701185cec96b4374b (patch) | |
| tree | ab1a61a58c3f3e97f26cf3a78ac48e4035f8ee78 | |
| parent | d1e158e2d7a0a91110b206653f0e02376e809150 (diff) | |
| download | linux-f4575d3534617eec98c7eb8701185cec96b4374b.tar.xz | |
flow_keys: n_proto type should be __be16
(struct flow_keys)->n_proto is in network order, use
proper type for this.
Fixes following sparse errors :
net/core/flow_dissector.c:139:39: warning: incorrect type in assignment (different base types)
net/core/flow_dissector.c:139:39: expected unsigned short [unsigned] [usertype] n_proto
net/core/flow_dissector.c:139:39: got restricted __be16 [assigned] [usertype] proto
net/core/flow_dissector.c:237:23: warning: incorrect type in assignment (different base types)
net/core/flow_dissector.c:237:23: expected unsigned short [unsigned] [usertype] n_proto
net/core/flow_dissector.c:237:23: got restricted __be16 [assigned] [usertype] proto
Signed-off-by: Eric Dumazet <edumazet@google.com>
Fixes: e0f31d849867 ("flow_keys: Record IP layer protocol in skb_flow_dissect()")
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/flow_keys.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h index 7ee2df083542..dc8fd81412bf 100644 --- a/include/net/flow_keys.h +++ b/include/net/flow_keys.h @@ -22,9 +22,9 @@ struct flow_keys { __be32 ports; __be16 port16[2]; }; - u16 thoff; - u16 n_proto; - u8 ip_proto; + u16 thoff; + __be16 n_proto; + u8 ip_proto; }; bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow, |