Skip to content

Commit 71f8992

Browse files
kuba-mookuba-moo
committed
Johannes Berg says: ==================== First 6.15 material: * cfg80211/mac80211 - remove cooked monitor support - strict mode for better AP testing - basic EPCS support - OMI RX bandwidth reduction support * rtw88 - preparation for RTL8814AU support * rtw89 - use wiphy_lock/wiphy_work - preparations for MLO - BT-Coex improvements - regulatory support in firmware files * iwlwifi - preparations for the new iwlmld sub-driver * tag 'wireless-next-2025-03-04-v2' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (128 commits) wifi: iwlwifi: remove mld/roc.c wifi: mac80211: refactor populating mesh related fields in sinfo wifi: cfg80211: reorg sinfo structure elements for mesh wifi: iwlwifi: Fix spelling mistake "Increate" -> "Increase" wifi: iwlwifi: add Debug Host Command APIs wifi: iwlwifi: add IWL_MAX_NUM_IGTKS macro wifi: iwlwifi: add OMI bandwidth reduction APIs wifi: iwlwifi: remove mvm prefix from iwl_mvm_d3_end_notif wifi: iwlwifi: remember if the UATS table was read successfully wifi: iwlwifi: export iwl_get_lari_config_bitmap wifi: iwlwifi: add support for external 32 KHz clock wifi: iwlwifi: mld: add a debug level for EHT prints wifi: iwlwifi: mld: add a debug level for PTP prints wifi: iwlwifi: remove mvm prefix from iwl_mvm_esr_mode_notif wifi: iwlwifi: use 0xff instead of 0xffffffff for invalid wifi: iwlwifi: location api cleanup wifi: cfg80211: expose update timestamp to drivers wifi: mac80211: add ieee80211_iter_chan_contexts_mtx wifi: mac80211: fix integer overflow in hwmp_route_info_get() wifi: mac80211: Fix possible integer promotion issue ... ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 5b62996 + 799b7f9 commit 71f8992

File tree

153 files changed

+6454
-4867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+6454
-4867
lines changed

‎Documentation/devicetree/bindings/net/rfkill-gpio.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ properties:
3232
shutdown-gpios:
3333
maxItems: 1
3434

35+
default-blocked:
36+
$ref: /schemas/types.yaml#/definitions/flag
37+
description: configure rfkill state as blocked at boot
38+
3539
required:
3640
- compatible
3741
- radio-type
@@ -48,4 +52,5 @@ examples:
4852
label = "rfkill-pcie-wlan";
4953
radio-type = "wlan";
5054
shutdown-gpios = <&gpio2 25 GPIO_ACTIVE_HIGH>;
55+
default-blocked;
5156
};

‎drivers/net/wireless/broadcom/b43/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2166,7 +2166,7 @@ static void b43_print_fw_helptext(struct b43_wl *wl, bool error)
21662166
{
21672167
const char text[] =
21682168
"You must go to " \
2169-
"https://wireless.wiki.kernel.org/en/users/Drivers/b43#devicefirmware " \
2169+
"https://wireless.docs.kernel.org/en/latest/en/users/drivers/b43/developers.html#list-of-firmware " \
21702170
"and download the correct firmware for this driver version. " \
21712171
"Please carefully read all instructions on this website.\n";
21722172

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3295,7 +3295,7 @@ static int ipw_init_nic(struct ipw_priv *priv)
32953295
rc = ipw_poll_bit(priv, IPW_GP_CNTRL_RW,
32963296
IPW_GP_CNTRL_BIT_CLOCK_READY, 250);
32973297
if (rc < 0)
3298-
IPW_DEBUG_INFO("FAILED wait for clock stablization\n");
3298+
IPW_DEBUG_INFO("FAILED wait for clock stabilization\n");
32993299

33003300
/* assert SW reset */
33013301
ipw_set_bit(priv, IPW_RESET_REG, IPW_RESET_REG_SW_RESET);

‎drivers/net/wireless/intel/ipw2x00/libipw.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,8 +1011,6 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev);
10111011
void libipw_txb_free(struct libipw_txb *);
10121012

10131013
/* libipw_rx.c */
1014-
void libipw_rx_any(struct libipw_device *ieee, struct sk_buff *skb,
1015-
struct libipw_rx_stats *stats);
10161014
int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,
10171015
struct libipw_rx_stats *rx_stats);
10181016
/* make sure to set stats->len */

‎drivers/net/wireless/intel/ipw2x00/libipw_rx.c‎

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -823,96 +823,6 @@ int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,
823823
return 0;
824824
}
825825

826-
/* Filter out unrelated packets, call libipw_rx[_mgt]
827-
* This function takes over the skb, it should not be used again after calling
828-
* this function. */
829-
void libipw_rx_any(struct libipw_device *ieee,
830-
struct sk_buff *skb, struct libipw_rx_stats *stats)
831-
{
832-
struct libipw_hdr_4addr *hdr;
833-
int is_packet_for_us;
834-
u16 fc;
835-
836-
if (ieee->iw_mode == IW_MODE_MONITOR) {
837-
if (!libipw_rx(ieee, skb, stats))
838-
dev_kfree_skb_irq(skb);
839-
return;
840-
}
841-
842-
if (skb->len < sizeof(struct ieee80211_hdr))
843-
goto drop_free;
844-
845-
hdr = (struct libipw_hdr_4addr *)skb->data;
846-
fc = le16_to_cpu(hdr->frame_ctl);
847-
848-
if ((fc & IEEE80211_FCTL_VERS) != 0)
849-
goto drop_free;
850-
851-
switch (fc & IEEE80211_FCTL_FTYPE) {
852-
case IEEE80211_FTYPE_MGMT:
853-
if (skb->len < sizeof(struct libipw_hdr_3addr))
854-
goto drop_free;
855-
libipw_rx_mgt(ieee, hdr, stats);
856-
dev_kfree_skb_irq(skb);
857-
return;
858-
case IEEE80211_FTYPE_DATA:
859-
break;
860-
case IEEE80211_FTYPE_CTL:
861-
return;
862-
default:
863-
return;
864-
}
865-
866-
is_packet_for_us = 0;
867-
switch (ieee->iw_mode) {
868-
case IW_MODE_ADHOC:
869-
/* our BSS and not from/to DS */
870-
if (ether_addr_equal(hdr->addr3, ieee->bssid) &&
871-
((fc & (IEEE80211_FCTL_TODS + IEEE80211_FCTL_FROMDS)) == 0)) {
872-
/* promisc: get all */
873-
if (ieee->dev->flags & IFF_PROMISC)
874-
is_packet_for_us = 1;
875-
/* to us */
876-
else if (ether_addr_equal(hdr->addr1, ieee->dev->dev_addr))
877-
is_packet_for_us = 1;
878-
/* mcast */
879-
else if (is_multicast_ether_addr(hdr->addr1))
880-
is_packet_for_us = 1;
881-
}
882-
break;
883-
case IW_MODE_INFRA:
884-
/* our BSS (== from our AP) and from DS */
885-
if (ether_addr_equal(hdr->addr2, ieee->bssid) &&
886-
((fc & (IEEE80211_FCTL_TODS + IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS)) {
887-
/* promisc: get all */
888-
if (ieee->dev->flags & IFF_PROMISC)
889-
is_packet_for_us = 1;
890-
/* to us */
891-
else if (ether_addr_equal(hdr->addr1, ieee->dev->dev_addr))
892-
is_packet_for_us = 1;
893-
/* mcast */
894-
else if (is_multicast_ether_addr(hdr->addr1)) {
895-
/* not our own packet bcasted from AP */
896-
if (!ether_addr_equal(hdr->addr3, ieee->dev->dev_addr))
897-
is_packet_for_us = 1;
898-
}
899-
}
900-
break;
901-
default:
902-
/* ? */
903-
break;
904-
}
905-
906-
if (is_packet_for_us)
907-
if (!libipw_rx(ieee, skb, stats))
908-
dev_kfree_skb_irq(skb);
909-
return;
910-
911-
drop_free:
912-
dev_kfree_skb_irq(skb);
913-
ieee->dev->stats.rx_dropped++;
914-
}
915-
916826
#define MGMT_FRAME_FIXED_PART_LENGTH 0x24
917827

918828
static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };
@@ -1729,6 +1639,5 @@ void libipw_rx_mgt(struct libipw_device *ieee,
17291639
}
17301640
}
17311641

1732-
EXPORT_SYMBOL_GPL(libipw_rx_any);
17331642
EXPORT_SYMBOL(libipw_rx_mgt);
17341643
EXPORT_SYMBOL(libipw_rx);

‎drivers/net/wireless/intel/iwlegacy/4965-rs.c‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,8 @@ static void il4965_rs_fill_link_cmd(struct il_priv *il,
132132
static void il4965_rs_stay_in_table(struct il_lq_sta *lq_sta,
133133
bool force_search);
134134

135-
#ifdef CONFIG_MAC80211_DEBUGFS
136135
static void il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta,
137136
u32 *rate_n_flags, int idx);
138-
#else
139-
static void
140-
il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)
141-
{
142-
}
143-
#endif
144137

145138
/*
146139
* The following tables contain the expected throughput metrics for all rates
@@ -2495,8 +2488,6 @@ il4965_rs_free_sta(void *il_r, struct ieee80211_sta *sta, void *il_sta)
24952488
D_RATE("leave\n");
24962489
}
24972490

2498-
#ifdef CONFIG_MAC80211_DEBUGFS
2499-
25002491
static void
25012492
il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)
25022493
{
@@ -2758,7 +2749,6 @@ il4965_rs_add_debugfs(void *il, void *il_sta, struct dentry *dir)
27582749
debugfs_create_u8("tx_agg_tid_enable", 0600, dir,
27592750
&lq_sta->tx_agg_tid_en);
27602751
}
2761-
#endif
27622752

27632753
/*
27642754
* Initialization of rate scaling information is done by driver after
@@ -2781,9 +2771,8 @@ static const struct rate_control_ops rs_4965_ops = {
27812771
.free = il4965_rs_free,
27822772
.alloc_sta = il4965_rs_alloc_sta,
27832773
.free_sta = il4965_rs_free_sta,
2784-
#ifdef CONFIG_MAC80211_DEBUGFS
2785-
.add_sta_debugfs = il4965_rs_add_debugfs,
2786-
#endif
2774+
.add_sta_debugfs = PTR_IF(IS_ENABLED(CONFIG_MAC80211_DEBUGFS),
2775+
il4965_rs_add_debugfs),
27872776
};
27882777

27892778
int

‎drivers/net/wireless/intel/iwlegacy/common.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2815,9 +2815,7 @@ struct il_lq_sta {
28152815
struct il_scale_tbl_info lq_info[LQ_SIZE]; /* "active", "search" */
28162816
struct il_traffic_load load[TID_MAX_LOAD_COUNT];
28172817
u8 tx_agg_tid_en;
2818-
#ifdef CONFIG_MAC80211_DEBUGFS
28192818
u32 dbg_fixed_rate;
2820-
#endif
28212819
struct il_priv *drv;
28222820

28232821
/* used to be in sta_info */

‎drivers/net/wireless/intel/iwlwifi/cfg/22000.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101";
205205
const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";
206206
const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";
207207
const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203";
208-
const char iwl_ax204_name[] = "Intel(R) Wi-Fi 6 AX204 160MHz";
209208

210209
const char iwl_ax200_killer_1650w_name[] =
211210
"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";

‎drivers/net/wireless/intel/iwlwifi/cfg/ax210.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ const struct iwl_cfg_trans_params iwl_ma_trans_cfg = {
180180
};
181181

182182
const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";
183-
const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz";
184183
const char iwl_ax231_name[] = "Intel(R) Wi-Fi 6E AX231 160MHz";
185184
const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz";
186185

‎drivers/net/wireless/intel/iwlwifi/cfg/bz.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ static const struct iwl_base_params iwl_bz_base_params = {
5050
.pcie_l1_allowed = true,
5151
};
5252

53+
const struct iwl_ht_params iwl_bz_ht_params = {
54+
.stbc = true,
55+
.ldpc = true,
56+
.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ) |
57+
BIT(NL80211_BAND_6GHZ),
58+
};
59+
5360
#define IWL_DEVICE_BZ_COMMON \
5461
.ucode_api_max = IWL_BZ_UCODE_API_MAX, \
5562
.ucode_api_min = IWL_BZ_UCODE_API_MIN, \
@@ -113,7 +120,7 @@ static const struct iwl_base_params iwl_bz_base_params = {
113120

114121
#define IWL_DEVICE_BZ \
115122
IWL_DEVICE_BZ_COMMON, \
116-
.ht_params = &iwl_22000_ht_params
123+
.ht_params = &iwl_bz_ht_params
117124

118125
/*
119126
* This size was picked according to 8 MSDUs inside 512 A-MSDUs in an
@@ -145,7 +152,6 @@ const struct iwl_cfg_trans_params iwl_gl_trans_cfg = {
145152
.low_latency_xtal = true,
146153
};
147154

148-
const char iwl_bz_name[] = "Intel(R) TBD Bz device";
149155
const char iwl_fm_name[] = "Intel(R) Wi-Fi 7 BE201 320MHz";
150156
const char iwl_wh_name[] = "Intel(R) Wi-Fi 7 BE211 320MHz";
151157
const char iwl_gl_name[] = "Intel(R) Wi-Fi 7 BE200 320MHz";

0 commit comments

Comments
 (0)