Revert "staging: r8188eu: Fix different base types in assignments and parameters"

This reverts commit 56febcc2595e2bf2546c5bb4c35740ce883771a2.

It's not correct and instead of fixing it up, let's just revert it for
now.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20210802203020.9679-1-fmdefrancesco@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c
index 89fce9a..27c8ec3 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_br_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_br_ext.c
@@ -71,7 +71,7 @@ static inline int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_tag *t
        struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN);
        int data_len;
 
-       data_len = be16_to_cpu(tag->tag_len) + TAG_HDR_LEN;
+       data_len = tag->tag_len + TAG_HDR_LEN;
        if (skb_tailroom(skb) < data_len) {
                _DEBUG_ERR("skb_tailroom() failed in add SID tag!\n");
                return -1;
@@ -134,68 +134,42 @@ static inline void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr
 }
 
 static inline void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
-                               __be32 *ipxNetAddr, unsigned char *ipxNodeAddr)
+                               unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
 {
-       union {
-                unsigned int f0;
-                unsigned char f1[IPX_NODE_LEN];
-        } addr;
-
        memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
 
        networkAddr[0] = NAT25_IPX;
-       addr.f0 = be32_to_cpu(*ipxNetAddr);
-       memcpy(networkAddr+1, addr.f1, 4);
+       memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
        memcpy(networkAddr+5, ipxNodeAddr, 6);
 }
 
 static inline void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
-                               __be32 *ipxNetAddr, __be16 *ipxSocketAddr)
+                               unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
 {
-       union {
-               unsigned int f0;
-               unsigned char f1[4];
-       } addr;
-
        memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
 
        networkAddr[0] = NAT25_IPX;
-       addr.f0 = be32_to_cpu(*ipxNetAddr);
-       memcpy(networkAddr+1, addr.f1, 4);
-       addr.f0 ^= addr.f0;
-       addr.f0 = be16_to_cpu(*ipxSocketAddr);
-       memcpy(networkAddr+5, addr.f1, 2);
+       memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
+       memcpy(networkAddr+5, (unsigned char *)ipxSocketAddr, 2);
 }
 
 static inline void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
-                               __be16 *network, unsigned char *node)
+                               unsigned short *network, unsigned char *node)
 {
-       union {
-                unsigned short f0;
-                unsigned char f1[2];
-        } addr;
-
        memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
 
        networkAddr[0] = NAT25_APPLE;
-       addr.f0 = be16_to_cpu(*network);
-       memcpy(networkAddr+1, addr.f1, 2);
+       memcpy(networkAddr+1, (unsigned char *)network, 2);
        networkAddr[3] = *node;
 }
 
 static inline void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
-                               unsigned char *ac_mac, __be16 *sid)
+                               unsigned char *ac_mac, unsigned short *sid)
 {
-       union {
-                unsigned short f0;
-                unsigned char f1[2];
-        } addr;
-
        memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
 
        networkAddr[0] = NAT25_PPPOE;
-       addr.f0 = be16_to_cpu(*sid);
-       memcpy(networkAddr+1, addr.f1, 2);
+       memcpy(networkAddr+1, (unsigned char *)sid, 2);
        memcpy(networkAddr+3, (unsigned char *)ac_mac, 6);
 }