From patchwork Tue Nov 16 00:27:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Cardona X-Patchwork-Id: 326712 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAG0Rn6L012693 for ; Tue, 16 Nov 2010 00:27:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752826Ab0KPA1r (ORCPT ); Mon, 15 Nov 2010 19:27:47 -0500 Received: from mail-yw0-f46.google.com ([209.85.213.46]:53577 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752433Ab0KPA1q (ORCPT ); Mon, 15 Nov 2010 19:27:46 -0500 Received: by ywg8 with SMTP id 8so41862ywg.19 for ; Mon, 15 Nov 2010 16:27:46 -0800 (PST) Received: by 10.91.143.17 with SMTP id v17mr8600016agn.136.1289867266138; Mon, 15 Nov 2010 16:27:46 -0800 (PST) Received: from localhost.localdomain (adsl-99-114-136-65.dsl.pltn13.sbcglobal.net [99.114.136.65]) by mx.google.com with ESMTPS id y11sm39179yhc.8.2010.11.15.16.27.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 15 Nov 2010 16:27:45 -0800 (PST) From: Javier Cardona To: johannes@sipsolutions.net Cc: nbd@openwrt.org, Javier Cardona , 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 Message-Id: <1289867251-21559-1-git-send-email-javier@cozybit.com> X-Mailer: git-send-email 1.7.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 16 Nov 2010 00:27:50 +0000 (UTC) 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, "", 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, " plink_action ", - NL80211_CMD_SET_STATION, 0, CIB_NETDEV, handle_station_set_plink, +COMMAND(station, plink, " action ", + 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,