From patchwork Fri Oct 16 15:34:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Schurig X-Patchwork-Id: 54276 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 n9GFhGN5006675 for ; Fri, 16 Oct 2009 15:43:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760586AbZJPPfs (ORCPT ); Fri, 16 Oct 2009 11:35:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760427AbZJPPfs (ORCPT ); Fri, 16 Oct 2009 11:35:48 -0400 Received: from mx51.mymxserver.com ([85.199.173.110]:21005 "EHLO mx51.mymxserver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759591AbZJPPfr (ORCPT ); Fri, 16 Oct 2009 11:35:47 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost.mx51.mymxserver.com (Postfix) with ESMTP id 3B1895000E; Fri, 16 Oct 2009 17:34:40 +0200 (CEST) X-Virus-Scanned: by Mittwald Mailscanner Received: from mx51.mymxserver.com ([127.0.0.1]) by localhost (mx51.mymxserver.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pcy6QZvVsfly; Fri, 16 Oct 2009 17:34:40 +0200 (CEST) Received: from lin01.mn-solutions.de (pD95FA148.dip0.t-ipconnect.de [217.95.161.72]) by mx51.mymxserver.com (Postfix) with ESMTP id 533F150006; Fri, 16 Oct 2009 17:34:39 +0200 (CEST) Received: by lin01.mn-solutions.de (Postfix, from userid 116) id E41EB1E0050; Fri, 16 Oct 2009 17:34:38 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7-deb3 (2006-10-05) on lin01.mn-logistik.de X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7-deb3 Received: from mnz66.mn-solutions.de (mnz66.mn-solutions.de [192.168.233.66]) by lin01.mn-solutions.de (Postfix) with ESMTP id 5193B1E0010; Fri, 16 Oct 2009 17:34:30 +0200 (CEST) From: Holger Schurig To: linux-wireless@vger.kernel.org, John Linville Subject: [PATCH] libertas: remove unused lbs_cmd_802_11_inactivity_timeout() Date: Fri, 16 Oct 2009 17:34:22 +0200 User-Agent: KMail/1.9.7 Cc: Dan Williams MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200910161734.22840.hs4233@mail.mn-solutions.de> 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.c +++ linux-wl/drivers/net/wireless/libertas/cmd.c @@ -273,33 +273,6 @@ return 0; } -int lbs_cmd_802_11_inactivity_timeout(struct lbs_private *priv, - uint16_t cmd_action, uint16_t *timeout) -{ - struct cmd_ds_802_11_inactivity_timeout cmd; - int ret; - - lbs_deb_enter(LBS_DEB_CMD); - - cmd.hdr.command = cpu_to_le16(CMD_802_11_INACTIVITY_TIMEOUT); - cmd.hdr.size = cpu_to_le16(sizeof(cmd)); - - cmd.action = cpu_to_le16(cmd_action); - - if (cmd_action == CMD_ACT_SET) - cmd.timeout = cpu_to_le16(*timeout); - else - cmd.timeout = 0; - - ret = lbs_cmd_with_response(priv, CMD_802_11_INACTIVITY_TIMEOUT, &cmd); - - if (!ret) - *timeout = le16_to_cpu(cmd.timeout); - - lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret); - return 0; -} - int lbs_cmd_802_11_sleep_params(struct lbs_private *priv, uint16_t cmd_action, struct sleep_params *sp) { --- linux-wl.orig/drivers/net/wireless/libertas/cmd.h +++ linux-wl/drivers/net/wireless/libertas/cmd.h @@ -135,9 +135,6 @@ int lbs_cmd_802_11_rate_adapt_rateset(struct lbs_private *priv, uint16_t cmd_action); -int lbs_cmd_802_11_inactivity_timeout(struct lbs_private *priv, - uint16_t cmd_action, uint16_t *timeout); - int lbs_cmd_802_11_set_wep(struct lbs_private *priv, uint16_t cmd_action, struct assoc_request *assoc); --- linux-wl.orig/drivers/net/wireless/libertas/host.h +++ linux-wl/drivers/net/wireless/libertas/host.h @@ -621,16 +621,6 @@ __le16 reserved; } __attribute__ ((packed)); -struct cmd_ds_802_11_inactivity_timeout { - struct cmd_header hdr; - - /* ACT_GET/ACT_SET */ - __le16 action; - - /* Inactivity timeout in msec */ - __le16 timeout; -} __attribute__ ((packed)); - struct cmd_ds_802_11_rf_channel { struct cmd_header hdr;