---

yaml
---
r: 267442
b: refs/heads/master
c: 7e0395e
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54d7879c4ed0b6cbed8f992efa67c954915bb2b6
+refs/heads/master: 7e0395ec28aec4ea9d62fca3281c413b8f42dcd3

trunk/drivers/staging/brcm80211/brcmutil/utils.c

@@ -489,8 +489,8 @@ static const u8 crc8_table[256] = {
 };
 
 u8 brcmu_crc8(u8 *pdata,	/* pointer to array of data to process */
-			 uint nbytes,	/* number of input data bytes to process */
-			 u8 crc	/* either CRC8_INIT_VALUE or previous return value */
+	      uint nbytes,	/* number of input data bytes to process */
+	      u8 crc	/* either CRC8_INIT_VALUE or previous return value */
 	) {
 	/* loop over the buffer data */
 	while (nbytes-- > 0)
@@ -586,7 +586,10 @@ brcmu_format_flags(const struct brcmu_bit_desc *bd, u32 flags, char *buf,
 }
 EXPORT_SYMBOL(brcmu_format_flags);
 
-/* print bytes formatted as hex to a string. return the resulting string length */
+/*
+ * print bytes formatted as hex to a string. return the resulting
+ * string length
+ */
 int brcmu_format_hex(char *str, const void *bytes, int len)
 {
 	int i;

trunk/drivers/staging/brcm80211/brcmutil/wifi.c

@@ -43,9 +43,9 @@ bool brcmu_chspec_malformed(u16 chanspec)
 EXPORT_SYMBOL(brcmu_chspec_malformed);
 
 /*
- * This function returns the channel number that control traffic is being sent on, for legacy
- * channels this is just the channel number, for 40MHZ channels it is the upper or lowre 20MHZ
- * sideband depending on the chanspec selected
+ * This function returns the channel number that control traffic is being sent
+ * on, for legacy channels this is just the channel number, for 40MHZ channels
+ * it is the upper or lower 20MHZ sideband depending on the chanspec selected.
  */
 u8 brcmu_chspec_ctlchan(u16 chspec)
 {
@@ -55,15 +55,22 @@ u8 brcmu_chspec_ctlchan(u16 chspec)
 	if (CHSPEC_CTL_SB(chspec) == WL_CHANSPEC_CTL_SB_NONE) {
 		return CHSPEC_CHANNEL(chspec);
 	} else {
-		/* we only support 40MHZ with sidebands */
-		/* chanspec channel holds the centre frequency, use that and the
-		 * side band information to reconstruct the control channel number
+		/*
+		 * we only support 40MHZ with sidebands. chanspec channel holds
+		 * the centre frequency, use that and the side band information
+		 * to reconstruct the control channel number
 		 */
 		if (CHSPEC_CTL_SB(chspec) == WL_CHANSPEC_CTL_SB_UPPER)
-			/* control chan is the upper 20 MHZ SB of the 40MHZ channel */
+			/*
+			 * control chan is the upper 20 MHZ SB of the
+			 * 40MHZ channel
+			 */
 			ctl_chan = UPPER_20_SB(CHSPEC_CHANNEL(chspec));
 		else
-			/* control chan is the lower 20 MHZ SB of the 40MHZ channel */
+			/*
+			 * control chan is the lower 20 MHZ SB of the
+			 * 40MHZ channel
+			 */
 			ctl_chan = LOWER_20_SB(CHSPEC_CHANNEL(chspec));
 	}