Revert "Merge pull request 'patches/driver/bes2600/*-danctnix: reconstruct from cleanups (closes #29)' (#33) from claude-noether/kernel-agent:noether/kernel-agent-29-per-series-reconstruct into main"
This reverts commit38fd672940, reversing changes made to443f5e992e.
This commit is contained in:
+14
-14
@@ -1,8 +1,8 @@
|
||||
From 9012b74eea8d540c8637d7645093204d1e94e99a Mon Sep 17 00:00:00 2001
|
||||
From 9398d3028bc9d2f4ccbf8e830f8e9799bf065ce4 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
Date: Wed, 22 Apr 2026 13:04:27 +0200
|
||||
Subject: [PATCH 06/29] bes2600: enable CONFIG_BES2600_TESTMODE by default +
|
||||
fix bit-rotted testmode plumbing
|
||||
Subject: [PATCH] bes2600: enable CONFIG_BES2600_TESTMODE by default + fix
|
||||
bit-rotted testmode plumbing
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@@ -63,10 +63,10 @@ Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
bes2600/sta.c | 6 +++---
|
||||
3 files changed, 27 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/bes2600/Makefile b/drivers/staging/bes2600/Makefile
|
||||
index 2dcba09..2c1a850 100644
|
||||
--- a/drivers/staging/bes2600/Makefile
|
||||
+++ b/drivers/staging/bes2600/Makefile
|
||||
diff --git a/bes2600/Makefile b/bes2600/Makefile
|
||||
index 300912b..39150e0 100644
|
||||
--- a/bes2600/Makefile
|
||||
+++ b/bes2600/Makefile
|
||||
@@ -2,7 +2,7 @@ KERN_DIR = /lib/modules/$(KERNELRELEASE)/build
|
||||
# feature option
|
||||
BES2600 ?= m
|
||||
@@ -76,10 +76,10 @@ index 2dcba09..2c1a850 100644
|
||||
|
||||
CONFIG_BES2600_ENABLE_DEVEL_LOGS ?= n
|
||||
|
||||
diff --git a/drivers/staging/bes2600/bes_log.h b/drivers/staging/bes2600/bes_log.h
|
||||
diff --git a/bes2600/bes_log.h b/bes2600/bes_log.h
|
||||
index 605cea8..65cf703 100644
|
||||
--- a/drivers/staging/bes2600/bes_log.h
|
||||
+++ b/drivers/staging/bes2600/bes_log.h
|
||||
--- a/bes2600/bes_log.h
|
||||
+++ b/bes2600/bes_log.h
|
||||
@@ -8,3 +8,26 @@ extern struct device *global_dev;
|
||||
#define bes_info(fmt, ...) dev_info(global_dev, fmt, ##__VA_ARGS__)
|
||||
#define bes_warn(fmt, ...) dev_warn(global_dev, fmt, ##__VA_ARGS__)
|
||||
@@ -107,10 +107,10 @@ index 605cea8..65cf703 100644
|
||||
+ if (_cond) \
|
||||
+ bes_err(fmt, ##__VA_ARGS__); \
|
||||
+ } while (0)
|
||||
diff --git a/drivers/staging/bes2600/sta.c b/drivers/staging/bes2600/sta.c
|
||||
diff --git a/bes2600/sta.c b/bes2600/sta.c
|
||||
index aa69eb8..5f1a456 100644
|
||||
--- a/drivers/staging/bes2600/sta.c
|
||||
+++ b/drivers/staging/bes2600/sta.c
|
||||
--- a/bes2600/sta.c
|
||||
+++ b/bes2600/sta.c
|
||||
@@ -3633,7 +3633,7 @@ static int bes2600_set_power_save(struct ieee80211_hw *hw,
|
||||
*
|
||||
* Returns: 0 on success or non zero value on failure
|
||||
@@ -139,5 +139,5 @@ index aa69eb8..5f1a456 100644
|
||||
struct bes2600_common *hw_priv = hw->priv;
|
||||
u16 roam_delay = hw_priv->tsm_info.roam_delay / 1000;
|
||||
--
|
||||
2.54.0
|
||||
2.53.0
|
||||
|
||||
Reference in New Issue
Block a user