Browse Source

Staging: wlan-ng: fix coding style issues in prism2mgmt.c

This is a patch to prism2mgmt.c that fixes coding style issues found by
checkpatch.pl. Three instances of the 80 char line limit being exceeded
have been kept as is so that string literals are not split up.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Johan Meiring 14 years ago
parent
commit
f83dfd0658
1 changed files with 14 additions and 12 deletions
  1. 14 12
      drivers/staging/wlan-ng/prism2mgmt.c

+ 14 - 12
drivers/staging/wlan-ng/prism2mgmt.c

@@ -213,8 +213,8 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 		u16 wordbuf[17];
 		u16 wordbuf[17];
 
 
 		result = hfa384x_drvr_setconfig16(hw,
 		result = hfa384x_drvr_setconfig16(hw,
-						  HFA384x_RID_CNFROAMINGMODE,
-						  HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);
+					HFA384x_RID_CNFROAMINGMODE,
+					HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);
 		if (result) {
 		if (result) {
 			printk(KERN_ERR
 			printk(KERN_ERR
 			       "setconfig(ROAMINGMODE) failed. result=%d\n",
 			       "setconfig(ROAMINGMODE) failed. result=%d\n",
@@ -258,8 +258,8 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 		}
 		}
 		/* ibss options */
 		/* ibss options */
 		result = hfa384x_drvr_setconfig16(hw,
 		result = hfa384x_drvr_setconfig16(hw,
-						  HFA384x_RID_CREATEIBSS,
-						  HFA384x_CREATEIBSS_JOINCREATEIBSS);
+					HFA384x_RID_CREATEIBSS,
+					HFA384x_CREATEIBSS_JOINCREATEIBSS);
 		if (result) {
 		if (result) {
 			printk(KERN_ERR "Failed to set CREATEIBSS.\n");
 			printk(KERN_ERR "Failed to set CREATEIBSS.\n");
 			msg->resultcode.data =
 			msg->resultcode.data =
@@ -416,7 +416,8 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 #define REQBASICRATE(N) \
 #define REQBASICRATE(N) \
 	if ((count >= N) && DOT11_RATE5_ISBASIC_GET(item->supprates[(N)-1])) { \
 	if ((count >= N) && DOT11_RATE5_ISBASIC_GET(item->supprates[(N)-1])) { \
 		req->basicrate ## N .data = item->supprates[(N)-1]; \
 		req->basicrate ## N .data = item->supprates[(N)-1]; \
-		req->basicrate ## N .status = P80211ENUM_msgitem_status_data_ok; \
+		req->basicrate ## N .status = \
+			P80211ENUM_msgitem_status_data_ok; \
 	}
 	}
 
 
 	REQBASICRATE(1);
 	REQBASICRATE(1);
@@ -431,7 +432,8 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 #define REQSUPPRATE(N) \
 #define REQSUPPRATE(N) \
 	if (count >= N) { \
 	if (count >= N) { \
 		req->supprate ## N .data = item->supprates[(N)-1]; \
 		req->supprate ## N .data = item->supprates[(N)-1]; \
-		req->supprate ## N .status = P80211ENUM_msgitem_status_data_ok; \
+		req->supprate ## N .status = \
+			P80211ENUM_msgitem_status_data_ok; \
 	}
 	}
 
 
 	REQSUPPRATE(1);
 	REQSUPPRATE(1);
@@ -1102,7 +1104,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 		result = hfa384x_drvr_disable(hw, 0);
 		result = hfa384x_drvr_disable(hw, 0);
 		if (result) {
 		if (result) {
 			pr_debug
 			pr_debug
-			    ("failed to disable port 0 after sniffing, result=%d\n",
+			("failed to disable port 0 after sniffing, result=%d\n",
 			     result);
 			     result);
 			goto failed;
 			goto failed;
 		}
 		}
@@ -1137,7 +1139,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 			result = hfa384x_drvr_enable(hw, 0);
 			result = hfa384x_drvr_enable(hw, 0);
 			if (result) {
 			if (result) {
 				pr_debug
 				pr_debug
-				    ("failed to enable port to presniff setting, result=%d\n",
+				("failed to enable port to presniff setting, result=%d\n",
 				     result);
 				     result);
 				goto failed;
 				goto failed;
 			}
 			}
@@ -1161,7 +1163,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 						  &(hw->presniff_port_type));
 						  &(hw->presniff_port_type));
 				if (result) {
 				if (result) {
 					pr_debug
 					pr_debug
-					    ("failed to read porttype, result=%d\n",
+					("failed to read porttype, result=%d\n",
 					     result);
 					     result);
 					goto failed;
 					goto failed;
 				}
 				}
@@ -1171,7 +1173,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 						  &(hw->presniff_wepflags));
 						  &(hw->presniff_wepflags));
 				if (result) {
 				if (result) {
 					pr_debug
 					pr_debug
-					    ("failed to read wepflags, result=%d\n",
+					("failed to read wepflags, result=%d\n",
 					     result);
 					     result);
 					goto failed;
 					goto failed;
 				}
 				}
@@ -1238,8 +1240,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 
 
 			if (result) {
 			if (result) {
 				pr_debug
 				pr_debug
-				    ("failed to set wepflags=0x%04x, result=%d\n",
-				     word, result);
+				  ("failed to set wepflags=0x%04x, result=%d\n",
+				   word, result);
 				goto failed;
 				goto failed;
 			}
 			}
 		}
 		}