forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: x86: fix cpu temp info mwlwifi:add disable-amsdu patch (coolsnowwolf#5027) mtwifi: update dual 7615 config (Thx zmzhuai and MeIsReallyBa) (coolsnowwolf#5025) Version update to R20.7.7 bcm53xx: phicomm-k3 using custom k3-brcmfmac4366c-firmware bcm53xx: phicomm-k3 using custom k3-brcmfmac4366c-firmware package: remove some old pack coremark: bump version to 2020-05-28 automount:use antfs instead of ntfs-3g shortcut-fe-cm: load only once to avoid panic (coolsnowwolf#5019)
- Loading branch information
Showing
44 changed files
with
37 additions
and
17,794 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/core.c | ||
+++ b/core.c | ||
@@ -982,7 +982,7 @@ struct ieee80211_hw *mwl_alloc_hw(int bu | ||
priv->use_short_preamble = false; | ||
priv->disable_2g = false; | ||
priv->disable_5g = false; | ||
- priv->tx_amsdu = true; | ||
+ priv->tx_amsdu = false; | ||
priv->hif.bus = bus_type; | ||
priv->hif.ops = ops; | ||
priv->hif.priv = (char *)priv + ALIGN(sizeof(*priv), NETDEV_ALIGN); |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,5 @@ | ||
#!/bin/sh | ||
|
||
info() | ||
{ | ||
MHz=`grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'` | ||
#获取CPU工作频率 | ||
|
||
sensors 2>/dev/null | ||
|
||
if [ $? -eq 0 ];then | ||
a=`sensors | grep 'Core 0' | cut -c10-24` | ||
#获取CPU核心1温度 | ||
|
||
else | ||
a="" | ||
fi | ||
} | ||
|
||
out() | ||
{ | ||
info | ||
echo "$MHz MHz $a " | ||
} | ||
|
||
out | ||
MHz=`grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'` | ||
TEMP=`sensors 2>/dev/null | grep 'Core 0' | cut -c12-` | ||
echo "$MHz MHz $TEMP " |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.