[ovs-dev,3/6] datapath: Constify struct nf_conntrack_l4proto

Message ID 1512518481-5944-4-git-send-email-gvrose8192@gmail.com
State New
Headers show
Series
  • Enable OVS on Linux 4.14 kernel
Related show

Commit Message

Gregory Rose Dec. 6, 2017, 12:01 a.m.
Linux 4.14 requires this parameter to be constified.

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
---
 datapath/conntrack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Gregory Rose Dec. 6, 2017, 11:55 p.m. | #1
On 12/5/2017 4:01 PM, Greg Rose wrote:
> Linux 4.14 requires this parameter to be constified.
>
> Signed-off-by: Greg Rose <gvrose8192@gmail.com>
> ---
>   datapath/conntrack.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/datapath/conntrack.c b/datapath/conntrack.c
> index d517a87..4b181ad 100644
> --- a/datapath/conntrack.c
> +++ b/datapath/conntrack.c
> @@ -614,7 +614,7 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone,
>   		     u8 l3num, struct sk_buff *skb, bool natted)
>   {
>   	struct nf_conntrack_l3proto *l3proto;
> -	struct nf_conntrack_l4proto *l4proto;
> +	const struct nf_conntrack_l4proto *l4proto;
>   	struct nf_conntrack_tuple tuple;
>   	struct nf_conntrack_tuple_hash *h;
>   	struct nf_conn *ct;

This is actually addressed in a separate patch from upstream that I will 
be backporting as part of the effort to keep
our out of tree datapath synched with the upstream.  I'll send a V2 of 
the patch series with the correct fixup and
pointers to the upstream commit, etc.

- Greg

Patch

diff --git a/datapath/conntrack.c b/datapath/conntrack.c
index d517a87..4b181ad 100644
--- a/datapath/conntrack.c
+++ b/datapath/conntrack.c
@@ -614,7 +614,7 @@  ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone,
 		     u8 l3num, struct sk_buff *skb, bool natted)
 {
 	struct nf_conntrack_l3proto *l3proto;
-	struct nf_conntrack_l4proto *l4proto;
+	const struct nf_conntrack_l4proto *l4proto;
 	struct nf_conntrack_tuple tuple;
 	struct nf_conntrack_tuple_hash *h;
 	struct nf_conn *ct;