Skip to content

Commit

Permalink
mwlwifi updated to jbsky next branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@trinidude4
trinidude4 committed Dec 19, 2024
1 parent 4f23e30 commit 5a0690e
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 82 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_mwlwifi.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jobs:
uses: maggie44/actions/packages/automatic-releases@built-packages
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: mwlwifi-${{ env.BUILD_TARGET }}
automatic_release_tag: mwlwifi-jbsky-${{ env.BUILD_TARGET }}
prerelease: false
title: Latest ${{ env.BUILD_TARGET }} mwlwifi
title: jbsky ${{ env.BUILD_TARGET }} mwlwifi
files: |
bin/targets/mvebu/cortexa9/packages/kmod-mwlwifi_*.ipk
bin/targets/mvebu/cortexa9/packages/mwlwifi-firmware-*.ipk
8 changes: 4 additions & 4 deletions package/kernel/mwlwifi/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ PKG_RELEASE=1
PKG_LICENSE:=ISC
PKG_LICENSE_FILES:=

PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
PKG_SOURCE_URL:=https://github.com/jbsky/mwlwifi
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2024-04-19
PKG_SOURCE_VERSION:=a737d348ef4fe00434b2bc44b2b6a68ea833d95b
PKG_MIRROR_HASH:=975ef8796db4523ad1a1c1451c76dc5f5aab0ae4070ec4677b17af0f4de82da1
PKG_SOURCE_DATE:=2024-09-10
PKG_SOURCE_VERSION:=a916e193e14933ec3b02c1bda7c1bb5e1ff15a0a
PKG_MIRROR_HASH:=34156e72e98a5f1294cf9e1bb32e4a46c4b7eb23395389242bdc4b64c3204e49

PKG_MAINTAINER:=Imre Kaloz <[email protected]>
PKG_BUILD_PARALLEL:=1
Expand Down
30 changes: 19 additions & 11 deletions package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,11 @@ Signed-off-by: Christian Marangi <[email protected]>
hif/pcie/tx_ndp.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)

--- a/debugfs.c
+++ b/debugfs.c
@@ -1342,7 +1342,7 @@ done:
Index: mwlwifi-2024-09-10-a916e193/debugfs.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/debugfs.c
+++ mwlwifi-2024-09-10-a916e193/debugfs.c
@@ -1394,7 +1394,7 @@ done:
priv->reg_value);
else
len += scnprintf(p + len, size - len,
Expand All @@ -128,9 +130,11 @@ Signed-off-by: Christian Marangi <[email protected]>
ret, priv->reg_type, priv->reg_offset,
priv->reg_value);

--- a/hif/fwcmd.c
+++ b/hif/fwcmd.c
@@ -3623,7 +3623,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ie
Index: mwlwifi-2024-09-10-a916e193/hif/fwcmd.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/hif/fwcmd.c
+++ mwlwifi-2024-09-10-a916e193/hif/fwcmd.c
@@ -3625,7 +3625,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ie
core_dump->size_kb = pcmd->cmd_data.coredump.size_kb;
core_dump->flags = pcmd->cmd_data.coredump.flags;
memcpy(buff,
Expand All @@ -139,8 +143,10 @@ Signed-off-by: Christian Marangi <[email protected]>
sizeof(struct hostcmd_cmd_get_fw_core_dump) -
sizeof(struct hostcmd_cmd_get_fw_core_dump_)),
MAX_CORE_DUMP_BUFFER);
--- a/hif/pcie/8964/tx_ndp.c
+++ b/hif/pcie/8964/tx_ndp.c
Index: mwlwifi-2024-09-10-a916e193/hif/pcie/8964/tx_ndp.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/hif/pcie/8964/tx_ndp.c
+++ mwlwifi-2024-09-10-a916e193/hif/pcie/8964/tx_ndp.c
@@ -336,7 +336,7 @@ int pcie_tx_init_ndp(struct ieee80211_hw

if (sizeof(struct pcie_tx_ctrl_ndp) >
Expand All @@ -150,9 +156,11 @@ Signed-off-by: Christian Marangi <[email protected]>
sizeof(struct pcie_tx_ctrl_ndp),
sizeof(tx_info->driver_data));
return -ENOMEM;
--- a/hif/pcie/pcie.c
+++ b/hif/pcie/pcie.c
@@ -1464,8 +1464,8 @@ static void pcie_bf_mimo_ctrl_decode(str
Index: mwlwifi-2024-09-10-a916e193/hif/pcie/pcie.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/hif/pcie/pcie.c
+++ mwlwifi-2024-09-10-a916e193/hif/pcie/pcie.c
@@ -1449,8 +1449,8 @@ static void pcie_bf_mimo_ctrl_decode(str
&fp_data->f_pos);
filp_close(fp_data, current->files);
} else {
Expand Down
31 changes: 0 additions & 31 deletions package/kernel/mwlwifi/patches/004-mwlwifi-fix-PCIe-DT-node-null-pointer-dereference.patch
View file

This file was deleted.

84 changes: 50 additions & 34 deletions package/kernel/mwlwifi/patches/005-mac80211_update.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--- a/core.c
+++ b/core.c
Index: mwlwifi-2024-09-10-a916e193/core.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/core.c
+++ mwlwifi-2024-09-10-a916e193/core.c
@@ -718,7 +718,7 @@ static void mwl_chnl_switch_event(struct
vif = container_of((void *)mwl_vif, struct ieee80211_vif,
drv_priv);
Expand All @@ -9,9 +11,11 @@
ieee80211_csa_finish(vif);
}
spin_unlock_bh(&priv->vif_lock);
--- a/debugfs.c
+++ b/debugfs.c
@@ -498,9 +498,9 @@ static ssize_t mwl_debugfs_vif_read(stru
Index: mwlwifi-2024-09-10-a916e193/debugfs.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/debugfs.c
+++ mwlwifi-2024-09-10-a916e193/debugfs.c
@@ -550,9 +550,9 @@ static ssize_t mwl_debugfs_vif_read(stru
switch (vif->type) {
case NL80211_IFTYPE_AP:
len += scnprintf(p + len, size - len, "type: ap\n");
Expand All @@ -24,7 +28,7 @@
len += scnprintf(p + len, size - len,
"ssid: %s\n", ssid);
len += scnprintf(p + len, size - len,
@@ -522,8 +522,8 @@ static ssize_t mwl_debugfs_vif_read(stru
@@ -574,8 +574,8 @@ static ssize_t mwl_debugfs_vif_read(stru
"type: unknown\n");
break;
}
Expand All @@ -35,7 +39,7 @@
len += scnprintf(p + len, size - len,
"channel: %d: width: %d\n",
chan_def->chan->hw_value,
@@ -596,18 +596,18 @@ static ssize_t mwl_debugfs_sta_read(stru
@@ -648,18 +648,18 @@ static ssize_t mwl_debugfs_sta_read(stru
sta_info->wds ? "true" : "false",
sta_info->ba_hist.enable ? "enable" : "disable",
sta_info->is_amsdu_allowed ? sta_info->amsdu_ctrl.cap : 0 ,
Expand Down Expand Up @@ -66,8 +70,10 @@
sta->tdls,
sta->tdls_initiator,
sta->wme,
--- a/hif/fwcmd.c
+++ b/hif/fwcmd.c
Index: mwlwifi-2024-09-10-a916e193/hif/fwcmd.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/hif/fwcmd.c
+++ mwlwifi-2024-09-10-a916e193/hif/fwcmd.c
@@ -633,11 +633,15 @@ einval:
}

Expand Down Expand Up @@ -95,7 +101,7 @@
if (priv->chip_type == MWL8997)
ether_addr_copy(pcmd->start_cmd.bssid, mwl_vif->bssid);
pcmd->start_cmd.bss_type = 1;
@@ -2090,7 +2094,7 @@ int mwl_fwcmd_set_beacon(struct ieee8021
@@ -2092,7 +2096,7 @@ int mwl_fwcmd_set_beacon(struct ieee8021
if (mwl_fwcmd_set_wsc_ie(hw, b_inf->ie_wsc_len, b_inf->ie_wsc_ptr))
goto err;

Expand All @@ -104,7 +110,7 @@
goto err;

if (b_inf->cap_info & WLAN_CAPABILITY_SPECTRUM_MGMT)
@@ -2152,38 +2156,38 @@ int mwl_fwcmd_set_new_stn_add(struct iee
@@ -2154,38 +2158,38 @@ int mwl_fwcmd_set_new_stn_add(struct iee
ether_addr_copy(pcmd->mac_addr, sta->addr);

if (hw->conf.chandef.chan->band == NL80211_BAND_2GHZ)
Expand Down Expand Up @@ -157,7 +163,7 @@
}

pcmd->is_qos_sta = sta->wme;
@@ -2239,38 +2243,38 @@ int mwl_fwcmd_set_new_stn_add_sc4(struct
@@ -2241,38 +2245,38 @@ int mwl_fwcmd_set_new_stn_add_sc4(struct
ether_addr_copy(pcmd->mac_addr, sta->addr);

if (hw->conf.chandef.chan->band == NL80211_BAND_2GHZ)
Expand Down Expand Up @@ -210,7 +216,7 @@
}

pcmd->is_qos_sta = sta->wme;
@@ -2787,9 +2791,9 @@ int mwl_fwcmd_create_ba(struct ieee80211
@@ -2789,9 +2793,9 @@ int mwl_fwcmd_create_ba(struct ieee80211
pcmd->ba_info.create_params.flags = cpu_to_le32(ba_flags);
pcmd->ba_info.create_params.queue_id = stream->idx;
pcmd->ba_info.create_params.param_info =
Expand All @@ -222,7 +228,7 @@
IEEE80211_HT_AMPDU_PARM_DENSITY);
if (direction == BA_FLAG_DIRECTION_UP) {
pcmd->ba_info.create_params.reset_seq_no = 0;
@@ -2799,9 +2803,9 @@ int mwl_fwcmd_create_ba(struct ieee80211
@@ -2801,9 +2805,9 @@ int mwl_fwcmd_create_ba(struct ieee80211
pcmd->ba_info.create_params.current_seq = cpu_to_le16(0);
}
if (priv->chip_type == MWL8964 &&
Expand All @@ -234,9 +240,11 @@
IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK) >>
IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT);
}
--- a/hif/pcie/8864/tx.c
+++ b/hif/pcie/8864/tx.c
@@ -743,7 +743,7 @@ void pcie_8864_tx_xmit(struct ieee80211_
Index: mwlwifi-2024-09-10-a916e193/hif/pcie/8864/tx.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/hif/pcie/8864/tx.c
+++ mwlwifi-2024-09-10-a916e193/hif/pcie/8864/tx.c
@@ -730,7 +730,7 @@ void pcie_8864_tx_xmit(struct ieee80211_
index = SYSADPT_TX_WMM_QUEUES - index - 1;
txpriority = index;

Expand All @@ -245,9 +253,11 @@
!(xmitcontrol & EAGLE_TXD_XMITCTRL_USE_MC_RATE) &&
ieee80211_is_data_qos(wh->frame_control)) {
tid = qos & 0xf;
--- a/hif/pcie/8964/tx_ndp.c
+++ b/hif/pcie/8964/tx_ndp.c
@@ -607,7 +607,7 @@ void pcie_tx_xmit_ndp(struct ieee80211_h
Index: mwlwifi-2024-09-10-a916e193/hif/pcie/8964/tx_ndp.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/hif/pcie/8964/tx_ndp.c
+++ mwlwifi-2024-09-10-a916e193/hif/pcie/8964/tx_ndp.c
@@ -604,7 +604,7 @@ void pcie_tx_xmit_ndp(struct ieee80211_h
pcie_tx_encapsulate_frame(priv, skb, k_conf);
} else {
tid = qos & 0x7;
Expand All @@ -256,8 +266,10 @@
qos != 0xFFFF) {
pcie_tx_count_packet(sta, tid);
spin_lock_bh(&priv->stream_lock);
--- a/hif/pcie/8997/tx.c
+++ b/hif/pcie/8997/tx.c
Index: mwlwifi-2024-09-10-a916e193/hif/pcie/8997/tx.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/hif/pcie/8997/tx.c
+++ mwlwifi-2024-09-10-a916e193/hif/pcie/8997/tx.c
@@ -81,7 +81,7 @@ static int pcie_txbd_ring_create(struct
wiphy_info(priv->hw->wiphy,
"TX ring: - base: %p, pbase: 0x%x, len: %d\n",
Expand All @@ -267,7 +279,7 @@
pcie_priv->txbd_ring_size);

for (num = 0; num < PCIE_MAX_TXRX_BD; num++) {
@@ -694,7 +694,7 @@ void pcie_8997_tx_xmit(struct ieee80211_
@@ -682,7 +682,7 @@ void pcie_8997_tx_xmit(struct ieee80211_
index = SYSADPT_TX_WMM_QUEUES - index - 1;
txpriority = index;

Expand All @@ -276,9 +288,11 @@
!(xmitcontrol & EAGLE_TXD_XMITCTRL_USE_MC_RATE) &&
ieee80211_is_data_qos(wh->frame_control)) {
tid = qos & 0xf;
--- a/mac80211.c
+++ b/mac80211.c
@@ -368,15 +368,15 @@ static void mwl_mac80211_bss_info_change
Index: mwlwifi-2024-09-10-a916e193/mac80211.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/mac80211.c
+++ mwlwifi-2024-09-10-a916e193/mac80211.c
@@ -390,15 +390,15 @@ static void mwl_mac80211_bss_info_change
}
}

Expand All @@ -297,7 +311,7 @@
{
struct mwl_priv *priv = hw->priv;
struct mwl_vif *mwl_vif;
@@ -426,8 +426,8 @@ static void mwl_mac80211_bss_info_change
@@ -448,8 +448,8 @@ static void mwl_mac80211_bss_info_change
if (changed & (BSS_CHANGED_BEACON_INT | BSS_CHANGED_BEACON)) {
struct sk_buff *skb;

Expand All @@ -308,7 +322,7 @@
(!info->hidden_ssid)) {
if (mwl_vif->broadcast_ssid != true) {
mwl_fwcmd_broadcast_ssid_enable(hw, vif, true);
@@ -441,7 +441,7 @@ static void mwl_mac80211_bss_info_change
@@ -463,7 +463,7 @@ static void mwl_mac80211_bss_info_change
}

if (!mwl_vif->set_beacon) {
Expand All @@ -317,7 +331,7 @@

if (skb) {
mwl_fwcmd_set_beacon(hw, vif, skb->data, skb->len);
@@ -458,7 +458,7 @@ static void mwl_mac80211_bss_info_change
@@ -480,7 +480,7 @@ static void mwl_mac80211_bss_info_change
static void mwl_mac80211_bss_info_changed(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_bss_conf *info,
Expand All @@ -326,7 +340,7 @@
{
switch (vif->type) {
case NL80211_IFTYPE_AP:
@@ -583,10 +583,10 @@ static int mwl_mac80211_sta_add(struct i
@@ -605,10 +605,10 @@ static int mwl_mac80211_sta_add(struct i
if (vif->type == NL80211_IFTYPE_MESH_POINT)
sta_info->is_mesh_node = true;

Expand All @@ -339,7 +353,7 @@
sta_info->amsdu_ctrl.cap = MWL_AMSDU_SIZE_8K;
sta_info->amsdu_ctrl.amsdu_allow_size = SYSADPT_AMSDU_8K_MAX_SIZE;
}
@@ -670,7 +670,7 @@ static int mwl_mac80211_sta_remove(struc
@@ -692,7 +692,7 @@ static int mwl_mac80211_sta_remove(struc

static int mwl_mac80211_conf_tx(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
Expand All @@ -348,14 +362,16 @@
const struct ieee80211_tx_queue_params *params)
{
struct mwl_priv *priv = hw->priv;
@@ -934,4 +934,5 @@ const struct ieee80211_ops mwl_mac80211_
@@ -956,4 +956,5 @@ const struct ieee80211_ops mwl_mac80211_
.pre_channel_switch = mwl_mac80211_chnl_switch,
.sw_scan_start = mwl_mac80211_sw_scan_start,
.sw_scan_complete = mwl_mac80211_sw_scan_complete,
+ .wake_tx_queue = ieee80211_handle_wake_tx_queue,
};
--- a/utils.c
+++ b/utils.c
Index: mwlwifi-2024-09-10-a916e193/utils.c
===================================================================
--- mwlwifi-2024-09-10-a916e193.orig/utils.c
+++ mwlwifi-2024-09-10-a916e193/utils.c
@@ -173,9 +173,9 @@ u32 utils_get_init_tx_rate(struct mwl_pr
u32 tx_rate;
u16 format, nss, bw, rate_mcs;
Expand Down

0 comments on commit 5a0690e

Please sign in to comment.