Commit bf812e0a authored by Felix N. Kimbu's avatar Felix N. Kimbu Committed by Greg Kroah-Hartman
Browse files

staging: wlan-ng: Rename 'foo' to 'rc' in p80211conv.c



Rename identifier 'foo' to 'rc' in skb_p80211_to_ether() and
skb_ether_to_p80211() to match the common kernel coding style.

Signed-off-by: default avatarFelix N. Kimbu <felixkimbu1@gmail.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/ZfEvTF7qwYZORGsY@MOLeToid


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ab8e210d
Loading
Loading
Loading
Loading
+15 −15
Original line number Diff line number Diff line
@@ -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 rc;

	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,
		rc = wep_encrypt(wlandev, skb->data, p80211_wep->data,
				 skb->len,
				 wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK,
				 p80211_wep->iv, p80211_wep->icv);
		if (foo) {
		if (rc) {
			netdev_warn(wlandev->netdev,
				    "Host en-WEP failed, dropping frame (%d).\n",
				    foo);
				    rc);
			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 rc;

	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,
		rc = 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) {
		if (rc) {
			/* de-wep failed, drop skb. */
			netdev_dbg(netdev, "Host de-WEP failed, dropping frame (%d).\n",
				   foo);
				   rc);
			wlandev->rx.decrypt_err++;
			return 2;
		}