From patchwork Wed Dec 2 14:26:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Schurig X-Patchwork-Id: 64281 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 nB2EUGQA007947 for ; Wed, 2 Dec 2009 14:30:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754606AbZLBOaI (ORCPT ); Wed, 2 Dec 2009 09:30:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754604AbZLBOaI (ORCPT ); Wed, 2 Dec 2009 09:30:08 -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 S1754601AbZLBOaG (ORCPT ); Wed, 2 Dec 2009 09:30:06 -0500 Received: by mail-bw0-f227.google.com with SMTP id 27so217224bwz.21 for ; Wed, 02 Dec 2009 06:30:13 -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=vFf0eMv7Lzu5eK/8z7/12+19yXIHXJDWOBUdfTlIvkc=; b=EyGJxWxwZ5hePxBmg6dWJ64HIdgx9zOR2JT3lleRrF2EJ2D2AU+jTyTS7FnwK+f/8f 4Wulj0d/vMbgR3J86T1SnvVr13J9/W/W/lS0P6umYRl7Wts9dk0+2hwlRvpI0koYwFQ9 TqnQarOkllsod2iPy12wo8Dca7ypl1ScTdTQM= 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=dM6I8xICbCRUDR7I1J8y2n2xghwySPWZrBFcxUHx6Fn26ayUDMwNeYP/5ix6G0UFvV pzjnTtAfuVMQr/2eq6AXSyvkAosO/ClKlyH/EMIeGJRwFbhZfbTR2IM+HoH8WBZSY5Jh aSeX6pgpEhGwxBR/8mnFKP2cL43uQmC9qgTh4= Received: by 10.204.24.17 with SMTP id t17mr182769bkb.142.1259764212126; Wed, 02 Dec 2009 06:30:12 -0800 (PST) Received: from holgerschurig@gmail.com (pD95FA93E.dip0.t-ipconnect.de [217.95.169.62]) by mx.google.com with ESMTPS id 15sm333963bwz.0.2009.12.02.06.30.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 02 Dec 2009 06:30:11 -0800 (PST) Received: by holgerschurig@gmail.com (sSMTP sendmail emulation); Wed, 02 Dec 2009 15:29:38 +0100 Message-Id: <20091202142938.291148553@gmail.com> References: <20091202142555.654873300@gmail.com> User-Agent: quilt/0.46-1 Date: Wed, 02 Dec 2009 15:26:00 +0100 From: Holger Schurig To: John Linville , linux-wireless@vger.kernel.org, Dan Williams Subject: [PATCH 05/10] libertas: move mesh SSID initialization into mesh.c Content-Disposition: inline; filename=lbs-mesh-ssid.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/main.c +++ linux-wl/drivers/net/wireless/libertas/main.c @@ -999,10 +999,6 @@ struct lbs_private *lbs_add_card(void *c INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker); INIT_WORK(&priv->sync_channel, lbs_sync_channel_worker); - priv->mesh_open = 0; - sprintf(priv->mesh_ssid, "mesh"); - priv->mesh_ssid_len = 4; - priv->wol_criteria = 0xffffffff; priv->wol_gpio = 0xff; --- linux-wl.orig/drivers/net/wireless/libertas/mesh.c +++ linux-wl/drivers/net/wireless/libertas/mesh.c @@ -237,6 +237,9 @@ int lbs_init_mesh(struct lbs_private *pr if (priv->mesh_tlv) { + sprintf(priv->mesh_ssid, "mesh"); + priv->mesh_ssid_len = 4; + lbs_add_mesh(priv); if (device_create_file(&dev->dev, &dev_attr_lbs_mesh))