Skip to contentSkip to conversation

staging: wlan-ng: align else if statement to coding standard

PATCH Superseded Maksymilian Piechota 2 participants 6 messages Feb 7, 2017 – Feb 9, 2017 Staging

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v5 cover staging: wlan-ng: align else if statement to coding standard

Patch version 5:
- break up particular changes to separate commits
- change prefix to proper driver (wlan-ng)

Maksymilian Piechota (3):
staging: wlan-ng: move logical continuations at the end of line
staging: wlan-ng: move else if statement to a single line
staging: wlan-ng: realign else if continuation

 drivers/staging/wlan-ng/prism2mgmt.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Signature · 1 line
2.1.4
#1 lore raw

PATCH v5 1/3 staging: wlan-ng: move logical continuations at the end of line

---
 drivers/staging/wlan-ng/prism2mgmt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/prism2mgmt.c +2 -3
index 16fb2d3..64a9ebc 100644
@@ -1308,9 +1308,8 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
 			hw->sniffhdr = 0;
 			wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
 		} else
-		    if ((msg->wlanheader.status ==
-			 P80211ENUM_msgitem_status_data_ok)
-			&& (msg->wlanheader.data == P80211ENUM_truth_true)) {
+		    if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && 
+			(msg->wlanheader.data == P80211ENUM_truth_true)) {
 			hw->sniffhdr = 1;
 			wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
 		} else {
Signature · 1 line
2.1.4
#2 lore raw

Re: [PATCH v5 1/3] staging: wlan-ng: move logical continuations at the end of line

Quoted 4 lines · Maksymilian Piechota
---
 drivers/staging/wlan-ng/prism2mgmt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

I can not take patches without any changelog text, sorry. Please fix up and resend the whole series.

greg k-h

#3 lore raw

PATCH v5 2/3 staging: wlan-ng: move else if statement to a single line

In reply to Maksymilian Piechota
---
 drivers/staging/wlan-ng/prism2mgmt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/wlan-ng/prism2mgmt.c +1 -2
index 64a9ebc..af83f2a 100644
@@ -1307,8 +1307,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
 		    && (msg->prismheader.data == P80211ENUM_truth_true)) {
 			hw->sniffhdr = 0;
 			wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
-		} else
-		    if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && 
+		} else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) &&
 			(msg->wlanheader.data == P80211ENUM_truth_true)) {
 			hw->sniffhdr = 1;
 			wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
Signature · 1 line
2.1.4
#4 lore raw

PATCH v5 3/3 staging: wlan-ng: realign else if continuation

In reply to Maksymilian Piechota
---
 drivers/staging/wlan-ng/prism2mgmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/wlan-ng/prism2mgmt.c +1 -1
index af83f2a..5277f36 100644
@@ -1308,7 +1308,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
 			hw->sniffhdr = 0;
 			wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
 		} else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) &&
-			(msg->wlanheader.data == P80211ENUM_truth_true)) {
+			   (msg->wlanheader.data == P80211ENUM_truth_true)) {
 			hw->sniffhdr = 1;
 			wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
 		} else {
Signature · 1 line
2.1.4