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

Commit b1f553c7 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: make device configuration bus agnostic 



Newer devices can work on different buses. This means that
their configuration can be shared between different buses.
Hence the configuration structures should exported to all
the buses and not only to PCIE. Change this.

Note that this requires all the fields to be the same
amongst the buses. If differences will appear, we can always
define a part that is bus dependent. Today, this is not
needed.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5e4fbe4c

drivers/net/wireless/iwlwifi/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ iwlwifi-objs += iwl-notif-wait.o 
iwlwifi-objs		+= iwl-eeprom-read.o iwl-eeprom-parse.o

iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o

iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-objs		+= pcie/1000.o pcie/2000.o pcie/5000.o pcie/6000.o

iwlwifi-objs		+= pcie/7000.o

iwlwifi-objs		+= iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o iwl-7000.o



iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-test.o

drivers/net/wireless/iwlwifi/pcie/1000.c→drivers/net/wireless/iwlwifi/iwl-1000.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "iwl-config.h"

#include "iwl-csr.h"

#include "iwl-agn-hw.h"

#include "cfg.h"



/* Highest firmware API version supported */

#define IWL1000_UCODE_API_MAX 5

drivers/net/wireless/iwlwifi/pcie/2000.c→drivers/net/wireless/iwlwifi/iwl-2000.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-agn-hw.h"

#include "cfg.h"

#include "dvm/commands.h" /* needed for BT for now */



/* Highest firmware API version supported */

drivers/net/wireless/iwlwifi/pcie/5000.c→drivers/net/wireless/iwlwifi/iwl-5000.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "iwl-config.h"

#include "iwl-agn-hw.h"

#include "iwl-csr.h"

#include "cfg.h"



/* Highest firmware API version supported */

#define IWL5000_UCODE_API_MAX 5

drivers/net/wireless/iwlwifi/pcie/6000.c→drivers/net/wireless/iwlwifi/iwl-6000.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-agn-hw.h"

#include "cfg.h"

#include "dvm/commands.h" /* needed for BT for now */



/* Highest firmware API version supported */