Commit 02f220b5 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: ipw2x00/lib80211: move remaining lib80211 into libipw 

There's already much code in libipw that used to be shared
with more drivers, but now with the prior cleanups, those old
Intel ipw2x00 drivers are also the only ones using whatever is
now left of lib80211. Move lib80211 entirely into libipw.

Link: https://patch.msgid.link/20241007202707.915ef7b9e7c7.Ib9876d2fe3c90f11d6df458b16d0b7d4bf551a8d@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent be9be9f5

drivers/net/wireless/intel/ipw2x00/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ config IPW2100 
	select WEXT_SPY

	select WEXT_PRIV

	select FW_LOADER

	select LIB80211

	select LIBIPW

	help

	  A driver for the Intel PRO/Wireless 2100 Network
@@ -72,7 +71,6 @@ config IPW2200 
	select WEXT_SPY

	select WEXT_PRIV

	select FW_LOADER

	select LIB80211

	select LIBIPW

	help

	  A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
@@ -162,10 +160,6 @@ config LIBIPW 
	select CRYPTO

	select CRYPTO_MICHAEL_MIC

	select CRC32

	select LIB80211

	select LIB80211_CRYPT_WEP

	select LIB80211_CRYPT_TKIP

	select LIB80211_CRYPT_CCMP

	help

	This option enables the hardware independent IEEE 802.11

	networking stack.  This component is deprecated in favor of the

drivers/net/wireless/intel/ipw2x00/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -12,4 +12,8 @@ libipw-objs := \ 
	libipw_tx.o \

	libipw_rx.o \

	libipw_wx.o \

	libipw_geo.o
 
	libipw_geo.o \

	libipw_crypto.o \

	libipw_crypto_ccmp.o \

	libipw_crypto_tkip.o \

	libipw_crypto_wep.o

drivers/net/wireless/intel/ipw2x00/ipw2100.c

+2 −5
Original line number Diff line number Diff line
@@ -148,9 +148,6 @@ that only one external action is invoked at a time. 
#include <linux/acpi.h>

#include <linux/ctype.h>

#include <linux/pm_qos.h>



#include <net/lib80211.h>



#include "ipw2100.h"

#include "ipw.h"
@@ -7571,7 +7568,7 @@ static int ipw2100_wx_set_auth(struct net_device *dev, 
	struct ipw2100_priv *priv = libipw_priv(dev);

	struct libipw_device *ieee = priv->ieee;

	struct iw_param *param = &wrqu->param;

	struct lib80211_crypt_data *crypt;

	struct libipw_crypt_data *crypt;

	unsigned long flags;

	int ret = 0;
@@ -7663,7 +7660,7 @@ static int ipw2100_wx_get_auth(struct net_device *dev, 
{

	struct ipw2100_priv *priv = libipw_priv(dev);

	struct libipw_device *ieee = priv->ieee;

	struct lib80211_crypt_data *crypt;

	struct libipw_crypt_data *crypt;

	struct iw_param *param = &wrqu->param;



	switch (param->flags & IW_AUTH_INDEX) {

drivers/net/wireless/intel/ipw2x00/ipw2200.c

+2 −2
Original line number Diff line number Diff line
@@ -6549,7 +6549,7 @@ static int ipw_wx_set_auth(struct net_device *dev, 
	struct ipw_priv *priv = libipw_priv(dev);

	struct libipw_device *ieee = priv->ieee;

	struct iw_param *param = &wrqu->param;

	struct lib80211_crypt_data *crypt;

	struct libipw_crypt_data *crypt;

	unsigned long flags;

	int ret = 0;
@@ -6648,7 +6648,7 @@ static int ipw_wx_get_auth(struct net_device *dev, 
{

	struct ipw_priv *priv = libipw_priv(dev);

	struct libipw_device *ieee = priv->ieee;

	struct lib80211_crypt_data *crypt;

	struct libipw_crypt_data *crypt;

	struct iw_param *param = &wrqu->param;



	switch (param->flags & IW_AUTH_INDEX) {

drivers/net/wireless/intel/ipw2x00/ipw2200.h

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
#include <linux/wireless.h>

#include <linux/jiffies.h>

#include <asm/io.h>



#include <net/lib80211.h>

#include <net/ieee80211_radiotap.h>



#define DRV_NAME	"ipw2200"