git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
arlan-proc.c
diff --git
a/drivers/net/wireless/arlan-proc.c
b/drivers/net/wireless/arlan-proc.c
index
86da31c
..
a2cca52
100644
(file)
--- a/
drivers/net/wireless/arlan-proc.c
+++ b/
drivers/net/wireless/arlan-proc.c
@@
-58,7
+58,8
@@
static const char *arlan_diagnostic_info_string(struct net_device *dev)
{
static const char *arlan_diagnostic_info_string(struct net_device *dev)
{
- volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card;
+ struct arlan_private *priv = netdev_priv(dev);
+ volatile struct arlan_shmem __iomem *arlan = priv->card;
u_char diagnosticInfo;
READSHM(diagnosticInfo, arlan->diagnosticInfo, u_char);
u_char diagnosticInfo;
READSHM(diagnosticInfo, arlan->diagnosticInfo, u_char);
@@
-113,7
+114,8
@@
static const char *arlan_diagnostic_info_string(struct net_device *dev)
static const char *arlan_hardware_type_string(struct net_device *dev)
{
u_char hardwareType;
static const char *arlan_hardware_type_string(struct net_device *dev)
{
u_char hardwareType;
- volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card;
+ struct arlan_private *priv = netdev_priv(dev);
+ volatile struct arlan_shmem __iomem *arlan = priv->card;
READSHM(hardwareType, arlan->hardwareType, u_char);
switch (hardwareType)
READSHM(hardwareType, arlan->hardwareType, u_char);
switch (hardwareType)
@@
-189,7
+191,8
@@
static void arlan_print_diagnostic_info(struct net_device *dev)
u_char diagnosticInfo;
u_short diagnosticOffset;
u_char hardwareType;
u_char diagnosticInfo;
u_short diagnosticOffset;
u_char hardwareType;
- volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card;
+ struct arlan_private *priv = netdev_priv(dev);
+ volatile struct arlan_shmem __iomem *arlan = priv->card;
// ARLAN_DEBUG_ENTRY("arlan_print_diagnostic_info");
// ARLAN_DEBUG_ENTRY("arlan_print_diagnostic_info");
@@
-254,7
+257,8
@@
static int arlan_hw_test_memory(struct net_device *dev)
int i;
int memlen = sizeof(struct arlan_shmem) - 0xF; /* avoid control register */
volatile char *arlan_mem = (char *) (dev->mem_start);
int i;
int memlen = sizeof(struct arlan_shmem) - 0xF; /* avoid control register */
volatile char *arlan_mem = (char *) (dev->mem_start);
- volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card;
+ struct arlan_private *priv = netdev_priv(dev);
+ volatile struct arlan_shmem __iomem *arlan = priv->card;
char pattern;
ptr = NULL;
char pattern;
ptr = NULL;
@@
-319,7
+323,8
@@
static int arlan_hw_test_memory(struct net_device *dev)
static int arlan_setup_card_by_book(struct net_device *dev)
{
u_char irqLevel, configuredStatusFlag;
static int arlan_setup_card_by_book(struct net_device *dev)
{
u_char irqLevel, configuredStatusFlag;
- volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card;
+ struct arlan_private *priv = netdev_priv(dev);
+ volatile struct arlan_shmem __iomem *arlan = priv->card;
// ARLAN_DEBUG_ENTRY("arlan_setup_card");
// ARLAN_DEBUG_ENTRY("arlan_setup_card");