From patchwork Wed Dec 2 14:25:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Schurig X-Patchwork-Id: 64279 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB2EU7Tx007915 for ; Wed, 2 Dec 2009 14:30:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754560AbZLBO37 (ORCPT ); Wed, 2 Dec 2009 09:29:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752402AbZLBO37 (ORCPT ); Wed, 2 Dec 2009 09:29:59 -0500 Received: from mail-bw0-f227.google.com ([209.85.218.227]:65310 "EHLO mail-bw0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754528AbZLBO36 (ORCPT ); Wed, 2 Dec 2009 09:29:58 -0500 Received: by mail-bw0-f227.google.com with SMTP id 27so217224bwz.21 for ; Wed, 02 Dec 2009 06:30:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:message-id :references:user-agent:date:from:to:subject:content-disposition; bh=6FdiTPjfZCmuRTIENFnC6SoUfzvHnzgllNpe7fzlnd4=; b=J8s6vrmEEAHONcj+EbO5JqO/JD43DyDlE+Fkt+O3mZVyPA/EV8t18EwJ2rLU1ADzPu ZprRhwC4X+8mmGwSXomKCQFZMcJmDFdtTCej49pSl6RBC4Qssr52bNP78wgYHSaelMyK tQSmca0SY75oa5j5zdbf1nmBZ9kJbKD7/Bwpc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:references:user-agent:date:from:to:subject :content-disposition; b=LdE9k9B78T8EWwrYC4pdyQX3EYX9LSdaLfwccfklNFTR/2rXWVfGnyn524rERx1tJc 7nPmVkTu9xdHa+80TIRfosbJIpsR97tAHfyv3kXdbEKj809Yr5iW8XBabEpjRG8NHczD wTL13vQ8cgu2lcHPpHljhca0EjzTakyS/QDLA= Received: by 10.204.10.152 with SMTP id p24mr191595bkp.111.1259764204977; Wed, 02 Dec 2009 06:30:04 -0800 (PST) Received: from holgerschurig@gmail.com (pD95FA93E.dip0.t-ipconnect.de [217.95.169.62]) by mx.google.com with ESMTPS id 14sm333417bwz.13.2009.12.02.06.30.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 02 Dec 2009 06:30:04 -0800 (PST) Received: by holgerschurig@gmail.com (sSMTP sendmail emulation); Wed, 02 Dec 2009 15:29:31 +0100 Message-Id: <20091202142931.307135635@gmail.com> References: <20091202142555.654873300@gmail.com> User-Agent: quilt/0.46-1 Date: Wed, 02 Dec 2009 15:25:58 +0100 From: Holger Schurig To: John Linville , linux-wireless@vger.kernel.org, Dan Williams Subject: [PATCH 03/10] libertas: move mesh-related definitions into mesh.h Content-Disposition: inline; filename=lbs-mesh-move-from-cmd-h.patch Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org --- linux-wl.orig/drivers/net/wireless/libertas/cmd.h +++ linux-wl/drivers/net/wireless/libertas/cmd.h @@ -110,18 +110,6 @@ int lbs_set_snmp_mib(struct lbs_private int lbs_get_snmp_mib(struct lbs_private *priv, u32 oid, u16 *out_val); -/* Mesh related */ - -int lbs_mesh_access(struct lbs_private *priv, uint16_t cmd_action, - struct cmd_ds_mesh_access *cmd); - -int lbs_mesh_config_send(struct lbs_private *priv, - struct cmd_ds_mesh_config *cmd, - uint16_t action, uint16_t type); - -int lbs_mesh_config(struct lbs_private *priv, uint16_t enable, uint16_t chan); - - /* Commands only used in wext.c, assoc. and scan.c */ int lbs_set_power_adapt_cfg(struct lbs_private *priv, int enable, int8_t p0, --- linux-wl.orig/drivers/net/wireless/libertas/mesh.h +++ linux-wl/drivers/net/wireless/libertas/mesh.h @@ -46,11 +46,20 @@ void lbs_mesh_set_txpd(struct lbs_privat /* Command handling */ struct cmd_ds_command; +struct cmd_ds_mesh_access; +struct cmd_ds_mesh_config; int lbs_cmd_bt_access(struct cmd_ds_command *cmd, u16 cmd_action, void *pdata_buf); int lbs_cmd_fwt_access(struct cmd_ds_command *cmd, u16 cmd_action, void *pdata_buf); +int lbs_mesh_access(struct lbs_private *priv, uint16_t cmd_action, + struct cmd_ds_mesh_access *cmd); +int lbs_mesh_config_send(struct lbs_private *priv, + struct cmd_ds_mesh_config *cmd, + uint16_t action, uint16_t type); +int lbs_mesh_config(struct lbs_private *priv, uint16_t enable, uint16_t chan); + /* Persistent configuration */