Skip to content

Commit

Permalink
mwlwifi: update to jbsky next branch
Browse files Browse the repository at this point in the history
  • Loading branch information
trinidude4 committed Jan 6, 2025
1 parent 505de52 commit 93a6977
Show file tree
Hide file tree
Showing 9 changed files with 110 additions and 111 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_mwlwifi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,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
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ PKG_RELEASE=2
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:=d55f69c2fa48d02ba535b72b108fc77f5f13a52b29130a631489a053f1670d2c
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ Signed-off-by: Christian Marangi <[email protected]>
hif/fwcmd.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

--- a/hif/fwcmd.c
+++ b/hif/fwcmd.c
@@ -3622,11 +3622,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ie
Index: mwlwifi-next/hif/fwcmd.c
===================================================================
--- mwlwifi-next.orig/hif/fwcmd.c
+++ mwlwifi-next/hif/fwcmd.c
@@ -3624,11 +3624,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ie
core_dump->context = pcmd->cmd_data.coredump.context;
core_dump->size_kb = pcmd->cmd_data.coredump.size_kb;
core_dump->flags = pcmd->cmd_data.coredump.flags;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ Signed-off-by: Christian Marangi <[email protected]>
hif/pcie/pcie.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/hif/pcie/pcie.c
+++ b/hif/pcie/pcie.c
@@ -1466,8 +1466,8 @@ static void pcie_bf_mimo_ctrl_decode(str
Index: mwlwifi-next/hif/pcie/pcie.c
===================================================================
--- mwlwifi-next.orig/hif/pcie/pcie.c
+++ mwlwifi-next/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
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ Signed-off-by: Christian Marangi <[email protected]>
hif/pcie/8964/tx_ndp.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

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

--- a/hif/pcie/8964/tx_ndp.c
+++ b/hif/pcie/8964/tx_ndp.c
Index: mwlwifi-next/hif/pcie/8964/tx_ndp.c
===================================================================
--- mwlwifi-next.orig/hif/pcie/8964/tx_ndp.c
+++ mwlwifi-next/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 Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ Signed-off-by: Christian Marangi <[email protected]>
debugfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/debugfs.c
+++ b/debugfs.c
Index: mwlwifi-next/debugfs.c
===================================================================
--- mwlwifi-next.orig/debugfs.c
+++ mwlwifi-next/debugfs.c
@@ -364,10 +364,10 @@ static ssize_t mwl_debugfs_info_read(str
"-----------------------=> address| address|qlen|fw_desc_cnt\n");
spin_lock_irqsave(&pcie_priv->tx_desc_lock, flags);
Expand Down
6 changes: 4 additions & 2 deletions package/kernel/mwlwifi/patches/005-Use-BUILD_BUG_ON.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ Signed-off-by: Christian Marangi <[email protected]>
hif/pcie/8964/tx_ndp.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

--- a/hif/pcie/8964/tx_ndp.c
+++ b/hif/pcie/8964/tx_ndp.c
Index: mwlwifi-next/hif/pcie/8964/tx_ndp.c
===================================================================
--- mwlwifi-next.orig/hif/pcie/8964/tx_ndp.c
+++ mwlwifi-next/hif/pcie/8964/tx_ndp.c
@@ -334,13 +334,8 @@ int pcie_tx_init_ndp(struct ieee80211_hw
struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(&skb);
int rc;
Expand Down

This file was deleted.

Loading

0 comments on commit 93a6977

Please sign in to comment.