diff options
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 3b3a4a077c0e..073721f10577 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | #define IPW2200_VERSION "1.0.5" | 35 | #define IPW2200_VERSION "1.0.5" |
36 | #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2200/2915 Network Driver" | 36 | #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2200/2915 Network Driver" |
37 | #define DRV_COPYRIGHT "Copyright(c) 2003-2004 Intel Corporation" | 37 | #define DRV_COPYRIGHT "Copyright(c) 2003-2005 Intel Corporation" |
38 | #define DRV_VERSION IPW2200_VERSION | 38 | #define DRV_VERSION IPW2200_VERSION |
39 | 39 | ||
40 | #define ETH_P_80211_STATS (ETH_P_80211_RAW + 1) | 40 | #define ETH_P_80211_STATS (ETH_P_80211_RAW + 1) |
@@ -4077,7 +4077,7 @@ static inline void ipw_rx_notification(struct ipw_priv *priv, | |||
4077 | == IEEE80211_STYPE_ASSOC_RESP)) { | 4077 | == IEEE80211_STYPE_ASSOC_RESP)) { |
4078 | if ((sizeof | 4078 | if ((sizeof |
4079 | (struct | 4079 | (struct |
4080 | ieee80211_assoc_response_frame) | 4080 | ieee80211_assoc_response) |
4081 | <= notif->size) | 4081 | <= notif->size) |
4082 | && (notif->size <= 2314)) { | 4082 | && (notif->size <= 2314)) { |
4083 | struct | 4083 | struct |
@@ -4095,7 +4095,7 @@ static inline void ipw_rx_notification(struct ipw_priv *priv, | |||
4095 | ieee80211_rx_mgt(priv-> | 4095 | ieee80211_rx_mgt(priv-> |
4096 | ieee, | 4096 | ieee, |
4097 | (struct | 4097 | (struct |
4098 | ieee80211_hdr | 4098 | ieee80211_hdr_4addr |
4099 | *) | 4099 | *) |
4100 | ¬if->u.raw, &stats); | 4100 | ¬if->u.raw, &stats); |
4101 | } | 4101 | } |
@@ -7154,9 +7154,8 @@ static void ipw_bg_qos_activate(void *data) | |||
7154 | /* | 7154 | /* |
7155 | * Handler for probe responce and beacon frame | 7155 | * Handler for probe responce and beacon frame |
7156 | */ | 7156 | */ |
7157 | static int ipw_handle_management_frame(struct net_device *dev, | 7157 | static int ipw_handle_management(struct net_device *dev, |
7158 | struct ieee80211_network *network, | 7158 | struct ieee80211_network *network, u16 type) |
7159 | u16 type) | ||
7160 | { | 7159 | { |
7161 | struct ipw_priv *priv = ieee80211_priv(dev); | 7160 | struct ipw_priv *priv = ieee80211_priv(dev); |
7162 | int active_network; | 7161 | int active_network; |
@@ -10730,7 +10729,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
10730 | priv->ieee->is_queue_full = ipw_net_is_queue_full; | 10729 | priv->ieee->is_queue_full = ipw_net_is_queue_full; |
10731 | 10730 | ||
10732 | #ifdef CONFIG_IPW_QOS | 10731 | #ifdef CONFIG_IPW_QOS |
10733 | priv->ieee->handle_management_frame = ipw_handle_management_frame; | 10732 | priv->ieee->handle_management = ipw_handle_management; |
10734 | #endif /* CONFIG_IPW_QOS */ | 10733 | #endif /* CONFIG_IPW_QOS */ |
10735 | 10734 | ||
10736 | priv->ieee->perfect_rssi = -20; | 10735 | priv->ieee->perfect_rssi = -20; |