Staging: wlan-ng : fixing coding style issues in prism2sta.c

Signed-off-by: Christos Tzoumakis <ctzocy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Staging: wlan-ng : fixing coding style issues in prism2sta.c
Signed-off-by: Christos Tzoumakis <ctzocy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Christos Tzoumakis · Greg Kroah-Hartman
1 parent 717f4a5f55
Showing 1 changed file with 37 additions and 34 deletions Side-by-side Diff
drivers/staging/wlan-ng/prism2sta.c
@@ -426,7 +426,7 @@
 *	msgp		ptr to msg buffer
 *
 * Returns:
-* 	A p80211 message resultcode value.
+*	A p80211 message resultcode value.
 *
 * Side effects:
 *
@@ -458,7 +458,7 @@
 				       "hfa384x_drvr_start() failed,"
 				       "result=%d\n", (int)result);
 				result =
-				    P80211ENUM_resultcode_implementation_failure;
+				 P80211ENUM_resultcode_implementation_failure;
 				wlandev->msdstate = WLAN_MSD_HWPRESENT;
 				break;
 			}
@@ -503,7 +503,7 @@
 				       "hfa384x_drvr_start() failed,"
 				       "result=%d\n", (int)result);
 				result =
-				    P80211ENUM_resultcode_implementation_failure;
+				  P80211ENUM_resultcode_implementation_failure;
 				wlandev->msdstate = WLAN_MSD_HWPRESENT;
 				break;
 			}
@@ -514,7 +514,7 @@
 				       "prism2sta_getcardinfo() failed,"
 				       "result=%d\n", (int)result);
 				result =
-				    P80211ENUM_resultcode_implementation_failure;
+				  P80211ENUM_resultcode_implementation_failure;
 				hfa384x_drvr_stop(hw);
 				wlandev->msdstate = WLAN_MSD_HWPRESENT;
 				break;
@@ -525,7 +525,7 @@
 				       "prism2sta_globalsetup() failed,"
 				       "result=%d\n", (int)result);
 				result =
-				    P80211ENUM_resultcode_implementation_failure;
+				  P80211ENUM_resultcode_implementation_failure;
 				hfa384x_drvr_stop(hw);
 				wlandev->msdstate = WLAN_MSD_HWPRESENT;
 				break;
@@ -1178,8 +1178,8 @@
 			chinforesult->active =
 			    le16_to_cpu(inf->info.chinforesult.result[n].
 					active);
-			pr_debug
-			    ("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
+	pr_debug
+		("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
 			     channel + 1,
 			     chinforesult->
 			     active & HFA384x_CHINFORESULT_BSSACTIVE ? "signal"
@@ -1246,7 +1246,9 @@
  
 		netif_carrier_on(wlandev->netdev);
  
-		/* If we are joining a specific AP, set our state and reset retries */
+		/* If we are joining a specific AP, set our
+		 * state and reset retries
+		 */
 		if (hw->join_ap == 1)
 			hw->join_ap = 2;
 		hw->join_retries = 60;
@@ -1261,9 +1263,9 @@
 			/* Collect the BSSID, and set state to allow tx */
  
 			result = hfa384x_drvr_getconfig(hw,
-							HFA384x_RID_CURRENTBSSID,
-							wlandev->bssid,
-							WLAN_BSSID_LEN);
+						HFA384x_RID_CURRENTBSSID,
+						wlandev->bssid,
+						WLAN_BSSID_LEN);
 			if (result) {
 				pr_debug
 				    ("getconfig(0x%02x) failed, result = %d\n",
@@ -1286,8 +1288,8 @@
  
 			/* Collect the port status */
 			result = hfa384x_drvr_getconfig16(hw,
-							  HFA384x_RID_PORTSTATUS,
-							  &portstatus);
+							HFA384x_RID_PORTSTATUS,
+							&portstatus);
 			if (result) {
 				pr_debug
 				    ("getconfig(0x%02x) failed, result = %d\n",
@@ -1322,7 +1324,7 @@
 					       &joinreq,
 					       HFA384x_RID_JOINREQUEST_LEN);
 			printk(KERN_INFO
-			       "linkstatus=DISCONNECTED (re-submitting join)\n");
+			    "linkstatus=DISCONNECTED (re-submitting join)\n");
 		} else {
 			if (wlandev->netdev->type == ARPHRD_ETHER)
 				printk(KERN_INFO
@@ -1509,14 +1511,15 @@
 	rec.reason = le16_to_cpu(rec.reason);
  
 	/*
-	 ** Find the address in the list of authenticated stations.  If it wasn't
-	 ** found, then this address has not been previously authenticated and
-	 ** something weird has happened if this is anything other than an
-	 ** "authentication failed" message.  If the address was found, then
-	 ** set the "associated" flag for that station, based on whether the
-	 ** station is associating or losing its association.  Something weird
-	 ** has also happened if we find the address in the list of authenticated
-	 ** stations but we are getting an "authentication failed" message.
+	 ** Find the address in the list of authenticated stations.
+	 ** If it wasn't found, then this address has not been previously
+	 ** authenticated and something weird has happened if this is
+	 ** anything other than an "authentication failed" message.
+	 ** If the address was found, then set the "associated" flag for
+	 ** that station, based on whether the station is associating or
+	 ** losing its association.  Something weird has also happened
+	 ** if we find the address in the list of authenticated stations
+	 ** but we are getting an "authentication failed" message.
 	 */
  
 	for (i = 0; i < hw->authlist.cnt; i++)
@@ -1526,7 +1529,7 @@
 	if (i >= hw->authlist.cnt) {
 		if (rec.assocstatus != HFA384x_ASSOCSTATUS_AUTHFAIL)
 			printk(KERN_WARNING
-			       "assocstatus info frame received for non-authenticated station.\n");
+	"assocstatus info frame received for non-authenticated station.\n");
 	} else {
 		hw->authlist.assoc[i] =
 		    (rec.assocstatus == HFA384x_ASSOCSTATUS_STAASSOC ||
@@ -1534,7 +1537,7 @@
  
 		if (rec.assocstatus == HFA384x_ASSOCSTATUS_AUTHFAIL)
 			printk(KERN_WARNING
-			       "authfail assocstatus info frame received for authenticated station.\n");
+"authfail assocstatus info frame received for authenticated station.\n");
 	}
  
 	return;
@@ -1681,12 +1684,12 @@
 	}
  
 	/*
-	 ** If the authentication is okay, then add the MAC address to the list
-	 ** of authenticated stations.  Don't add the address if it is already in
-	 ** the list.  (802.11b does not seem to disallow a station from issuing
-	 ** an authentication request when the station is already authenticated.
-	 ** Does this sort of thing ever happen?  We might as well do the check
-	 ** just in case.)
+	 ** If the authentication is okay, then add the MAC address to the
+	 ** list of authenticated stations.  Don't add the address if it
+	 ** is already in the list. (802.11b does not seem to disallow
+	 ** a station from issuing an authentication request when the
+	 ** station is already authenticated. Does this sort of thing
+	 ** ever happen?  We might as well do the check just in case.)
 	 */
  
 	added = 0;
@@ -1931,7 +1934,7 @@
 *	the created wlandevice_t structure.
 *
 * Side effects:
-* 	also allocates the priv/hw structures.
+*	also allocates the priv/hw structures.
 *
 * Call context:
 *	process thread
@@ -1995,9 +1998,9 @@
  
 	/* It only makes sense to poll these in non-IBSS */
 	if (wlandev->macmode != WLAN_MACMODE_IBSS_STA) {
-		result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DBMCOMMSQUALITY,
-						&hw->qual,
-						HFA384x_RID_DBMCOMMSQUALITY_LEN);
+		result = hfa384x_drvr_getconfig(
+				hw, HFA384x_RID_DBMCOMMSQUALITY,
+				&hw->qual, HFA384x_RID_DBMCOMMSQUALITY_LEN);
  
 		if (result) {
 			printk(KERN_ERR "error fetching commsqual\n");
...	...	@@ -426,7 +426,7 @@
426	426	* msgp ptr to msg buffer
427	427	*
428	428	* Returns:
429		-* A p80211 message resultcode value.
	429	+* A p80211 message resultcode value.
430	430	*
431	431	* Side effects:
432	432	*
...	...	@@ -458,7 +458,7 @@
458	458	"hfa384x_drvr_start() failed,"
459	459	"result=%d\n", (int)result);
460	460	result =
461		- P80211ENUM_resultcode_implementation_failure;
	461	+ P80211ENUM_resultcode_implementation_failure;
462	462	wlandev->msdstate = WLAN_MSD_HWPRESENT;
463	463	break;
464	464	}
...	...	@@ -503,7 +503,7 @@
503	503	"hfa384x_drvr_start() failed,"
504	504	"result=%d\n", (int)result);
505	505	result =
506		- P80211ENUM_resultcode_implementation_failure;
	506	+ P80211ENUM_resultcode_implementation_failure;
507	507	wlandev->msdstate = WLAN_MSD_HWPRESENT;
508	508	break;
509	509	}
...	...	@@ -514,7 +514,7 @@
514	514	"prism2sta_getcardinfo() failed,"
515	515	"result=%d\n", (int)result);
516	516	result =
517		- P80211ENUM_resultcode_implementation_failure;
	517	+ P80211ENUM_resultcode_implementation_failure;
518	518	hfa384x_drvr_stop(hw);
519	519	wlandev->msdstate = WLAN_MSD_HWPRESENT;
520	520	break;
...	...	@@ -525,7 +525,7 @@
525	525	"prism2sta_globalsetup() failed,"
526	526	"result=%d\n", (int)result);
527	527	result =
528		- P80211ENUM_resultcode_implementation_failure;
	528	+ P80211ENUM_resultcode_implementation_failure;
529	529	hfa384x_drvr_stop(hw);
530	530	wlandev->msdstate = WLAN_MSD_HWPRESENT;
531	531	break;
...	...	@@ -1178,8 +1178,8 @@
1178	1178	chinforesult->active =
1179	1179	le16_to_cpu(inf->info.chinforesult.result[n].
1180	1180	active);
1181		- pr_debug
1182		- ("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
	1181	+ pr_debug
	1182	+ ("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
1183	1183	channel + 1,
1184	1184	chinforesult->
1185	1185	active & HFA384x_CHINFORESULT_BSSACTIVE ? "signal"
...	...	@@ -1246,7 +1246,9 @@
1246	1246
1247	1247	netif_carrier_on(wlandev->netdev);
1248	1248
1249		- /* If we are joining a specific AP, set our state and reset retries */
	1249	+ /* If we are joining a specific AP, set our
	1250	+ * state and reset retries
	1251	+ */
1250	1252	if (hw->join_ap == 1)
1251	1253	hw->join_ap = 2;
1252	1254	hw->join_retries = 60;
...	...	@@ -1261,9 +1263,9 @@
1261	1263	/* Collect the BSSID, and set state to allow tx */
1262	1264
1263	1265	result = hfa384x_drvr_getconfig(hw,
1264		- HFA384x_RID_CURRENTBSSID,
1265		- wlandev->bssid,
1266		- WLAN_BSSID_LEN);
	1266	+ HFA384x_RID_CURRENTBSSID,
	1267	+ wlandev->bssid,
	1268	+ WLAN_BSSID_LEN);
1267	1269	if (result) {
1268	1270	pr_debug
1269	1271	("getconfig(0x%02x) failed, result = %d\n",
...	...	@@ -1286,8 +1288,8 @@
1286	1288
1287	1289	/* Collect the port status */
1288	1290	result = hfa384x_drvr_getconfig16(hw,
1289		- HFA384x_RID_PORTSTATUS,
1290		- &portstatus);
	1291	+ HFA384x_RID_PORTSTATUS,
	1292	+ &portstatus);
1291	1293	if (result) {
1292	1294	pr_debug
1293	1295	("getconfig(0x%02x) failed, result = %d\n",
...	...	@@ -1322,7 +1324,7 @@
1322	1324	&joinreq,
1323	1325	HFA384x_RID_JOINREQUEST_LEN);
1324	1326	printk(KERN_INFO
1325		- "linkstatus=DISCONNECTED (re-submitting join)\n");
	1327	+ "linkstatus=DISCONNECTED (re-submitting join)\n");
1326	1328	} else {
1327	1329	if (wlandev->netdev->type == ARPHRD_ETHER)
1328	1330	printk(KERN_INFO
...	...	@@ -1509,14 +1511,15 @@
1509	1511	rec.reason = le16_to_cpu(rec.reason);
1510	1512
1511	1513	/*
1512		- ** Find the address in the list of authenticated stations. If it wasn't
1513		- ** found, then this address has not been previously authenticated and
1514		- ** something weird has happened if this is anything other than an
1515		- ** "authentication failed" message. If the address was found, then
1516		- ** set the "associated" flag for that station, based on whether the
1517		- ** station is associating or losing its association. Something weird
1518		- ** has also happened if we find the address in the list of authenticated
1519		- ** stations but we are getting an "authentication failed" message.
	1514	+ ** Find the address in the list of authenticated stations.
	1515	+ ** If it wasn't found, then this address has not been previously
	1516	+ ** authenticated and something weird has happened if this is
	1517	+ ** anything other than an "authentication failed" message.
	1518	+ ** If the address was found, then set the "associated" flag for
	1519	+ ** that station, based on whether the station is associating or
	1520	+ ** losing its association. Something weird has also happened
	1521	+ ** if we find the address in the list of authenticated stations
	1522	+ ** but we are getting an "authentication failed" message.
1520	1523	*/
1521	1524
1522	1525	for (i = 0; i < hw->authlist.cnt; i++)
...	...	@@ -1526,7 +1529,7 @@
1526	1529	if (i >= hw->authlist.cnt) {
1527	1530	if (rec.assocstatus != HFA384x_ASSOCSTATUS_AUTHFAIL)
1528	1531	printk(KERN_WARNING
1529		- "assocstatus info frame received for non-authenticated station.\n");
	1532	+ "assocstatus info frame received for non-authenticated station.\n");
1530	1533	} else {
1531	1534	hw->authlist.assoc[i] =
1532	1535	(rec.assocstatus == HFA384x_ASSOCSTATUS_STAASSOC \|\|
...	...	@@ -1534,7 +1537,7 @@
1534	1537
1535	1538	if (rec.assocstatus == HFA384x_ASSOCSTATUS_AUTHFAIL)
1536	1539	printk(KERN_WARNING
1537		- "authfail assocstatus info frame received for authenticated station.\n");
	1540	+"authfail assocstatus info frame received for authenticated station.\n");
1538	1541	}
1539	1542
1540	1543	return;
...	...	@@ -1681,12 +1684,12 @@
1681	1684	}
1682	1685
1683	1686	/*
1684		- ** If the authentication is okay, then add the MAC address to the list
1685		- ** of authenticated stations. Don't add the address if it is already in
1686		- ** the list. (802.11b does not seem to disallow a station from issuing
1687		- ** an authentication request when the station is already authenticated.
1688		- ** Does this sort of thing ever happen? We might as well do the check
1689		- ** just in case.)
	1687	+ ** If the authentication is okay, then add the MAC address to the
	1688	+ ** list of authenticated stations. Don't add the address if it
	1689	+ ** is already in the list. (802.11b does not seem to disallow
	1690	+ ** a station from issuing an authentication request when the
	1691	+ ** station is already authenticated. Does this sort of thing
	1692	+ ** ever happen? We might as well do the check just in case.)
1690	1693	*/
1691	1694
1692	1695	added = 0;
...	...	@@ -1931,7 +1934,7 @@
1931	1934	* the created wlandevice_t structure.
1932	1935	*
1933	1936	* Side effects:
1934		-* also allocates the priv/hw structures.
	1937	+* also allocates the priv/hw structures.
1935	1938	*
1936	1939	* Call context:
1937	1940	* process thread
...	...	@@ -1995,9 +1998,9 @@
1995	1998
1996	1999	/* It only makes sense to poll these in non-IBSS */
1997	2000	if (wlandev->macmode != WLAN_MACMODE_IBSS_STA) {
1998		- result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DBMCOMMSQUALITY,
1999		- &hw->qual,
2000		- HFA384x_RID_DBMCOMMSQUALITY_LEN);
	2001	+ result = hfa384x_drvr_getconfig(
	2002	+ hw, HFA384x_RID_DBMCOMMSQUALITY,
	2003	+ &hw->qual, HFA384x_RID_DBMCOMMSQUALITY_LEN);
2001	2004
2002	2005	if (result) {
2003	2006	printk(KERN_ERR "error fetching commsqual\n");