staging: r8188eu: convert DBG_88E calls in core/rtw_security.c

Convert all DBG_88E calls in core/rtw_security.c to netdev_dbg calls.
These calls seem to contain useful information/assertions and so are
probably worth keeping. In doing this conversion, also convert
static aes_decipher to take a struct adapter * parameter, as per the
convention elsewhere in the driver currently. This allows us to pass
this through and access its pnetdev member for the netdev_dbg call in
the function.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20211206234952.1238-2-phil@philpotter.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_security.c b/drivers/staging/r8188eu/core/rtw_security.c
index db35f326bbb1f18dc6685792ed30973ad06dfd0a..4e93c720c1b6dc573b364a59d698042a223a2979 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_security.c
+++ b/drivers/staging/r8188eu/core/rtw_security.c
@@ -545,7 +545,8 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, struct recv_frame *precvframe)
                        if (is_multicast_ether_addr(prxattrib->ra)) {
                                if (!psecuritypriv->binstallGrpkey) {
                                        res = _FAIL;
-                                       DBG_88E("%s:rx bc/mc packets, but didn't install group key!!!!!!!!!!\n", __func__);
+                                       netdev_dbg(padapter->pnetdev,
+                                                  "rx bc/mc packets, but didn't install group key!\n");
                                        goto exit;
                                }
                                prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
@@ -1145,7 +1146,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe)
        return res;
 }
 
-static int aes_decipher(u8 *key, uint  hdrlen,
+static int aes_decipher(struct adapter *padapter, u8 *key, uint hdrlen,
                        u8 *pframe, uint plen)
 {
        static u8       message[MAX_MSG_SIZE];
@@ -1329,8 +1330,10 @@ static int aes_decipher(u8 *key, uint    hdrlen,
        /* compare the mic */
        for (i = 0; i < 8; i++) {
                if (pframe[hdrlen + 8 + plen - 8 + i] != message[hdrlen + 8 + plen - 8 + i]) {
-                       DBG_88E("aes_decipher:mic check error mic[%d]: pframe(%x)!=message(%x)\n",
-                               i, pframe[hdrlen + 8 + plen - 8 + i], message[hdrlen + 8 + plen - 8 + i]);
+                       netdev_dbg(padapter->pnetdev,
+                                  "mic check error mic[%d]: pframe(%x)!=message(%x)\n",
+                                  i, pframe[hdrlen + 8 + plen - 8 + i],
+                                  message[hdrlen + 8 + plen - 8 + i]);
                        res = _FAIL;
                }
        }
@@ -1358,13 +1361,16 @@ u32 rtw_aes_decrypt(struct adapter *padapter, struct recv_frame *precvframe)
                                /* in concurrent we should use sw descrypt in group key, so we remove this message */
                                if (!psecuritypriv->binstallGrpkey) {
                                        res = _FAIL;
-                                       DBG_88E("%s:rx bc/mc packets, but didn't install group key!!!!!!!!!!\n", __func__);
+                                       netdev_dbg(padapter->pnetdev,
+                                                  "rx bc/mc packets, but didn't install group key!\n");
                                        goto exit;
                                }
                                prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
                                if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) {
-                                       DBG_88E("not match packet_index=%d, install_index=%d\n",
-                                               prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid);
+                                       netdev_dbg(padapter->pnetdev,
+                                                  "not match packet_index=%d, install_index=%d\n",
+                                                  prxattrib->key_index,
+                                                  psecuritypriv->dot118021XGrpKeyid);
                                        res = _FAIL;
                                        goto exit;
                                }
@@ -1372,7 +1378,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, struct recv_frame *precvframe)
                                prwskey = &stainfo->dot118021x_UncstKey.skey[0];
                        }
                        length = precvframe->len - prxattrib->hdrlen - prxattrib->iv_len;
-                       res = aes_decipher(prwskey, prxattrib->hdrlen, pframe, length);
+                       res = aes_decipher(padapter, prwskey, prxattrib->hdrlen, pframe, length);
                } else {
                        res = _FAIL;
                }