RTL8188EU: Update to c928027

Remove local patch in favour of upstream code.
This commit is contained in:
Carlos Garces 2020-10-24 14:13:41 +02:00
parent 636e32e503
commit 785d051b8e
2 changed files with 3 additions and 85 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="RTL8188EU"
PKG_VERSION="a0fff49c4114241a314571b57e3b32c9b0a4c656"
PKG_SHA256="76026dc8eb17accde69f9c10a7485d637f01fd7a36f3c54aeda1e51b3abe5ada"
PKG_VERSION="c9280272bcc358e52d57b3f88e42596795b8f6c1"
PKG_SHA256="e403c5cd3007cdc0d07b062a374e37c808caec914abbd3aa11e7bcfda9feab74"
PKG_LICENSE="GPL"
# realtek: PKG_SITE="http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PFid=48&Level=5&Conn=4&ProdID=274&DownTypeID=3&GetDown=false&Downloads=true"
PKG_SITE="https://github.com/lwfinger/rtl8188eu"
@ -17,7 +17,7 @@ pre_make_target() {
}
make_target() {
make V=1 \
make modules \
ARCH=$TARGET_KERNEL_ARCH \
KSRC=$(kernel_path) \
CROSS_COMPILE=$TARGET_KERNEL_PREFIX \

View File

@ -1,82 +0,0 @@
diff --git a/hostapd-0.8/src/crypto/sha256-internal.c b/hostapd-0.8/src/crypto/sha256-internal.c
index b0613739fbc6..c51983c6d633 100644
--- a/hostapd-0.8/src/crypto/sha256-internal.c
+++ b/hostapd-0.8/src/crypto/sha256-internal.c
@@ -18,16 +18,10 @@
#include "sha256.h"
#include "crypto.h"
-struct sha256_state {
- u64 length;
- u32 state[8], curlen;
- u8 buf[64];
-};
-
-static void sha256_init(struct sha256_state *md);
-static int sha256_process(struct sha256_state *md, const unsigned char *in,
+static void sha256_init(struct sha256_state_rtw *md);
+static int sha256_process(struct sha256_state_rtw *md, const unsigned char *in,
unsigned long inlen);
-static int sha256_done(struct sha256_state *md, unsigned char *out);
+static int sha256_done(struct sha256_state_rtw *md, unsigned char *out);
/**
@@ -41,7 +35,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out);
int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len,
u8 *mac)
{
- struct sha256_state ctx;
+ struct sha256_state_rtw ctx;
size_t i;
sha256_init(&ctx);
@@ -94,7 +88,7 @@ static const unsigned long K[64] = {
#endif
/* compress 512-bits */
-static int sha256_compress(struct sha256_state *md, unsigned char *buf)
+static int sha256_compress(struct sha256_state_rtw *md, unsigned char *buf)
{
u32 S[8], W[64], t0, t1;
u32 t;
@@ -137,7 +131,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
/* Initialize the hash state */
-static void sha256_init(struct sha256_state *md)
+static void sha256_init(struct sha256_state_rtw *md)
{
md->curlen = 0;
md->length = 0;
@@ -158,7 +152,7 @@ static void sha256_init(struct sha256_state *md)
@param inlen The length of the data (octets)
@return CRYPT_OK if successful
*/
-static int sha256_process(struct sha256_state *md, const unsigned char *in,
+static int sha256_process(struct sha256_state_rtw *md, const unsigned char *in,
unsigned long inlen)
{
unsigned long n;
@@ -199,7 +193,7 @@ static int sha256_process(struct sha256_state *md, const unsigned char *in,
@param out [out] The destination of the hash (32 bytes)
@return CRYPT_OK if successful
*/
-static int sha256_done(struct sha256_state *md, unsigned char *out)
+static int sha256_done(struct sha256_state_rtw *md, unsigned char *out)
{
int i;
diff --git a/include/rtw_security.h b/include/rtw_security.h
index 21b9c35ce34c..374e6ca86c47 100644
--- a/include/rtw_security.h
+++ b/include/rtw_security.h
@@ -168,7 +168,7 @@ struct security_priv {
u8 bWepDefaultKeyIdxSet;
};
-struct sha256_state {
+struct sha256_state_rtw {
u64 length;
u32 state[8], curlen;
u8 buf[64];