Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/809460/?format=api
{ "id": 809460, "url": "http://patchwork.ozlabs.org/api/1.2/patches/809460/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478574-13281-3-git-send-email-pablo@netfilter.org/", "project": { "id": 26, "url": "http://patchwork.ozlabs.org/api/1.2/projects/26/?format=api", "name": "Netfilter Development", "link_name": "netfilter-devel", "list_id": "netfilter-devel.vger.kernel.org", "list_email": "netfilter-devel@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1504478574-13281-3-git-send-email-pablo@netfilter.org>", "list_archive_url": null, "date": "2017-09-03T22:42:45", "name": "[38/47] netfilter: conntrack: make protocol tracker pointers const", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0738f49248711bfd43ac34608c38f4116493f4d9", "submitter": { "id": 1315, "url": "http://patchwork.ozlabs.org/api/1.2/people/1315/?format=api", "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org" }, "delegate": { "id": 6139, "url": "http://patchwork.ozlabs.org/api/1.2/users/6139/?format=api", "username": "pablo", "first_name": "Pablo", "last_name": "Neira", "email": "pablo@netfilter.org" }, "mbox": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478574-13281-3-git-send-email-pablo@netfilter.org/mbox/", "series": [ { "id": 1282, "url": "http://patchwork.ozlabs.org/api/1.2/series/1282/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1282", "date": "2017-09-03T22:40:11", "name": null, "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1282/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809460/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809460/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netfilter-devel-owner@vger.kernel.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netfilter-devel-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlp1w57Hdz9s8J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 4 Sep 2017 08:44:20 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753283AbdICWoN (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tSun, 3 Sep 2017 18:44:13 -0400", "from mail.us.es ([193.147.175.20]:53052 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753325AbdICWnK (ORCPT <rfc822; netfilter-devel@vger.kernel.org>);\n\tSun, 3 Sep 2017 18:43:10 -0400", "from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id C2196190F61\n\tfor <netfilter-devel@vger.kernel.org>;\n\tMon, 4 Sep 2017 00:42:42 +0200 (CEST)", "from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id A9424B5026\n\tfor <netfilter-devel@vger.kernel.org>;\n\tMon, 4 Sep 2017 00:42:42 +0200 (CEST)", "by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 9DF71B5028; Mon, 4 Sep 2017 00:42:42 +0200 (CEST)", "from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 5042EB5026;\n\tMon, 4 Sep 2017 00:42:40 +0200 (CEST)", "from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 00:42:40 +0200 (CEST)", "from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id C3C3E4265A20;\n\tMon, 4 Sep 2017 00:42:39 +0200 (CEST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int", "X-Spam-Level": "", "X-Spam-Status": "No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1", "X-Virus-Status": "clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)", "X-SMTPAUTHUS": "auth mail.us.es", "From": "Pablo Neira Ayuso <pablo@netfilter.org>", "To": "netfilter-devel@vger.kernel.org", "Cc": "davem@davemloft.net, netdev@vger.kernel.org", "Subject": "[PATCH 38/47] netfilter: conntrack: make protocol tracker pointers\n\tconst", "Date": "Mon, 4 Sep 2017 00:42:45 +0200", "Message-Id": "<1504478574-13281-3-git-send-email-pablo@netfilter.org>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1504478574-13281-1-git-send-email-pablo@netfilter.org>", "References": "<1504478574-13281-1-git-send-email-pablo@netfilter.org>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Sender": "netfilter-devel-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netfilter-devel.vger.kernel.org>", "X-Mailing-List": "netfilter-devel@vger.kernel.org" }, "content": "From: Florian Westphal <fw@strlen.de>\n\nDoesn't change generated code, but will make it easier to eventually\nmake the actual trackers themselvers const.\n\nSigned-off-by: Florian Westphal <fw@strlen.de>\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n---\n include/net/netfilter/nf_conntrack_l3proto.h | 6 +++---\n include/net/netfilter/nf_conntrack_l4proto.h | 4 ++--\n include/net/netfilter/nf_conntrack_timeout.h | 2 +-\n net/netfilter/nf_conntrack_core.c | 12 ++++++------\n net/netfilter/nf_conntrack_netlink.c | 22 +++++++++++-----------\n net/netfilter/nf_conntrack_proto.c | 20 ++++++++++----------\n net/netfilter/nfnetlink_cttimeout.c | 14 +++++++-------\n net/netfilter/xt_CT.c | 2 +-\n net/openvswitch/conntrack.c | 4 ++--\n 9 files changed, 43 insertions(+), 43 deletions(-)", "diff": "diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h\nindex dabb53b0913c..6269deecbee7 100644\n--- a/include/net/netfilter/nf_conntrack_l3proto.h\n+++ b/include/net/netfilter/nf_conntrack_l3proto.h\n@@ -64,10 +64,10 @@ struct nf_conntrack_l3proto {\n extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[NFPROTO_NUMPROTO];\n \n /* Protocol global registration. */\n-int nf_ct_l3proto_register(struct nf_conntrack_l3proto *proto);\n-void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto);\n+int nf_ct_l3proto_register(const struct nf_conntrack_l3proto *proto);\n+void nf_ct_l3proto_unregister(const struct nf_conntrack_l3proto *proto);\n \n-struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);\n+const struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);\n \n /* Existing built-in protocols */\n extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;\ndiff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h\nindex 4976ef92dc78..d4933d56809d 100644\n--- a/include/net/netfilter/nf_conntrack_l4proto.h\n+++ b/include/net/netfilter/nf_conntrack_l4proto.h\n@@ -114,10 +114,10 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;\n \n #define MAX_NF_CT_PROTO 256\n \n-struct nf_conntrack_l4proto *__nf_ct_l4proto_find(u_int16_t l3proto,\n+const struct nf_conntrack_l4proto *__nf_ct_l4proto_find(u_int16_t l3proto,\n \t\t\t\t\t\t u_int8_t l4proto);\n \n-struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u_int16_t l3proto,\n+const struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u_int16_t l3proto,\n \t\t\t\t\t\t u_int8_t l4proto);\n void nf_ct_l4proto_put(const struct nf_conntrack_l4proto *p);\n \ndiff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h\nindex b222957062b5..483d104fa254 100644\n--- a/include/net/netfilter/nf_conntrack_timeout.h\n+++ b/include/net/netfilter/nf_conntrack_timeout.h\n@@ -16,7 +16,7 @@ struct ctnl_timeout {\n \trefcount_t\t\trefcnt;\n \tchar\t\t\tname[CTNL_TIMEOUT_NAME_MAX];\n \t__u16\t\t\tl3num;\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tchar\t\t\tdata[0];\n };\n \ndiff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c\nindex f2f00eaf217d..c23df7c9cd59 100644\n--- a/net/netfilter/nf_conntrack_core.c\n+++ b/net/netfilter/nf_conntrack_core.c\n@@ -250,8 +250,8 @@ bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff,\n \t\t u_int16_t l3num,\n \t\t struct net *net, struct nf_conntrack_tuple *tuple)\n {\n-\tstruct nf_conntrack_l3proto *l3proto;\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l3proto *l3proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tunsigned int protoff;\n \tu_int8_t protonum;\n \tint ret;\n@@ -400,7 +400,7 @@ static void\n destroy_conntrack(struct nf_conntrack *nfct)\n {\n \tstruct nf_conn *ct = (struct nf_conn *)nfct;\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \n \tpr_debug(\"destroy_conntrack(%p)\\n\", ct);\n \tNF_CT_ASSERT(atomic_read(&nfct->use) == 0);\n@@ -694,7 +694,7 @@ static int nf_ct_resolve_clash(struct net *net, struct sk_buff *skb,\n {\n \t/* This is the conntrack entry already in hashes that won race. */\n \tstruct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h);\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \n \tl4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));\n \tif (l4proto->allow_clash &&\n@@ -1344,10 +1344,10 @@ unsigned int\n nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,\n \t\tstruct sk_buff *skb)\n {\n+\tconst struct nf_conntrack_l3proto *l3proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tstruct nf_conn *ct, *tmpl;\n \tenum ip_conntrack_info ctinfo;\n-\tstruct nf_conntrack_l3proto *l3proto;\n-\tstruct nf_conntrack_l4proto *l4proto;\n \tunsigned int *timeouts;\n \tunsigned int dataoff;\n \tu_int8_t protonum;\ndiff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c\nindex b59a453a0fd8..de4053d84364 100644\n--- a/net/netfilter/nf_conntrack_netlink.c\n+++ b/net/netfilter/nf_conntrack_netlink.c\n@@ -109,9 +109,9 @@ static int ctnetlink_dump_tuples_ip(struct sk_buff *skb,\n static int ctnetlink_dump_tuples(struct sk_buff *skb,\n \t\t\t\t const struct nf_conntrack_tuple *tuple)\n {\n+\tconst struct nf_conntrack_l3proto *l3proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tint ret;\n-\tstruct nf_conntrack_l3proto *l3proto;\n-\tstruct nf_conntrack_l4proto *l4proto;\n \n \trcu_read_lock();\n \tl3proto = __nf_ct_l3proto_find(tuple->src.l3num);\n@@ -163,7 +163,7 @@ static int ctnetlink_dump_timeout(struct sk_buff *skb, const struct nf_conn *ct)\n \n static int ctnetlink_dump_protoinfo(struct sk_buff *skb, struct nf_conn *ct)\n {\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tstruct nlattr *nest_proto;\n \tint ret;\n \n@@ -535,9 +535,9 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type,\n \n static inline size_t ctnetlink_proto_size(const struct nf_conn *ct)\n {\n-\tstruct nf_conntrack_l3proto *l3proto;\n-\tstruct nf_conntrack_l4proto *l4proto;\n-\tsize_t len = 0;\n+\tconst struct nf_conntrack_l3proto *l3proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n+\tsize_t len;\n \n \tl3proto = __nf_ct_l3proto_find(nf_ct_l3num(ct));\n \tlen = l3proto->nla_size;\n@@ -936,8 +936,8 @@ static const struct nla_policy proto_nla_policy[CTA_PROTO_MAX+1] = {\n static int ctnetlink_parse_tuple_proto(struct nlattr *attr,\n \t\t\t\t struct nf_conntrack_tuple *tuple)\n {\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tstruct nlattr *tb[CTA_PROTO_MAX+1];\n-\tstruct nf_conntrack_l4proto *l4proto;\n \tint ret = 0;\n \n \tret = nla_parse_nested(tb, CTA_PROTO_MAX, attr, proto_nla_policy,\n@@ -1580,8 +1580,8 @@ static int ctnetlink_change_protoinfo(struct nf_conn *ct,\n \t\t\t\t const struct nlattr * const cda[])\n {\n \tconst struct nlattr *attr = cda[CTA_PROTOINFO];\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tstruct nlattr *tb[CTA_PROTOINFO_MAX+1];\n-\tstruct nf_conntrack_l4proto *l4proto;\n \tint err = 0;\n \n \terr = nla_parse_nested(tb, CTA_PROTOINFO_MAX, attr, protoinfo_policy,\n@@ -2475,11 +2475,11 @@ static int ctnetlink_exp_dump_mask(struct sk_buff *skb,\n \t\t\t\t const struct nf_conntrack_tuple *tuple,\n \t\t\t\t const struct nf_conntrack_tuple_mask *mask)\n {\n-\tint ret;\n-\tstruct nf_conntrack_l3proto *l3proto;\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l3proto *l3proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tstruct nf_conntrack_tuple m;\n \tstruct nlattr *nest_parms;\n+\tint ret;\n \n \tmemset(&m, 0xFF, sizeof(m));\n \tmemcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3));\ndiff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c\nindex 0ecab7163d62..b3e489c859ec 100644\n--- a/net/netfilter/nf_conntrack_proto.c\n+++ b/net/netfilter/nf_conntrack_proto.c\n@@ -65,7 +65,7 @@ nf_ct_unregister_sysctl(struct ctl_table_header **header,\n }\n #endif\n \n-struct nf_conntrack_l4proto *\n+const struct nf_conntrack_l4proto *\n __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto)\n {\n \tif (unlikely(l3proto >= NFPROTO_NUMPROTO || nf_ct_protos[l3proto] == NULL))\n@@ -77,7 +77,7 @@ EXPORT_SYMBOL_GPL(__nf_ct_l4proto_find);\n \n /* this is guaranteed to always return a valid protocol helper, since\n * it falls back to generic_protocol */\n-struct nf_conntrack_l3proto *\n+const struct nf_conntrack_l3proto *\n nf_ct_l3proto_find_get(u_int16_t l3proto)\n {\n \tstruct nf_conntrack_l3proto *p;\n@@ -95,8 +95,8 @@ EXPORT_SYMBOL_GPL(nf_ct_l3proto_find_get);\n int\n nf_ct_l3proto_try_module_get(unsigned short l3proto)\n {\n+\tconst struct nf_conntrack_l3proto *p;\n \tint ret;\n-\tstruct nf_conntrack_l3proto *p;\n \n retry:\tp = nf_ct_l3proto_find_get(l3proto);\n \tif (p == &nf_conntrack_l3proto_generic) {\n@@ -173,10 +173,10 @@ void nf_ct_netns_put(struct net *net, u8 nfproto)\n }\n EXPORT_SYMBOL_GPL(nf_ct_netns_put);\n \n-struct nf_conntrack_l4proto *\n+const struct nf_conntrack_l4proto *\n nf_ct_l4proto_find_get(u_int16_t l3num, u_int8_t l4num)\n {\n-\tstruct nf_conntrack_l4proto *p;\n+\tconst struct nf_conntrack_l4proto *p;\n \n \trcu_read_lock();\n \tp = __nf_ct_l4proto_find(l3num, l4num);\n@@ -196,18 +196,18 @@ EXPORT_SYMBOL_GPL(nf_ct_l4proto_put);\n \n static int kill_l3proto(struct nf_conn *i, void *data)\n {\n-\treturn nf_ct_l3num(i) == ((struct nf_conntrack_l3proto *)data)->l3proto;\n+\treturn nf_ct_l3num(i) == ((const struct nf_conntrack_l3proto *)data)->l3proto;\n }\n \n static int kill_l4proto(struct nf_conn *i, void *data)\n {\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tl4proto = data;\n \treturn nf_ct_protonum(i) == l4proto->l4proto &&\n \t nf_ct_l3num(i) == l4proto->l3proto;\n }\n \n-int nf_ct_l3proto_register(struct nf_conntrack_l3proto *proto)\n+int nf_ct_l3proto_register(const struct nf_conntrack_l3proto *proto)\n {\n \tint ret = 0;\n \tstruct nf_conntrack_l3proto *old;\n@@ -235,7 +235,7 @@ int nf_ct_l3proto_register(struct nf_conntrack_l3proto *proto)\n }\n EXPORT_SYMBOL_GPL(nf_ct_l3proto_register);\n \n-void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto)\n+void nf_ct_l3proto_unregister(const struct nf_conntrack_l3proto *proto)\n {\n \tBUG_ON(proto->l3proto >= NFPROTO_NUMPROTO);\n \n@@ -249,7 +249,7 @@ void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto)\n \n \tsynchronize_rcu();\n \t/* Remove all contrack entries for this protocol */\n-\tnf_ct_iterate_destroy(kill_l3proto, proto);\n+\tnf_ct_iterate_destroy(kill_l3proto, (void*)proto);\n }\n EXPORT_SYMBOL_GPL(nf_ct_l3proto_unregister);\n \ndiff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c\nindex fcabccc99f0d..32b1c0b44e79 100644\n--- a/net/netfilter/nfnetlink_cttimeout.c\n+++ b/net/netfilter/nfnetlink_cttimeout.c\n@@ -75,7 +75,7 @@ static int cttimeout_new_timeout(struct net *net, struct sock *ctnl,\n {\n \t__u16 l3num;\n \t__u8 l4num;\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tstruct ctnl_timeout *timeout, *matching = NULL;\n \tchar *name;\n \tint ret;\n@@ -159,7 +159,7 @@ ctnl_timeout_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type,\n \tstruct nlmsghdr *nlh;\n \tstruct nfgenmsg *nfmsg;\n \tunsigned int flags = portid ? NLM_F_MULTI : 0;\n-\tstruct nf_conntrack_l4proto *l4proto = timeout->l4proto;\n+\tconst struct nf_conntrack_l4proto *l4proto = timeout->l4proto;\n \n \tevent = nfnl_msg_type(NFNL_SUBSYS_CTNETLINK_TIMEOUT, event);\n \tnlh = nlmsg_put(skb, portid, seq, event, sizeof(*nfmsg), flags);\n@@ -364,10 +364,10 @@ static int cttimeout_default_set(struct net *net, struct sock *ctnl,\n \t\t\t\t const struct nlattr * const cda[],\n \t\t\t\t struct netlink_ext_ack *extack)\n {\n+\tconst struct nf_conntrack_l4proto *l4proto;\n+\tunsigned int *timeouts;\n \t__u16 l3num;\n \t__u8 l4num;\n-\tstruct nf_conntrack_l4proto *l4proto;\n-\tunsigned int *timeouts;\n \tint ret;\n \n \tif (!cda[CTA_TIMEOUT_L3PROTO] ||\n@@ -454,11 +454,11 @@ static int cttimeout_default_get(struct net *net, struct sock *ctnl,\n \t\t\t\t const struct nlattr * const cda[],\n \t\t\t\t struct netlink_ext_ack *extack)\n {\n-\t__u16 l3num;\n-\t__u8 l4num;\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tstruct sk_buff *skb2;\n \tint ret, err;\n+\t__u16 l3num;\n+\t__u8 l4num;\n \n \tif (!cda[CTA_TIMEOUT_L3PROTO] || !cda[CTA_TIMEOUT_L4PROTO])\n \t\treturn -EINVAL;\ndiff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c\nindex 623ef37de886..5a152e2acfd5 100644\n--- a/net/netfilter/xt_CT.c\n+++ b/net/netfilter/xt_CT.c\n@@ -121,9 +121,9 @@ xt_ct_set_timeout(struct nf_conn *ct, const struct xt_tgchk_param *par,\n {\n #ifdef CONFIG_NF_CONNTRACK_TIMEOUT\n \ttypeof(nf_ct_timeout_find_get_hook) timeout_find_get;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tstruct ctnl_timeout *timeout;\n \tstruct nf_conn_timeout *timeout_ext;\n-\tstruct nf_conntrack_l4proto *l4proto;\n \tint ret = 0;\n \tu8 proto;\n \ndiff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c\nindex e3c4c6c3fef7..283363534647 100644\n--- a/net/openvswitch/conntrack.c\n+++ b/net/openvswitch/conntrack.c\n@@ -579,8 +579,8 @@ static struct nf_conn *\n ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone,\n \t\t u8 l3num, struct sk_buff *skb, bool natted)\n {\n-\tstruct nf_conntrack_l3proto *l3proto;\n-\tstruct nf_conntrack_l4proto *l4proto;\n+\tconst struct nf_conntrack_l3proto *l3proto;\n+\tconst struct nf_conntrack_l4proto *l4proto;\n \tstruct nf_conntrack_tuple tuple;\n \tstruct nf_conntrack_tuple_hash *h;\n \tstruct nf_conn *ct;\n", "prefixes": [ "38/47" ] }