--- a/acx_mac80211.h
+++ b/acx_mac80211.h
@@ -36,7 +36,7 @@ struct acx_interface {                
         /* Current BSSID (if any). */       
         u8 *bssid;
 
-        /* Interface type. (IEEE80211_IF_TYPE_XXX) */
+        /* Interface type. (NL80211_IFTYPE_XXX) */
         int type; 
         /* Counter of active monitor interfaces. */
         int monitor;
--- a/common.c
+++ b/common.c
@@ -4111,28 +4111,28 @@ static void acx_s_select_opmode(acx_devi
 
 	if (adev->interface.operating) {
 		switch (adev->interface.type) {
-			case IEEE80211_IF_TYPE_AP:
+			case NL80211_IFTYPE_AP:
 				if (adev->mode != ACX_MODE_3_AP)
 				{
 					adev->mode = ACX_MODE_3_AP;
 					changed = 1;
 				}
 				break;
-			case IEEE80211_IF_TYPE_IBSS:
+			case NL80211_IFTYPE_ADHOC:
 				if (adev->mode != ACX_MODE_0_ADHOC)
 				{
 					adev->mode = ACX_MODE_0_ADHOC;
 					changed = 1;
 				}
 				break;
-			case IEEE80211_IF_TYPE_STA:
+			case NL80211_IFTYPE_STATION:
 				if (adev->mode != ACX_MODE_2_STA)
 				{
 					adev->mode = ACX_MODE_2_STA;
 					changed = 1;
 				}
 				break;
-			case IEEE80211_IF_TYPE_WDS:
+			case NL80211_IFTYPE_WDS:
 			default:
 				if (adev->mode != ACX_MODE_OFF)
 				{
@@ -4142,7 +4142,7 @@ static void acx_s_select_opmode(acx_devi
 			break;
 		}
 	} else {
-		if (adev->interface.type == IEEE80211_IF_TYPE_MNTR)
+		if (adev->interface.type == NL80211_IFTYPE_MONITOR)
 		{
 			if (adev->mode != ACX_MODE_MONITOR)
 			{
@@ -4186,7 +4186,7 @@ int acx_add_interface(struct ieee80211_h
 	FN_ENTER;
 	acx_lock(adev, flags);
 
-	if (conf->type == IEEE80211_IF_TYPE_MNTR) {
+	if (conf->type == NL80211_IFTYPE_MONITOR) {
 		adev->interface.monitor++;
 	} else {
 		if (adev->interface.operating)
@@ -4232,7 +4232,7 @@ void acx_remove_interface(struct ieee802
 	FN_ENTER;
 
 	acx_sem_lock(adev);
-	if (conf->type == IEEE80211_IF_TYPE_MNTR) {
+	if (conf->type == NL80211_IFTYPE_MONITOR) {
 		adev->interface.monitor--;
 //                assert(bcm->interface.monitor >= 0);
 	} else {
@@ -4386,7 +4386,7 @@ extern int acx_config_interface(struct i
 
 	acx_lock(adev, flags);
 
-	if ((vif->type != IEEE80211_IF_TYPE_MNTR)
+	if ((vif->type != NL80211_IFTYPE_MONITOR)
 	    && (adev->vif == vif)) {
 		if (conf->bssid)
 		{
@@ -4394,7 +4394,7 @@ extern int acx_config_interface(struct i
  	             	MAC_COPY(adev->bssid,conf->bssid);
 		}
 	}
-	if ((vif->type == IEEE80211_IF_TYPE_AP)
+	if ((vif->type == NL80211_IFTYPE_AP)
 	    && (adev->vif == vif)) {
 		if ((conf->ssid_len > 0) && conf->ssid)
 		{