From: Javier Cardona <javier@cozybit.com>
To: johannes@sipsolutions.net
Cc: nbd@openwrt.org, Javier Cardona <javier@cozybit.com>,
linux-wireless@vger.kernel.org
Subject: [PATCH] iw: Resolve namespace clash between station plink and vlan commands
Date: Mon, 15 Nov 2010 16:27:31 -0800 [thread overview]
Message-ID: <1289867251-21559-1-git-send-email-javier@cozybit.com> (raw)
This patch: http://osdir.com/ml/linux-wireless/2009-11/msg00981.html
kicked the command to manage mesh plinks into non-existence. Here we
bring it back under a different name.
---
station.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/station.c b/station.c
index 7639553..8f7fac1 100644
--- a/station.c
+++ b/station.c
@@ -204,7 +204,7 @@ COMMAND(station, del, "<MAC address>",
NL80211_CMD_DEL_STATION, 0, CIB_NETDEV, handle_station_get,
"Remove the given station entry (use with caution!)");
-static int handle_station_set_plink(struct nl80211_state *state,
+static int handle_station_plink(struct nl80211_state *state,
struct nl_cb *cb,
struct nl_msg *msg,
int argc, char **argv)
@@ -222,7 +222,7 @@ static int handle_station_set_plink(struct nl80211_state *state,
argc--;
argv++;
- if (strcmp("plink_action", argv[0]) != 0)
+ if (strcmp("action", argv[0]) != 0)
return 1;
argc--;
argv++;
@@ -248,8 +248,8 @@ static int handle_station_set_plink(struct nl80211_state *state,
nla_put_failure:
return -ENOBUFS;
}
-COMMAND(station, set, "<MAC address> plink_action <open|block>",
- NL80211_CMD_SET_STATION, 0, CIB_NETDEV, handle_station_set_plink,
+COMMAND(station, plink, "<MAC address> action <open|block>",
+ NL80211_CMD_SET_STATION, 0, CIB_NETDEV, handle_station_plink,
"Set mesh peer link action for this station (peer).");
static int handle_station_set_vlan(struct nl80211_state *state,
--
1.7.1
next reply other threads:[~2010-11-16 0:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-16 0:27 Javier Cardona [this message]
2010-11-16 22:24 ` [PATCH] iw: Resolve namespace clash between station plink and vlan commands Johannes Berg
2010-11-17 1:41 ` Javier Cardona
2010-11-17 2:05 ` Johannes Berg
2010-11-17 4:41 ` Javier Cardona
2010-11-23 8:28 ` Johannes Berg
2010-11-23 23:06 ` Javier Cardona
2010-11-24 7:17 ` Johannes Berg
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=1289867251-21559-1-git-send-email-javier@cozybit.com \
--to=javier@cozybit.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=nbd@openwrt.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.