Re: [PATCH v2] staging: wlan-ng: p80211conv: fix indentation problems, introduced by previous commit

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thank for you the feedback Philipp, I have checked

and corrected the checkpatch warnings.


Signed-off-by: Felix N. Kimbu <felixkimbu1@xxxxxxxxx>
---
 drivers/staging/wlan-ng/p80211conv.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index a0413928a843..e48a80df87a6 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -186,9 +186,9 @@ int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,
         if (!p80211_wep->data)
             return -ENOMEM;
         decrypt_check = wep_encrypt(wlandev, skb->data, p80211_wep->data,
-                                      skb->len,
-                                    wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK,
-                                    p80211_wep->iv, p80211_wep->icv);
+                        skb->len,
+                        wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK,
+                        p80211_wep->iv, p80211_wep->icv);
         if (decrypt_check) {
             netdev_warn(wlandev->netdev,
                     "Host en-WEP failed, dropping frame (%d).\n",
@@ -306,10 +306,10 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
             return 1;
         }
         decrypt_check = wep_decrypt(wlandev, skb->data + payload_offset + 4,
-                                    payload_length - 8, -1,
-                                    skb->data + payload_offset,
-                                    skb->data + payload_offset +
-                                    payload_length - 4);
+                        payload_length - 8, -1,
+                        skb->data + payload_offset,
+                        skb->data + payload_offset +
+                        payload_length - 4);
         if (decrypt_check) {
             /* de-wep failed, drop skb. */
             netdev_dbg(netdev, "Host de-WEP failed, dropping frame (%d).\n",
--
2.34.1

On 3/11/24 20:31, Philipp Hortmann wrote:
On 3/11/24 19:07, Felix N. Kimbu wrote:
This change renames the local variable foo to decrypt_check in functions
skb_ether_to_p80211(...) and skb_p80211_to_ether(...), giving intuitive
meaning to the identifier.

It also indents the parameters to match the the opening parentheses.

Signed-off-by: Felix N. Kimbu <felixkimbu1@xxxxxxxxx>

Hi Felix,

I think the subject names the subsystem "staging" and then the driver which is "wlan-ng" the file can follow but you cannot omit the driver name.


Please check the following checkpatch warnings:
File Nr: 0    Patch: ../../../Downloads/20240311-[PATCH] staging_ p80211conv_ Rename local foo to decrypt_check-15036.txt
WARNING: Possible repeated word: 'the'
#11:
It also indents the parameters to match the the opening parentheses.

ERROR: code indent should use tabs where possible
#41: FILE: drivers/staging/wlan-ng/p80211conv.c:189:
+^I^I^I^I  ^I^I^I^I^Iskb->len,$

WARNING: please, no space before tabs
#41: FILE: drivers/staging/wlan-ng/p80211conv.c:189:
+^I^I^I^I  ^I^I^I^I^Iskb->len,$

CHECK: Alignment should match open parenthesis
#41: FILE: drivers/staging/wlan-ng/p80211conv.c:189:
+        decrypt_check = wep_encrypt(wlandev, skb->data, p80211_wep->data,
+                                      skb->len,

WARNING: line length of 115 exceeds 100 columns
#42: FILE: drivers/staging/wlan-ng/p80211conv.c:190:
+                                    wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK,

WARNING: line length of 105 exceeds 100 columns
#43: FILE: drivers/staging/wlan-ng/p80211conv.c:191:
+                                    p80211_wep->iv, p80211_wep->icv);

CHECK: Alignment should match open parenthesis
#72: FILE: drivers/staging/wlan-ng/p80211conv.c:309:
+        decrypt_check = wep_decrypt(wlandev, skb->data + payload_offset + 4,
+                                    payload_length - 8, -1,

total: 1 errors, 4 warnings, 2 checks, 58 lines checked

Thanks for your support.

Bye Philipp


---
  drivers/staging/wlan-ng/p80211conv.c | 30 ++++++++++++++--------------
  1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index 8336435eccc2..a0413928a843 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -93,7 +93,7 @@ int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,
      struct wlan_ethhdr e_hdr;
      struct wlan_llc *e_llc;
      struct wlan_snap *e_snap;
-    int foo;
+    int decrypt_check;
        memcpy(&e_hdr, skb->data, sizeof(e_hdr));
  @@ -185,14 +185,14 @@ int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,
          p80211_wep->data = kmalloc(skb->len, GFP_ATOMIC);
          if (!p80211_wep->data)
              return -ENOMEM;
-        foo = wep_encrypt(wlandev, skb->data, p80211_wep->data,
-                  skb->len,
-                  wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK,
-                  p80211_wep->iv, p80211_wep->icv);
-        if (foo) {
+        decrypt_check = wep_encrypt(wlandev, skb->data, p80211_wep->data,
+                                      skb->len,
+                                    wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK,
+                                    p80211_wep->iv, p80211_wep->icv);
+        if (decrypt_check) {
              netdev_warn(wlandev->netdev,
                      "Host en-WEP failed, dropping frame (%d).\n",
-                    foo);
+                    decrypt_check);
              kfree(p80211_wep->data);
              return 2;
          }
@@ -265,7 +265,7 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
      struct wlan_llc *e_llc;
      struct wlan_snap *e_snap;
  -    int foo;
+    int decrypt_check;
        payload_length = skb->len - WLAN_HDR_A3_LEN - WLAN_CRC_LEN;
      payload_offset = WLAN_HDR_A3_LEN;
@@ -305,15 +305,15 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
                     "WEP frame too short (%u).\n", skb->len);
              return 1;
          }
-        foo = wep_decrypt(wlandev, skb->data + payload_offset + 4,
-                  payload_length - 8, -1,
-                  skb->data + payload_offset,
-                  skb->data + payload_offset +
-                  payload_length - 4);
-        if (foo) {
+        decrypt_check = wep_decrypt(wlandev, skb->data + payload_offset + 4,
+                                    payload_length - 8, -1,
+                                    skb->data + payload_offset,
+                                    skb->data + payload_offset +
+                                    payload_length - 4);
+        if (decrypt_check) {
              /* de-wep failed, drop skb. */
              netdev_dbg(netdev, "Host de-WEP failed, dropping frame (%d).\n",
-                   foo);
+                   decrypt_check);
              wlandev->rx.decrypt_err++;
              return 2;
          }





[Index of Archives]     [Linux Driver Development]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux