svn commit: r195562 - in head/sys/dev: ipw iwi iwn wpi

Rui Paulo rpaulo at FreeBSD.org
Fri Jul 10 15:28:35 UTC 2009


Author: rpaulo
Date: Fri Jul 10 15:28:33 2009
New Revision: 195562
URL: http://svn.freebsd.org/changeset/base/195562

Log:
  For ic_opmode switch cases, provide a default label with a printf saying
  this opmode is not supported.
  
  Approved by:	re (kib)

Modified:
  head/sys/dev/ipw/if_ipw.c
  head/sys/dev/iwi/if_iwi.c
  head/sys/dev/iwn/if_iwn.c
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/ipw/if_ipw.c
==============================================================================
--- head/sys/dev/ipw/if_ipw.c	Fri Jul 10 15:26:33 2009	(r195561)
+++ head/sys/dev/ipw/if_ipw.c	Fri Jul 10 15:28:33 2009	(r195562)
@@ -2462,6 +2462,9 @@ ipw_config(struct ipw_softc *sc)
 	case IEEE80211_M_MONITOR:
 		data = htole32(IPW_MODE_MONITOR);
 		break;
+	default:
+		device_printf(sc->sc_dev, "unknown opmode %d\n", ic->ic_opmode);
+		return EINVAL;
 	}
 	DPRINTF(("Setting mode to %u\n", le32toh(data)));
 	error = ipw_cmd(sc, IPW_CMD_SET_MODE, &data, sizeof data);

Modified: head/sys/dev/iwi/if_iwi.c
==============================================================================
--- head/sys/dev/iwi/if_iwi.c	Fri Jul 10 15:26:33 2009	(r195561)
+++ head/sys/dev/iwi/if_iwi.c	Fri Jul 10 15:28:33 2009	(r195562)
@@ -2208,7 +2208,8 @@ iwi_get_firmware(struct iwi_softc *sc, e
 			  &sc->fw_uc, "iwi_ucode_monitor");
 		break;
 	default:
-		break;
+		device_printf(sc->sc_dev, "unknown opmode %d\n", opmode);
+		return EINVAL;
 	}
 	fp = sc->fw_fw.fp;
 	if (fp == NULL) {

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Fri Jul 10 15:26:33 2009	(r195561)
+++ head/sys/dev/iwn/if_iwn.c	Fri Jul 10 15:28:33 2009	(r195562)
@@ -3916,7 +3916,8 @@ iwn_config(struct iwn_softc *sc)
 		    IWN_FILTER_CTL | IWN_FILTER_PROMISC);
 		break;
 	default:
-		break;
+		device_printf(sc->sc_dev, "unknown opmode %d\n", ic->ic_opmode);
+		return EINVAL;
 	}
 	sc->config.cck_mask  = 0x0f;	/* not yet negotiated */
 	sc->config.ofdm_mask = 0xff;	/* not yet negotiated */

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Fri Jul 10 15:26:33 2009	(r195561)
+++ head/sys/dev/wpi/if_wpi.c	Fri Jul 10 15:28:33 2009	(r195562)
@@ -2818,6 +2818,9 @@ wpi_config(struct wpi_softc *sc)
 		sc->config.filter |= htole32(WPI_FILTER_MULTICAST |
 			WPI_FILTER_CTL | WPI_FILTER_PROMISC);
 		break;
+	default:
+		device_printf(sc->sc_dev, "unknown opmode %d\n", ic->ic_opmode);
+		return EINVAL;
 	}
 	sc->config.cck_mask  = 0x0f;	/* not yet negotiated */
 	sc->config.ofdm_mask = 0xff;	/* not yet negotiated */


More information about the svn-src-all mailing list