iwlagn: generically provide iwl_trans_send_cmd_pdu (370ad313) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ iwlagn-objs += iwl-6000.o
		iwlagn-objs += iwl-1000.o
		iwlagn-objs += iwl-2000.o
		iwlagn-objs += iwl-pci.o
		iwlagn-objs += iwl-trans.o
		iwlagn-objs += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o

		iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -1099,19 +1099,6 @@ int iwl_trans_pcie_send_cmd(struct iwl_trans trans, struct iwl_host_cmd cmd)
		return iwl_send_cmd_sync(trans, cmd);
		}

		int iwl_trans_pcie_send_cmd_pdu(struct iwl_trans *trans, u8 id, u32 flags,
		u16 len, const void *data)
		{
		struct iwl_host_cmd cmd = {
		.id = id,
		.len = { len, },
		.data = { data, },
		.flags = flags,
		};

		return iwl_trans_pcie_send_cmd(trans, &cmd);
		}

		/* Frees buffers until index _not_ inclusive */
		int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
		struct sk_buff_head *skbs)

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1971,7 +1971,6 @@ const struct iwl_trans_ops trans_ops_pcie = {
		.wake_any_queue = iwl_trans_pcie_wake_any_queue,

		.send_cmd = iwl_trans_pcie_send_cmd,
		.send_cmd_pdu = iwl_trans_pcie_send_cmd_pdu,

		.tx = iwl_trans_pcie_tx,
		.reclaim = iwl_trans_pcie_reclaim,

drivers/net/wireless/iwlwifi/iwl-trans.c

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		/******************************************************************************
		*
		* This file is provided under a dual BSD/GPLv2 license. When using or
		* redistributing this file, you may do so under either license.
		*
		* GPL LICENSE SUMMARY
		*
		* Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of version 2 of the GNU General Public License as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
		* USA
		*
		* The full GNU General Public License is included in this distribution
		* in the file called LICENSE.GPL.
		*
		* Contact Information:
		* Intel Linux Wireless <ilw@linux.intel.com>
		* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
		*
		* BSD LICENSE
		*
		* Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* * Neither the name Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*
		*****************************************************************************/

		#include "iwl-trans.h"

		int iwl_trans_send_cmd_pdu(struct iwl_trans *trans, u8 id,
		u32 flags, u16 len, const void *data)
		{
		struct iwl_host_cmd cmd = {
		.id = id,
		.len = { len, },
		.data = { data, },
		.flags = flags,
		};

		return iwl_trans_send_cmd(trans, &cmd);
		}

drivers/net/wireless/iwlwifi/iwl-trans.h

+2 −8

Original line number	Diff line number	Diff line
		@@ -151,7 +151,6 @@ struct iwl_host_cmd {
		* @wake_any_queue: wake all the queues of a specfic context IWL_RXON_CTX_*
		* @stop_device:stops the whole device (embedded CPU put to reset)
		* @send_cmd:send a host command
		* @send_cmd_pdu:send a host command: flags can be CMD_*
		* @tx: send an skb
		* @reclaim: free packet until ssn. Returns a list of freed packets.
		* @tx_agg_alloc: allocate resources for a TX BA session
		@@ -183,8 +182,6 @@ struct iwl_trans_ops {

		int (send_cmd)(struct iwl_trans trans, struct iwl_host_cmd *cmd);

		int (send_cmd_pdu)(struct iwl_trans trans, u8 id, u32 flags, u16 len,
		const void *data);
		int (tx)(struct iwl_trans trans, struct sk_buff *skb,
		struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx,
		u8 sta_id);
		@@ -270,11 +267,8 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
		return trans->ops->send_cmd(trans, cmd);
		}

		static inline int iwl_trans_send_cmd_pdu(struct iwl_trans *trans, u8 id,
		u32 flags, u16 len, const void *data)
		{
		return trans->ops->send_cmd_pdu(trans, id, flags, len, data);
		}
		int iwl_trans_send_cmd_pdu(struct iwl_trans *trans, u8 id,
		u32 flags, u16 len, const void *data);

		static inline int iwl_trans_tx(struct iwl_trans trans, struct sk_buff skb,
		struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx,

Admin message