CVS: The file 'linux/drivers/char/bluetooth/hci_vendor.c' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci_vendor.c    1.28            1.29=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Corrected retun value from bt_hw_vendor() for USB and noinit.


The diff of the modified file(s):

--- hci_vendor.c	2001/04/25 17:42:10	1.28
+++ hci_vendor.c	2001/04/26 08:32:39	1.29
@@ -742,31 +742,30 @@
 	case CSR_CH_ID_HQ:
 		switch (cmd->var_id)=20
 		{
-=09=09=09
 		case CSR_VARID_RSSI_REPORT:
 		{
 			csr_rssi_rep *rep;
 			rep =3D (csr_rssi_rep *)cmd->payload;
 			DSYS("RSSI report, rssi : %d\n", rep->rssi);
-		}
 		break;
+		}
=20=09=09
 		case CSR_VARID_PACKET_STAT_REPORT:
 		{
 			csr_packstat_rep *rep;
 			rep =3D (struct csr_packstat_rep*)cmd->payload;
 			DSYS("Packet status report : n_pkts %d, n_good %d, n_corr %d, rssi %d, =
rssi_valid %d\n", rep->n_pkts, rep->n_good, rep->n_corr, rep->rssi, rep->rs=
si_valid);
-		}
 		break;
+		}
=20=09=09
 		case CSR_VARID_BITERR_REPORT:
 		{
 			csr_biterr_rep *rep;
 			rep =3D (struct csr_biterr_rep*)cmd->payload;
 			DSYS("Biterror report : index %d, val_last %d, val_tot %d\n", rep->inde=
x, rep->val_last, rep->val_tot);
+			break;
 		}
 		}
-=09=09
 		break;
=20=09=09
 	default:
@@ -905,10 +904,12 @@
 char*
 bt_hw_vendor(void)
 {
-#if defined(CONFIG_BLUETOOTH_USB)
+#if defined(CONFIG_BLUETOOTH_USBMODULE)
 	return "USB";
 #elif defined(CONFIG_BLUETOOTH_GENERIC)
 	return "Generic";
+#elif defined(CONFIG_BLUETOOTH_NOINIT)
+	return "No Init";
 #else
 	return "Unknown";
 #endif