iw: Resolve namespace clash between station plink and vlan commands

Commit Message

Javier Cardona Nov. 16, 2010, 12:27 a.m. UTC

None

Patch

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,