Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp587661lql; Mon, 11 Mar 2024 11:08:10 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVs6xmQ1Wsv5lkzbjZ3gJOrBBPXfs7kmMbXi5ecuQ+MlMFTIAl3nagueufnqN5Wdl4Zci5Bll4ZG2dCfk3Z/suXmp31xE5R5Rc3GDVU+Q== X-Google-Smtp-Source: AGHT+IHh7kzRXhZxOc7shgp6OSh4NokEg0BYY3YKFWpHvxOM1Q36bBWLHtZO6eC5wLu97jDWr+av X-Received: by 2002:a05:6218:2613:b0:17a:e13b:3a4a with SMTP id oy19-20020a056218261300b0017ae13b3a4amr4414251rwc.29.1710180490662; Mon, 11 Mar 2024 11:08:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710180490; cv=pass; d=google.com; s=arc-20160816; b=XlUDW5BxGaGBpfHbtjQpuHxEEAcIQfLoO83ensS0oaOTRZKMjhJIX/593BJx7PcSIG gPwBGjcowkLyfSN9/iHTy2eOT0VTjwonm+lYhGMJHLg683kgbrxzGhFe9NPAAziebAxg /tdevt3k/uluK5xKTvU2+9azEXQR+radP3K6TS010Om7h4kOlcyT/7ZBn+iD6Bg1woYr AUEj7dPxVtVvlzy1VuOOsH2nFRteKbtM1wFi3M2sCGsoXbhSRReD7aMhAHXbsyMB5pUM XtuO/FJEYlJtIwKaks1P8YML0qOQ/BzYKcbnW94VoJTe9SQBktIjQ2+i/MSfflwanBmG G//Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-disposition:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:subject:cc:to:from:date :dkim-signature; bh=KiTdgp2i9o6Qc3jLXuNAJ1XZ4ZXjWbgbhcsi2rEm3y0=; fh=W2rHIJ1cFgBAXhQBb4rx6TeNrxBLTm8Q9kg5F7uSl0Q=; b=oOTO01epqwFnRzAYDyXYQD7Qlc5gUauMdkjkwo/amw0dPrJU+88UHziNPn+Gp0A3fj 6fcim9NMLj6vrcGY+nmUEAZSlMX2NqAOvKVcxBi05/3iIqyx0EDn1uftXseZ0o5tLXME Zt+yrPE3usOuKHTh4gFtDJuIP58wFfU4t4y+CJBEL8xdJk/HslCSmjnZ9niZIaaofNVg fx0LCMEvBcEzYjxNwR0RgydcNLmdPtvjP8iRJLpHbZc1i6JtLCKMB/xsJgCRQNSrRG3+ fwq5zZWU+EG0WupshnSMMLNvGzEQTkFuCiLMMfTp8jtfruIG8PqhaKfLDC7XhTeCJ90K 1lNg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Fzo9FXWb; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-99346-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99346-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id e13-20020ac8598d000000b0042ee3385939si5912116qte.560.2024.03.11.11.08.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 11:08:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-99346-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Fzo9FXWb; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-99346-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99346-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 61B601C20DFD for ; Mon, 11 Mar 2024 18:08:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C96C355E7B; Mon, 11 Mar 2024 18:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Fzo9FXWb" Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 55BA255E43 for ; Mon, 11 Mar 2024 18:08:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710180483; cv=none; b=YEQOe3+9TSxW/secSboJtQnHrhrxkut+BNSuc9tUHMwPmHqi1xET3IcKZQB2h3vFEeBloL/NFdbR5izNo8YnAfjrUUu70ttTu/saQWfwV4tmyGalCwqN0Y88K5FUn65AFpN7RcdUNc7peMKuLy+aYuRY2WhSSUHj7B/ZP9YskDg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710180483; c=relaxed/simple; bh=TtjcSFJzD1ZaiKH3GMBWqMzWiUymwQvzGYA6LQYJsms=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=vGhaiQQowQDwRVScobZ8KaIf3A+PyxuFGStWCCdsz2R/f5wp4mO5ItKC2bKRFVaXnAELloHZ4X63R+nFTcenCZKwBtq6vqkbASpHsUZZishuMBk3FRiWEcOaFzu/SayIQruIlzDF5mGNCtzqoovorE1FJi6Rkv+pY/fBbM7ptg8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Fzo9FXWb; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-33e7946bddfso2506654f8f.0 for ; Mon, 11 Mar 2024 11:08:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710180480; x=1710785280; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=KiTdgp2i9o6Qc3jLXuNAJ1XZ4ZXjWbgbhcsi2rEm3y0=; b=Fzo9FXWb3D3oYzfDo+8VhZCs5RQjFtHuayj2b1KtsJbmU/BrHbR4zJ+I/kEKl61FBg k5tJip+NGr0Crt44f7cH/xbM0Y8EzgmUs4qxjQSv3Wyd1C8KaGfSP1LkHnBEK4cKOkOM HIUDLURf/AliZq2knvLmkE/5YTBDVOp7M0GMoXsk45IVD5ijdVbRkHPM112840WxmSpy TbyN9+QW6YXAgM5OqVQ9IhWBjGmUYrBiR7quSVa04wbGHojl+lESlZEEU2aTyu/X0JKt ghfAx7eAeCrxN2ydBScNw+uU+MemNJRitq00fOTK8gFGmKFfupasWobcPbXiT5WPhjAx 41kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710180480; x=1710785280; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KiTdgp2i9o6Qc3jLXuNAJ1XZ4ZXjWbgbhcsi2rEm3y0=; b=esIgMwhoh4ksmvh4iMUKNm0tjhwSq5be/8nHpgjJL053+euBLu9dM28E+DI2z9rKqj J+Z5ssZN10zetz299K58YNnNb4qLsaYe1eUJ6oSREWtY2HZrsjtITWOEaC4VqxZpV5QR eun6Ik0hgypjprO46f/+xe3xQUZOPiqiqCTlgYgWDM0RO5iH7E8KzMDEJ3ql2xerf9UL GBJ4jaOQLyYTtr3OGkDqxZiS44P9wOyF9sOEHkMg7l7qcLcfh75SolGepHhKy0v+O/xe pWc2QtbidTjppTC3gRS/eqNFsO1HZtNzLgXZEee1YEAAWNBgUfaE/AArqHjgO185aHOB wicw== X-Forwarded-Encrypted: i=1; AJvYcCVpT8JnTdFgIT/Rq4rRHT9PYGTiP5jeOk7mVecladvwPRgtoIc263qbHPt7Uo4LmVO89CAX5vYogNAUwbsgRAasy4m810vu32FXgOx9 X-Gm-Message-State: AOJu0YyIJYIPQ6OKSlu+ZAUtyRRn/5KyQMPt6xdhzfcRkzX57lDHJnSZ +Q5iDSCY3rl5FUo0tKFLFbI4OuFjHqPPSOejI13p2Ucj6D16q42N X-Received: by 2002:a5d:4e90:0:b0:33e:9311:5fda with SMTP id e16-20020a5d4e90000000b0033e93115fdamr3637250wru.29.1710180479454; Mon, 11 Mar 2024 11:07:59 -0700 (PDT) Received: from MOLeToid ([129.0.78.235]) by smtp.gmail.com with ESMTPSA id cc4-20020a5d5c04000000b0033e91fed625sm4343811wrb.23.2024.03.11.11.07.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 11:07:58 -0700 (PDT) Date: Mon, 11 Mar 2024 19:07:55 +0100 From: "Felix N. Kimbu" To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: outreachy@lists.linux.dev Subject: [PATCH] staging: p80211conv: Rename local foo to decrypt_check Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --- 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; } -- 2.34.1