Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df48c323 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: add iwl-core module 



This patch adds iwl-core module to iwlwifi driver.
This module will contain common code and infrastracture for iwlwifi
driver

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f4d6082d

drivers/net/wireless/iwlwifi/Kconfig

+5 −0
Original line number Diff line number Diff line 
config IWLCORE

	tristate "Intel Wireless Wifi Core"

	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL



config IWL4965

	tristate "Intel Wireless WiFi 4965AGN"

	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL

	select FW_LOADER

	select IWLCORE

	---help---

	  Select to build the driver supporting the:

drivers/net/wireless/iwlwifi/Makefile

+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_IWLCORE)	+= iwlcore.o

iwlcore-objs 		= iwl-core.o



obj-$(CONFIG_IWL3945)	+= iwl3945.o

iwl3945-objs		= iwl3945-base.o iwl-3945.o iwl-3945-rs.o

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

0 → 100644
+47 −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) 2008 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:

 * Tomas Winkler <tomas.winkler@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *****************************************************************************/



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/version.h>



#include "iwl-4965-debug.h"

#include "iwl-core.h"



MODULE_DESCRIPTION("iwl core");

MODULE_VERSION(IWLWIFI_VERSION);

MODULE_AUTHOR(DRV_COPYRIGHT);

MODULE_LICENSE("GPL/BSD");



#ifdef CONFIG_IWL4965_DEBUG

u32 iwl4965_debug_level;

EXPORT_SYMBOL(iwl4965_debug_level);

#endif

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

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ 
#ifndef __iwl_core_h__

#define __iwl_core_h__



#define IWLWIFI_VERSION "1.2.26k"

#define DRV_COPYRIGHT	"Copyright(c) 2003-2008 Intel Corporation"



#define IWL_PCI_DEVICE(dev, subdev, cfg) \

	.vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \

	.subvendor = PCI_ANY_ID, .subdevice = (subdev), \

drivers/net/wireless/iwlwifi/iwl4965-base.c

+1 −7
Original line number Diff line number Diff line
@@ -49,10 +49,6 @@ 
#include "iwl-4965.h"

#include "iwl-helpers.h"



#ifdef CONFIG_IWL4965_DEBUG

u32 iwl4965_debug_level;

#endif



static int iwl4965_tx_queue_update_write_ptr(struct iwl4965_priv *priv,

				  struct iwl4965_tx_queue *txq);
@@ -91,9 +87,7 @@ int iwl4965_param_amsdu_size_8K; /* def: enable 8K amsdu size */ 
#define VS

#endif



#define IWLWIFI_VERSION "1.2.26k" VD VS

#define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"

#define DRV_VERSION     IWLWIFI_VERSION

#define DRV_VERSION     IWLWIFI_VERSION VD VS





MODULE_DESCRIPTION(DRV_DESCRIPTION);