Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1303821 > unrolled thread

[PATCH 12/40] drivers/staging/wlan-ng/p80211conv.c: Fixed coding style

Back to article view | Back to linux.kernel

Contents

  [PATCH 12/40] drivers/staging/wlan-ng/p80211conv.c: Fixed coding style Pranjal Bhor <bhor.pranjal@gmail.com> - 2016-01-07 20:20 +0100

#1303821 — [PATCH 12/40] drivers/staging/wlan-ng/p80211conv.c: Fixed coding style

Logical continuation fix for 'if' block

Signed-off-by: Pranjal Bhor <bhor.pranjal@gmail.com>
---
 drivers/staging/wlan-ng/p80211conv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index 28d7fd8..8769e47 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -317,8 +317,9 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
	}

	/* perform de-wep if necessary.. */
-	if ((wlandev->hostwep & HOSTWEP_PRIVACYINVOKED) && WLAN_GET_FC_ISWEP(fc)
-	    && (wlandev->hostwep & HOSTWEP_DECRYPT)) {
+	if ((wlandev->hostwep & HOSTWEP_PRIVACYINVOKED) &&
+	    WLAN_GET_FC_ISWEP(fc) &&
+	    (wlandev->hostwep & HOSTWEP_DECRYPT)) {
		if (payload_length <= 8) {
			netdev_err(netdev,
				   "WEP frame too short (%u).\n", skb->len);
--
1.9.1

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web