From: Julia Lawall <julia.lawall@lip6.fr>
To: Luciano Coelho <luciano.coelho@intel.com>
Cc: cocci@systeme.lip6.fr, backports@vger.kernel.org
Subject: Re: [Cocci] New release after 1.0.7?
Date: Tue, 14 Aug 2018 15:43:20 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1808141541470.3371@hadrien> (raw)
In-Reply-To: <deb8e4df52ce0baddcae77458a8a7246814b8804.camel@intel.com>
> I'm not sure it's a regression, but I just couldn't get the attributes
> to work with 1.0.6 either with and without Johannes' changes to upgrade
> it to the 1.0.6 syntax.
>
> This is the cocci that doesn't work (which is supposed to work with
> 1.0.6):
>
> https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git/tree/patches/0027-genl-const/genl-const.cocci
>
> And, IIRC, this is the file that it's supposed to alter:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/wireless/nl80211.c
With the current version, I get the diff below. Is it what you expect?
julia
--- nl80211.c
+++ /tmp/cocci-output-11687-71a383-nl80211.c
@@ -48,7 +48,7 @@ enum nl80211_multicast_groups {
NL80211_MCGRP_TESTMODE /* keep last - ifdef! */
};
-static const struct genl_multicast_group nl80211_mcgrps[] = {
+static __genl_const struct genl_multicast_group nl80211_mcgrps[] = {
[NL80211_MCGRP_CONFIG] = { .name = NL80211_MULTICAST_GROUP_CONFIG },
[NL80211_MCGRP_SCAN] = { .name = NL80211_MULTICAST_GROUP_SCAN },
[NL80211_MCGRP_REGULATORY] = { .name = NL80211_MULTICAST_GROUP_REG },
@@ -12894,7 +12894,8 @@ static int nl80211_tx_control_port(struc
NL80211_FLAG_CHECK_NETDEV_UP)
#define NL80211_FLAG_CLEAR_SKB 0x20
-static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
+static int nl80211_pre_doit(__genl_const struct genl_ops *ops,
+ struct sk_buff *skb,
struct genl_info *info)
{
struct cfg80211_registered_device *rdev;
@@ -12956,7 +12957,8 @@ static int nl80211_pre_doit(const struct
return 0;
}
-static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
+static void nl80211_post_doit(__genl_const struct genl_ops *ops,
+ struct sk_buff *skb,
struct genl_info *info)
{
if (info->user_ptr[1]) {
@@ -12985,7 +12987,7 @@ static void nl80211_post_doit(const stru
}
}
-static const struct genl_ops nl80211_ops[] = {
+static __genl_const struct genl_ops nl80211_ops[] = {
{
.cmd = NL80211_CMD_GET_WIPHY,
.doit = nl80211_get_wiphy,
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next prev parent reply other threads:[~2018-08-14 16:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-14 13:09 New release after 1.0.7? Luciano Coelho
2018-08-14 13:19 ` [Cocci] " Julia Lawall
2018-08-14 13:32 ` Luciano Coelho
2018-08-14 13:43 ` Julia Lawall [this message]
2018-08-14 14:39 ` Luciano Coelho
2018-08-16 7:05 ` Johannes Berg
2018-08-16 7:09 ` Luciano Coelho
[not found] ` <b417bf64-7970-8482-0246-ab00129b4657@users.sourceforge.net>
[not found] ` <alpine.DEB.2.20.1808151127520.2309@hadrien>
2018-08-16 5:45 ` [Cocci] Adjustment for const qualification SF Markus Elfring
2018-09-10 7:24 ` [Cocci] New release after 1.0.7? Johannes Berg
2018-09-10 10:43 ` Julia Lawall
2018-09-12 10:14 ` Julia Lawall
2018-09-12 10:16 ` Johannes Berg
2018-10-22 11:44 ` Arend van Spriel
2018-10-22 11:45 ` Johannes Berg
2018-10-22 19:49 ` Hauke Mehrtens
2018-10-22 20:46 ` Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1808141541470.3371@hadrien \
--to=julia.lawall@lip6.fr \
--cc=backports@vger.kernel.org \
--cc=cocci@systeme.lip6.fr \
--cc=luciano.coelho@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).