From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 3/6] batman-adv: Prefix local sysfs struct with batadv_
Date: Tue, 5 Jun 2012 22:31:29 +0200 [thread overview]
Message-ID: <1338928292-23085-3-git-send-email-sven@narfation.org> (raw)
In-Reply-To: <1338928292-23085-1-git-send-email-sven@narfation.org>
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
bat_sysfs.c | 12 ++++++------
bat_sysfs.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bat_sysfs.c b/bat_sysfs.c
index 887c35f..56ed126 100644
--- a/bat_sysfs.c
+++ b/bat_sysfs.c
@@ -54,7 +54,7 @@ static char *batadv_uev_type_str[] = {
/* Use this, if you have customized show and store functions */
#define BATADV_ATTR(_name, _mode, _show, _store) \
-struct bat_attribute batadv_attr_##_name = { \
+struct batadv_attribute batadv_attr_##_name = { \
.attr = {.name = __stringify(_name), \
.mode = _mode }, \
.show = _show, \
@@ -487,7 +487,7 @@ static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth,
BATADV_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, BATADV_DBG_ALL, NULL);
#endif
-static struct bat_attribute *batadv_mesh_attrs[] = {
+static struct batadv_attribute *batadv_mesh_attrs[] = {
&batadv_attr_aggregated_ogms,
&batadv_attr_bonding,
#ifdef CONFIG_BATMAN_ADV_BLA
@@ -512,7 +512,7 @@ int batadv_sysfs_add_meshif(struct net_device *dev)
{
struct kobject *batif_kobject = &dev->dev.kobj;
struct bat_priv *bat_priv = netdev_priv(dev);
- struct bat_attribute **bat_attr;
+ struct batadv_attribute **bat_attr;
int err;
bat_priv->mesh_obj = kobject_create_and_add(BATADV_SYSFS_IF_MESH_SUBDIR,
@@ -549,7 +549,7 @@ out:
void batadv_sysfs_del_meshif(struct net_device *dev)
{
struct bat_priv *bat_priv = netdev_priv(dev);
- struct bat_attribute **bat_attr;
+ struct batadv_attribute **bat_attr;
for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)
sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
@@ -676,7 +676,7 @@ static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface,
batadv_store_mesh_iface);
static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL);
-static struct bat_attribute *batadv_batman_attrs[] = {
+static struct batadv_attribute *batadv_batman_attrs[] = {
&batadv_attr_mesh_iface,
&batadv_attr_iface_status,
NULL,
@@ -685,7 +685,7 @@ static struct bat_attribute *batadv_batman_attrs[] = {
int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
{
struct kobject *hardif_kobject = &dev->dev.kobj;
- struct bat_attribute **bat_attr;
+ struct batadv_attribute **bat_attr;
int err;
*hardif_obj = kobject_create_and_add(BATADV_SYSFS_IF_BAT_SUBDIR,
diff --git a/bat_sysfs.h b/bat_sysfs.h
index 28c2948..88f95f8 100644
--- a/bat_sysfs.h
+++ b/bat_sysfs.h
@@ -23,7 +23,7 @@
#define BATADV_SYSFS_IF_MESH_SUBDIR "mesh"
#define BATADV_SYSFS_IF_BAT_SUBDIR "batman_adv"
-struct bat_attribute {
+struct batadv_attribute {
struct attribute attr;
ssize_t (*show)(struct kobject *kobj, struct attribute *attr,
char *buf);
--
1.7.10
next prev parent reply other threads:[~2012-06-05 20:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-05 20:31 [B.A.T.M.A.N.] [PATCH 1/6] batman-adv: Prefix local debugfs structs with batadv_ Sven Eckelmann
2012-06-05 20:31 ` [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: Prefix hash struct and typedef " Sven Eckelmann
2012-06-10 11:34 ` Marek Lindner
2012-06-05 20:31 ` Sven Eckelmann [this message]
2012-06-10 11:36 ` [B.A.T.M.A.N.] [PATCH 3/6] batman-adv: Prefix local sysfs struct " Marek Lindner
2012-06-05 20:31 ` [B.A.T.M.A.N.] [PATCH 4/6] batman-adv: Prefix packet structs " Sven Eckelmann
2012-06-10 11:53 ` Marek Lindner
2012-06-05 20:31 ` [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: Prefix types " Sven Eckelmann
2012-06-10 11:55 ` Marek Lindner
2012-06-05 20:31 ` [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: Transform BATADV_LOG_BUFF(idx) into function Sven Eckelmann
2012-06-10 12:01 ` Marek Lindner
2012-06-10 11:30 ` [B.A.T.M.A.N.] [PATCH 1/6] batman-adv: Prefix local debugfs structs with batadv_ Marek Lindner
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=1338928292-23085-3-git-send-email-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/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