lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some compiler issues if CONFIG_IPW2200_QOS is enabled.

Browse Source 
Updated a copyright date.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
This commit is contained in:
James Ketrenos
2005-08-03 20:33:14 -05:00
parent 227d2dc1f1
commit 2b184d5b54
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/ipw2200.c
View File

@@ -34,7 +34,7 @@
#define IPW2200_VERSION "1.0.5" #define IPW2200_VERSION "1.0.5"
#define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2200/2915 Network Driver" #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2200/2915 Network Driver"
#define DRV_COPYRIGHT "Copyright(c) 2003-2004 Intel Corporation" #define DRV_COPYRIGHT "Copyright(c) 2003-2005 Intel Corporation"
#define DRV_VERSION IPW2200_VERSION #define DRV_VERSION IPW2200_VERSION
#define ETH_P_80211_STATS (ETH_P_80211_RAW + 1) #define ETH_P_80211_STATS (ETH_P_80211_RAW + 1)
@@ -4077,7 +4077,7 @@ static inline void ipw_rx_notification(struct ipw_priv *priv,
== IEEE80211_STYPE_ASSOC_RESP)) { == IEEE80211_STYPE_ASSOC_RESP)) {
if ((sizeof if ((sizeof
(struct (struct
ieee80211_assoc_response_frame) ieee80211_assoc_response)
<= notif->size) <= notif->size)
&& (notif->size <= 2314)) { && (notif->size <= 2314)) {
struct struct
@@ -4095,7 +4095,7 @@ static inline void ipw_rx_notification(struct ipw_priv *priv,
ieee80211_rx_mgt(priv-> ieee80211_rx_mgt(priv->
ieee, ieee,
(struct (struct
ieee80211_hdr ieee80211_hdr_4addr
*) *)
&notif->u.raw, &stats); &notif->u.raw, &stats);
} }
@@ -7154,9 +7154,8 @@ static void ipw_bg_qos_activate(void *data)
/* /*
* Handler for probe responce and beacon frame * Handler for probe responce and beacon frame
*/ */
static int ipw_handle_management_frame(struct net_device *dev, static int ipw_handle_management(struct net_device *dev,
struct ieee80211_network *network, struct ieee80211_network *network, u16 type)
u16 type)
{ {
struct ipw_priv *priv = ieee80211_priv(dev); struct ipw_priv *priv = ieee80211_priv(dev);
int active_network; int active_network;
@@ -10730,7 +10729,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
priv->ieee->is_queue_full = ipw_net_is_queue_full; priv->ieee->is_queue_full = ipw_net_is_queue_full;
#ifdef CONFIG_IPW_QOS #ifdef CONFIG_IPW_QOS
priv->ieee->handle_management_frame = ipw_handle_management_frame; priv->ieee->handle_management = ipw_handle_management;
#endif /* CONFIG_IPW_QOS */ #endif /* CONFIG_IPW_QOS */
priv->ieee->perfect_rssi = -20; priv->ieee->perfect_rssi = -20;