4 files changed, 14 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index e0655b988f44..d7ccf13b875d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -830,7 +830,7 @@ struct iwl3945_priv {
         struct iwl3945_station_entry stations[IWL_STATION_COUNT];
 
         /* Indication if ieee80211_ops->open has been called */
-        int is_open;
+        u8 is_open;
 
         u8 mac80211_registered;
 
@@ -851,7 +851,7 @@ struct iwl3945_priv {
         /* eeprom */
         struct iwl3945_eeprom eeprom;
 
-        int iw_mode;
+        enum ieee80211_if_types iw_mode;
 
         struct sk_buff *ibss_beacon;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index 98644d9c7803..069e591981b2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -1129,7 +1129,7 @@ struct iwl_priv {
         struct iwl4965_station_entry stations[IWL_STATION_COUNT];
 
         /* Indication if ieee80211_ops->open has been called */
-        int is_open;
+        u8 is_open;
 
         u8 mac80211_registered;
 
@@ -1150,7 +1150,7 @@ struct iwl_priv {
         /* eeprom */
         struct iwl4965_eeprom eeprom;
 
-        int iw_mode;
+        enum ieee80211_if_types iw_mode;
 
         struct sk_buff *ibss_beacon;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 470a9abf12c3..ce8a31103eee 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2058,6 +2058,8 @@ int iwl3945_is_network_packet(struct iwl3945_priv *priv, struct ieee80211_hdr *h
                         return !compare_ether_addr(header->addr2, priv->bssid);
                 /* packets to our adapter go through */
                 return !compare_ether_addr(header->addr1, priv->mac_addr);
+        default:
+                return 1;
         }
 
         return 1;
@@ -2302,6 +2304,9 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv)
                 priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |
                     RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
                 break;
+        default:
+                IWL_ERROR("Unsupported interface type %d\n", priv->iw_mode);
+                break;
         }
 
 #if 0
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 9e49e8ce3348..e487432ef56e 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -1793,6 +1793,8 @@ int iwl4965_is_network_packet(struct iwl_priv *priv, struct ieee80211_hdr *heade
                         return !compare_ether_addr(header->addr2, priv->bssid);
                 /* packets to our adapter go through */
                 return !compare_ether_addr(header->addr1, priv->mac_addr);
+        default:
+                break;
         }
 
         return 1;
@@ -2054,6 +2056,9 @@ static void iwl4965_connection_init_rx_config(struct iwl_priv *priv)
                 priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |
                     RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
                 break;
+        default:
+                IWL_ERROR("Unsupported interface type %d\n", priv->iw_mode);
+                break;
         }
 
 #if 0