Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
484a5df4
Commit
484a5df4
authored
Sep 25, 2003
by
Stephen Hemminger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] (7/8) arlan -- more dead wood removal
Still more driver data which was updated but never used.
parent
09bdfb05
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
16 deletions
+2
-16
drivers/net/wireless/arlan-main.c
drivers/net/wireless/arlan-main.c
+0
-6
drivers/net/wireless/arlan.h
drivers/net/wireless/arlan.h
+2
-10
No files found.
drivers/net/wireless/arlan-main.c
View file @
484a5df4
...
@@ -411,7 +411,6 @@ int arlan_command(struct net_device *dev, int command_p)
...
@@ -411,7 +411,6 @@ int arlan_command(struct net_device *dev, int command_p)
WRITESHMB
(
arlan
->
commandByte
,
ARLAN_COM_TX_ENABLE
|
ARLAN_COM_INT
);
WRITESHMB
(
arlan
->
commandByte
,
ARLAN_COM_TX_ENABLE
|
ARLAN_COM_INT
);
memcpy_toio
((
void
*
)
arlan
->
commandParameter
,
&
TXLAST
(
dev
),
14
);
memcpy_toio
((
void
*
)
arlan
->
commandParameter
,
&
TXLAST
(
dev
),
14
);
// for ( i=1 ; i < 15 ; i++) printk("%02x:",READSHMB(arlan->commandParameter[i]));
// for ( i=1 ; i < 15 ; i++) printk("%02x:",READSHMB(arlan->commandParameter[i]));
priv
->
last_command_was_rx
=
0
;
priv
->
tx_last_sent
=
jiffies
;
priv
->
tx_last_sent
=
jiffies
;
arlan_interrupt_lancpu
(
dev
);
arlan_interrupt_lancpu
(
dev
);
priv
->
last_tx_time
=
arlan_time
();
priv
->
last_tx_time
=
arlan_time
();
...
@@ -765,7 +764,6 @@ static int arlan_hw_tx(struct net_device *dev, char *buf, int length)
...
@@ -765,7 +764,6 @@ static int arlan_hw_tx(struct net_device *dev, char *buf, int length)
arlan_command
(
dev
,
ARLAN_COMMAND_TX
);
arlan_command
(
dev
,
ARLAN_COMMAND_TX
);
priv
->
last_command_was_rx
=
0
;
priv
->
tx_last_sent
=
jiffies
;
priv
->
tx_last_sent
=
jiffies
;
IFDEBUG
(
ARLAN_DEBUG_TX_CHAIN
)
printk
(
"%s TX Qued %d bytes
\n
"
,
dev
->
name
,
length
);
IFDEBUG
(
ARLAN_DEBUG_TX_CHAIN
)
printk
(
"%s TX Qued %d bytes
\n
"
,
dev
->
name
,
length
);
...
@@ -1233,7 +1231,6 @@ static int arlan_open(struct net_device *dev)
...
@@ -1233,7 +1231,6 @@ static int arlan_open(struct net_device *dev)
priv
->
rx_command_given
=
0
;
priv
->
rx_command_given
=
0
;
priv
->
reRegisterExp
=
1
;
priv
->
reRegisterExp
=
1
;
priv
->
last_command_was_rx
=
0
;
priv
->
tx_last_sent
=
jiffies
-
1
;
priv
->
tx_last_sent
=
jiffies
-
1
;
priv
->
tx_last_cleared
=
jiffies
;
priv
->
tx_last_cleared
=
jiffies
;
priv
->
Conf
->
writeEEPROM
=
0
;
priv
->
Conf
->
writeEEPROM
=
0
;
...
@@ -1680,7 +1677,6 @@ static void arlan_process_interrupt(struct net_device *dev)
...
@@ -1680,7 +1677,6 @@ static void arlan_process_interrupt(struct net_device *dev)
if
(
rxStatus
==
0
&&
txStatus
==
0
)
if
(
rxStatus
==
0
&&
txStatus
==
0
)
{
{
priv
->
last_command_was_rx
=
0
;
if
(
priv
->
irq_test_done
)
if
(
priv
->
irq_test_done
)
{
{
if
(
!
registrationBad
(
dev
))
if
(
!
registrationBad
(
dev
))
...
@@ -1707,7 +1703,6 @@ static void arlan_process_interrupt(struct net_device *dev)
...
@@ -1707,7 +1703,6 @@ static void arlan_process_interrupt(struct net_device *dev)
}
}
if
(
rxStatus
>
2
&&
rxStatus
<
0xff
)
if
(
rxStatus
>
2
&&
rxStatus
<
0xff
)
{
{
priv
->
last_command_was_rx
=
0
;
WRITESHMB
(
arlan
->
rxStatus
,
0x00
);
WRITESHMB
(
arlan
->
rxStatus
,
0x00
);
printk
(
KERN_ERR
"%s unknown rxStatus reason tx %d rx %d "
,
printk
(
KERN_ERR
"%s unknown rxStatus reason tx %d rx %d "
,
dev
->
name
,
txStatus
,
rxStatus
);
dev
->
name
,
txStatus
,
rxStatus
);
...
@@ -1715,7 +1710,6 @@ static void arlan_process_interrupt(struct net_device *dev)
...
@@ -1715,7 +1710,6 @@ static void arlan_process_interrupt(struct net_device *dev)
}
}
if
(
rxStatus
==
0xff
)
if
(
rxStatus
==
0xff
)
{
{
priv
->
last_command_was_rx
=
0
;
WRITESHMB
(
arlan
->
rxStatus
,
0x00
);
WRITESHMB
(
arlan
->
rxStatus
,
0x00
);
arlan_command
(
dev
,
ARLAN_COMMAND_RX
);
arlan_command
(
dev
,
ARLAN_COMMAND_RX
);
if
(
registrationBad
(
dev
))
if
(
registrationBad
(
dev
))
...
...
drivers/net/wireless/arlan.h
View file @
484a5df4
...
@@ -337,10 +337,7 @@ struct arlan_private {
...
@@ -337,10 +337,7 @@ struct arlan_private {
struct
net_device_stats
stats
;
struct
net_device_stats
stats
;
struct
arlan_shmem
*
card
;
struct
arlan_shmem
*
card
;
struct
arlan_shmem
*
conf
;
struct
arlan_shmem
*
conf
;
struct
TxParam
txParam
;
int
multicastLength
;
char
multicastList
[
ARLAN_MAX_MULTICAST_ADDRS
][
6
];
int
promiscModeEnabled
;
struct
arlan_conf_stru
*
Conf
;
struct
arlan_conf_stru
*
Conf
;
int
bad
;
int
bad
;
int
reset
;
int
reset
;
...
@@ -353,16 +350,13 @@ struct arlan_private {
...
@@ -353,16 +350,13 @@ struct arlan_private {
int
registrationLostCount
;
int
registrationLostCount
;
int
reRegisterExp
;
int
reRegisterExp
;
int
irq_test_done
;
int
irq_test_done
;
int
last_command_was_rx
;
struct
TxParam
txRing
[
TX_RING_SIZE
];
struct
TxParam
txRing
[
TX_RING_SIZE
];
char
reTransmitBuff
[
0x800
];
char
reTransmitBuff
[
0x800
];
volatile
int
txLast
;
volatile
int
txLast
;
volatile
int
txNew
;
volatile
char
ReTransmitRequested
;
volatile
char
ReTransmitRequested
;
volatile
unsigned
long
tx_done_delayed
;
volatile
unsigned
long
tx_done_delayed
;
volatile
long
long
registrationLastSeen
;
volatile
long
long
registrationLastSeen
;
volatile
char
under_command
;
volatile
char
under_toggle
;
volatile
long
long
tx_last_sent
;
volatile
long
long
tx_last_sent
;
volatile
long
long
tx_last_cleared
;
volatile
long
long
tx_last_cleared
;
volatile
int
retransmissions
;
volatile
int
retransmissions
;
...
@@ -477,13 +471,11 @@ struct arlan_private {
...
@@ -477,13 +471,11 @@ struct arlan_private {
#define arlan_interrupt_lancpu(dev) {\
#define arlan_interrupt_lancpu(dev) {\
int cr; \
int cr; \
\
\
priv->under_toggle++; \
cr = readControlRegister(dev);\
cr = readControlRegister(dev);\
if (cr & ARLAN_CHANNEL_ATTENTION){ \
if (cr & ARLAN_CHANNEL_ATTENTION){ \
writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\
writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\
}else \
}else \
writeControlRegister(dev, (cr | ARLAN_CHANNEL_ATTENTION));\
writeControlRegister(dev, (cr | ARLAN_CHANNEL_ATTENTION));\
priv->under_toggle=0; \
}
}
#define clearChannelAttention(dev){ \
#define clearChannelAttention(dev){ \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment