diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-02 21:06:08 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-02 21:06:08 +0300 |
| commit | 08e209154d08b19b8315026b50bca990837e71ac (patch) | |
| tree | eeb66e8e40f0b732f7f91ee887d2f4e09283e1a9 /include | |
| parent | 0929567a7a2dab8455a7313956973ff0d339709a (diff) | |
| parent | a38402bc50709aac76796a955a15152a76e3fd4e (diff) | |
| download | linux-08e209154d08b19b8315026b50bca990837e71ac.tar.xz | |
Merge branch 'flow_dissector-dissect-tunnel-info'
Simon Horman says:
====================
flow_dissector: dissect tunnel info
Move dissection of tunnel info from the flower classifier to the flow
dissector where all other dissection occurs. This should not have any
behavioural affect on other users of the flow dissector.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dst_metadata.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/dst_metadata.h b/include/net/dst_metadata.h index a803129a4849..9fba2ebf6dda 100644 --- a/include/net/dst_metadata.h +++ b/include/net/dst_metadata.h @@ -24,7 +24,7 @@ struct metadata_dst { } u; }; -static inline struct metadata_dst *skb_metadata_dst(struct sk_buff *skb) +static inline struct metadata_dst *skb_metadata_dst(const struct sk_buff *skb) { struct metadata_dst *md_dst = (struct metadata_dst *) skb_dst(skb); @@ -34,7 +34,8 @@ static inline struct metadata_dst *skb_metadata_dst(struct sk_buff *skb) return NULL; } -static inline struct ip_tunnel_info *skb_tunnel_info(struct sk_buff *skb) +static inline struct ip_tunnel_info * +skb_tunnel_info(const struct sk_buff *skb) { struct metadata_dst *md_dst = skb_metadata_dst(skb); struct dst_entry *dst; |