Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 193754
b: refs/heads/master
c: 27ae60f
h: refs/heads/master
v: v3
  • Loading branch information
Pavel Roskin authored and John W. Linville committed Mar 15, 2010
1 parent c7c2ceb commit 41e12b7
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 484b4dd582867c6cfec3a1feb128d60af21c4978
refs/heads/master: 27ae60f8f7aac221b428422eecafddaa7aff9549
10 changes: 5 additions & 5 deletions trunk/drivers/net/wireless/ipw2x00/ipw2100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6102,7 +6102,7 @@ static const struct net_device_ops ipw2100_netdev_ops = {
.ndo_validate_addr = eth_validate_addr,
};

/* Look into using netdev destructor to shutdown ieee80211? */
/* Look into using netdev destructor to shutdown libipw? */

static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
void __iomem * base_addr,
Expand All @@ -6112,7 +6112,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
struct ipw2100_priv *priv;
struct net_device *dev;

dev = alloc_ieee80211(sizeof(struct ipw2100_priv), 0);
dev = alloc_libipw(sizeof(struct ipw2100_priv), 0);
if (!dev)
return NULL;
priv = libipw_priv(dev);
Expand Down Expand Up @@ -6425,7 +6425,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
sysfs_remove_group(&pci_dev->dev.kobj,
&ipw2100_attribute_group);

free_ieee80211(dev, 0);
free_libipw(dev, 0);
pci_set_drvdata(pci_dev, NULL);
}

Expand Down Expand Up @@ -6483,10 +6483,10 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
if (dev->base_addr)
iounmap((void __iomem *)dev->base_addr);

/* wiphy_unregister needs to be here, before free_ieee80211 */
/* wiphy_unregister needs to be here, before free_libipw */
wiphy_unregister(priv->ieee->wdev.wiphy);
kfree(priv->ieee->bg_band.channels);
free_ieee80211(dev, 0);
free_libipw(dev, 0);
}

pci_release_regions(pci_dev);
Expand Down
18 changes: 9 additions & 9 deletions trunk/drivers/net/wireless/ipw2x00/ipw2200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11651,7 +11651,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)
if (priv->prom_net_dev)
return -EPERM;

priv->prom_net_dev = alloc_ieee80211(sizeof(struct ipw_prom_priv), 1);
priv->prom_net_dev = alloc_libipw(sizeof(struct ipw_prom_priv), 1);
if (priv->prom_net_dev == NULL)
return -ENOMEM;

Expand All @@ -11670,7 +11670,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)

rc = register_netdev(priv->prom_net_dev);
if (rc) {
free_ieee80211(priv->prom_net_dev, 1);
free_libipw(priv->prom_net_dev, 1);
priv->prom_net_dev = NULL;
return rc;
}
Expand All @@ -11684,7 +11684,7 @@ static void ipw_prom_free(struct ipw_priv *priv)
return;

unregister_netdev(priv->prom_net_dev);
free_ieee80211(priv->prom_net_dev, 1);
free_libipw(priv->prom_net_dev, 1);

priv->prom_net_dev = NULL;
}
Expand Down Expand Up @@ -11712,7 +11712,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
struct ipw_priv *priv;
int i;

net_dev = alloc_ieee80211(sizeof(struct ipw_priv), 0);
net_dev = alloc_libipw(sizeof(struct ipw_priv), 0);
if (net_dev == NULL) {
err = -ENOMEM;
goto out;
Expand All @@ -11732,7 +11732,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
mutex_init(&priv->mutex);
if (pci_enable_device(pdev)) {
err = -ENODEV;
goto out_free_ieee80211;
goto out_free_libipw;
}

pci_set_master(pdev);
Expand Down Expand Up @@ -11859,8 +11859,8 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
out_pci_disable_device:
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
out_free_ieee80211:
free_ieee80211(priv->net_dev, 0);
out_free_libipw:
free_libipw(priv->net_dev, 0);
out:
return err;
}
Expand Down Expand Up @@ -11927,11 +11927,11 @@ static void __devexit ipw_pci_remove(struct pci_dev *pdev)
pci_release_regions(pdev);
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
/* wiphy_unregister needs to be here, before free_ieee80211 */
/* wiphy_unregister needs to be here, before free_libipw */
wiphy_unregister(priv->ieee->wdev.wiphy);
kfree(priv->ieee->a_band.channels);
kfree(priv->ieee->bg_band.channels);
free_ieee80211(priv->net_dev, 0);
free_libipw(priv->net_dev, 0);
free_firmware();
}

Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/net/wireless/ipw2x00/libipw.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
extern u32 libipw_debug_level;
#define LIBIPW_DEBUG(level, fmt, args...) \
do { if (libipw_debug_level & (level)) \
printk(KERN_DEBUG "ieee80211: %c %s " fmt, \
printk(KERN_DEBUG "libipw: %c %s " fmt, \
in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
static inline bool libipw_ratelimit_debug(u32 level)
{
Expand Down Expand Up @@ -116,8 +116,8 @@ static inline bool libipw_ratelimit_debug(u32 level)
#define LIBIPW_DL_RX (1<<9)
#define LIBIPW_DL_QOS (1<<31)

#define LIBIPW_ERROR(f, a...) printk(KERN_ERR "ieee80211: " f, ## a)
#define LIBIPW_WARNING(f, a...) printk(KERN_WARNING "ieee80211: " f, ## a)
#define LIBIPW_ERROR(f, a...) printk(KERN_ERR "libipw: " f, ## a)
#define LIBIPW_WARNING(f, a...) printk(KERN_WARNING "libipw: " f, ## a)
#define LIBIPW_DEBUG_INFO(f, a...) LIBIPW_DEBUG(LIBIPW_DL_INFO, f, ## a)

#define LIBIPW_DEBUG_WX(f, a...) LIBIPW_DEBUG(LIBIPW_DL_WX, f, ## a)
Expand Down Expand Up @@ -905,7 +905,7 @@ struct libipw_device {
struct libipw_reassoc_request * req);

/* This must be the last item so that it points to the data
* allocated beyond this structure by alloc_ieee80211 */
* allocated beyond this structure by alloc_libipw */
u8 priv[0];
};

Expand Down Expand Up @@ -1017,9 +1017,9 @@ static inline int libipw_is_cck_rate(u8 rate)
return 0;
}

/* ieee80211.c */
extern void free_ieee80211(struct net_device *dev, int monitor);
extern struct net_device *alloc_ieee80211(int sizeof_priv, int monitor);
/* libipw.c */
extern void free_libipw(struct net_device *dev, int monitor);
extern struct net_device *alloc_libipw(int sizeof_priv, int monitor);
extern int libipw_change_mtu(struct net_device *dev, int new_mtu);

extern void libipw_networks_age(struct libipw_device *ieee,
Expand Down
13 changes: 6 additions & 7 deletions trunk/drivers/net/wireless/ipw2x00/libipw_module.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#include "libipw.h"

#define DRV_DESCRIPTION "802.11 data/management/control stack"
#define DRV_NAME "ieee80211"
#define DRV_NAME "libipw"
#define DRV_VERSION LIBIPW_VERSION
#define DRV_COPYRIGHT "Copyright (C) 2004-2005 Intel Corporation <jketreno@linux.intel.com>"

Expand Down Expand Up @@ -143,7 +143,7 @@ int libipw_change_mtu(struct net_device *dev, int new_mtu)
}
EXPORT_SYMBOL(libipw_change_mtu);

struct net_device *alloc_ieee80211(int sizeof_priv, int monitor)
struct net_device *alloc_libipw(int sizeof_priv, int monitor)
{
struct libipw_device *ieee;
struct net_device *dev;
Expand Down Expand Up @@ -225,8 +225,9 @@ struct net_device *alloc_ieee80211(int sizeof_priv, int monitor)
failed:
return NULL;
}
EXPORT_SYMBOL(alloc_libipw);

void free_ieee80211(struct net_device *dev, int monitor)
void free_libipw(struct net_device *dev, int monitor)
{
struct libipw_device *ieee = netdev_priv(dev);

Expand All @@ -240,6 +241,7 @@ void free_ieee80211(struct net_device *dev, int monitor)

free_netdev(dev);
}
EXPORT_SYMBOL(free_libipw);

#ifdef CONFIG_LIBIPW_DEBUG

Expand Down Expand Up @@ -294,7 +296,7 @@ static int __init libipw_init(void)
struct proc_dir_entry *e;

libipw_debug_level = debug;
libipw_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
libipw_proc = proc_mkdir("ieee80211", init_net.proc_net);
if (libipw_proc == NULL) {
LIBIPW_ERROR("Unable to create " DRV_NAME
" proc directory\n");
Expand Down Expand Up @@ -334,6 +336,3 @@ MODULE_PARM_DESC(debug, "debug output mask");

module_exit(libipw_exit);
module_init(libipw_init);

EXPORT_SYMBOL(alloc_ieee80211);
EXPORT_SYMBOL(free_ieee80211);

0 comments on commit 41e12b7

Please sign in to comment.