Commit 69dc5d9d authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville

iwlwifi: iwl_priv - clean up in types of members

This patch fix types of is_open and iw_mode members
of iwl_priv sturct
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0472f887
...@@ -830,7 +830,7 @@ struct iwl3945_priv { ...@@ -830,7 +830,7 @@ struct iwl3945_priv {
struct iwl3945_station_entry stations[IWL_STATION_COUNT]; struct iwl3945_station_entry stations[IWL_STATION_COUNT];
/* Indication if ieee80211_ops->open has been called */ /* Indication if ieee80211_ops->open has been called */
int is_open; u8 is_open;
u8 mac80211_registered; u8 mac80211_registered;
...@@ -851,7 +851,7 @@ struct iwl3945_priv { ...@@ -851,7 +851,7 @@ struct iwl3945_priv {
/* eeprom */ /* eeprom */
struct iwl3945_eeprom eeprom; struct iwl3945_eeprom eeprom;
int iw_mode; enum ieee80211_if_types iw_mode;
struct sk_buff *ibss_beacon; struct sk_buff *ibss_beacon;
......
...@@ -1129,7 +1129,7 @@ struct iwl_priv { ...@@ -1129,7 +1129,7 @@ struct iwl_priv {
struct iwl4965_station_entry stations[IWL_STATION_COUNT]; struct iwl4965_station_entry stations[IWL_STATION_COUNT];
/* Indication if ieee80211_ops->open has been called */ /* Indication if ieee80211_ops->open has been called */
int is_open; u8 is_open;
u8 mac80211_registered; u8 mac80211_registered;
...@@ -1150,7 +1150,7 @@ struct iwl_priv { ...@@ -1150,7 +1150,7 @@ struct iwl_priv {
/* eeprom */ /* eeprom */
struct iwl4965_eeprom eeprom; struct iwl4965_eeprom eeprom;
int iw_mode; enum ieee80211_if_types iw_mode;
struct sk_buff *ibss_beacon; struct sk_buff *ibss_beacon;
......
...@@ -2058,6 +2058,8 @@ int iwl3945_is_network_packet(struct iwl3945_priv *priv, struct ieee80211_hdr *h ...@@ -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); return !compare_ether_addr(header->addr2, priv->bssid);
/* packets to our adapter go through */ /* packets to our adapter go through */
return !compare_ether_addr(header->addr1, priv->mac_addr); return !compare_ether_addr(header->addr1, priv->mac_addr);
default:
return 1;
} }
return 1; return 1;
...@@ -2302,6 +2304,9 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv) ...@@ -2302,6 +2304,9 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv)
priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK | priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |
RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK; RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
break; break;
default:
IWL_ERROR("Unsupported interface type %d\n", priv->iw_mode);
break;
} }
#if 0 #if 0
......
...@@ -1793,6 +1793,8 @@ int iwl4965_is_network_packet(struct iwl_priv *priv, struct ieee80211_hdr *heade ...@@ -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); return !compare_ether_addr(header->addr2, priv->bssid);
/* packets to our adapter go through */ /* packets to our adapter go through */
return !compare_ether_addr(header->addr1, priv->mac_addr); return !compare_ether_addr(header->addr1, priv->mac_addr);
default:
break;
} }
return 1; return 1;
...@@ -2054,6 +2056,9 @@ static void iwl4965_connection_init_rx_config(struct iwl_priv *priv) ...@@ -2054,6 +2056,9 @@ static void iwl4965_connection_init_rx_config(struct iwl_priv *priv)
priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK | priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |
RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK; RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
break; break;
default:
IWL_ERROR("Unsupported interface type %d\n", priv->iw_mode);
break;
} }
#if 0 #if 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment