projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[linux-2.6-microblaze.git]
/
drivers
/
staging
/
rtl8192e
/
rtl8192e
/
rtl_core.c
diff --git
a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index
e895473
..
11183b9
100644
(file)
--- a/
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@
-267,7
+267,7
@@
static short _rtl92e_check_nic_enough_desc(struct net_device *dev, int prio)
return 0;
}
return 0;
}
-static void _rtl92e_tx_timeout(struct net_device *dev)
+static void _rtl92e_tx_timeout(struct net_device *dev
, unsigned int txqueue
)
{
struct r8192_priv *priv = rtllib_priv(dev);
{
struct r8192_priv *priv = rtllib_priv(dev);
@@
-1973,18
+1973,11
@@
u8 rtl92e_rx_db_to_percent(s8 antpower)
u8 rtl92e_evm_db_to_percent(s8 value)
{
u8 rtl92e_evm_db_to_percent(s8 value)
{
- s8 ret_val;
+ s8 ret_val
= clamp(-value, 0, 33) * 3
;
- ret_val = value;
-
- if (ret_val >= 0)
- ret_val = 0;
- if (ret_val <= -33)
- ret_val = -33;
- ret_val = 0 - ret_val;
- ret_val *= 3;
if (ret_val == 99)
ret_val = 100;
if (ret_val == 99)
ret_val = 100;
+
return ret_val;
}
return ret_val;
}