svn commit: r197654 - head/sys/dev/if_ndis

[Coleman Kane]

Author: cokane
Date: Thu Oct  1 02:43:51 2009
New Revision: 197654
URL: http://svn.freebsd.org/changeset/base/197654

Log:
  style(9) fixes (always compare pointers to NULL)
  
  Also, the previous commit to sys/dev/if_ndis/if_ndis.c also included the
  removal of a call to ndis_setstate_80211 that is no longer needed.
  
  Submitted by:	sam
  MFC after:	3 days

Modified:
  head/sys/dev/if_ndis/if_ndis.c

Modified: head/sys/dev/if_ndis/if_ndis.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis.c	Thu Oct  1 02:08:42 2009	(r197653)
+++ head/sys/dev/if_ndis/if_ndis.c	Thu Oct  1 02:43:51 2009	(r197654)
@@ -1534,7 +1534,7 @@ ndis_inputtask(dobj, arg)
 		if (m == NULL)
 			break;
 		KeReleaseSpinLock(&sc->ndis_rxlock, irql);
-		if (sc->ndis_80211 && vap)
+		if ((sc->ndis_80211 != NULL) && (vap != NULL))
 			vap->iv_deliver_data(vap, vap->iv_bss, m);
 		else
 			(*ifp->if_input)(ifp, m);
@@ -1746,7 +1746,7 @@ ndis_ticktask(d, xsc)
 	    sc->ndis_sts == NDIS_STATUS_MEDIA_CONNECT) {
 		sc->ndis_link = 1;
 		NDIS_UNLOCK(sc);
-		if (sc->ndis_80211 && vap) {
+		if ((sc->ndis_80211 != NULL) && (vap != NULL)) {
 			ndis_getstate_80211(sc);
 			ieee80211_new_state(vap, IEEE80211_S_RUN, -1);
 		}
@@ -1758,7 +1758,7 @@ ndis_ticktask(d, xsc)
 	    sc->ndis_sts == NDIS_STATUS_MEDIA_DISCONNECT) {
 		sc->ndis_link = 0;
 		NDIS_UNLOCK(sc);
-		if (sc->ndis_80211 && vap)
+		if ((sc->ndis_80211 != NULL) && (vap != NULL))
 			ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
 		NDIS_LOCK(sc);
 		if_link_state_change(sc->ifp, LINK_STATE_DOWN);