Commit 0b88e704 authored by David S. Miller's avatar David S. Miller

Merge branch 'tlan-next'

Ondrej Zary says:

====================
tlan: Link handling improvements and Olicom fixes

This patch series improves link handling in tlan driver, allowing the
cable to be (un)plugged anytime and NetworkManager to work properly.

Also there are some bugfixes related to Olicom OC-2326 card.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b98fe24c 9162e7e5
This diff is collapsed.
...@@ -195,6 +195,7 @@ struct tlan_priv { ...@@ -195,6 +195,7 @@ struct tlan_priv {
u32 timer_set_at; u32 timer_set_at;
u32 timer_type; u32 timer_type;
struct timer_list timer; struct timer_list timer;
struct timer_list media_timer;
struct board *adapter; struct board *adapter;
u32 adapter_rev; u32 adapter_rev;
u32 aui; u32 aui;
...@@ -206,9 +207,7 @@ struct tlan_priv { ...@@ -206,9 +207,7 @@ struct tlan_priv {
u8 tlan_rev; u8 tlan_rev;
u8 tlan_full_duplex; u8 tlan_full_duplex;
spinlock_t lock; spinlock_t lock;
u8 link;
struct work_struct tlan_tqueue; struct work_struct tlan_tqueue;
u8 neg_be_verbose;
}; };
...@@ -219,7 +218,6 @@ struct tlan_priv { ...@@ -219,7 +218,6 @@ struct tlan_priv {
* *
****************************************************************/ ****************************************************************/
#define TLAN_TIMER_LINK_BEAT 1
#define TLAN_TIMER_ACTIVITY 2 #define TLAN_TIMER_ACTIVITY 2
#define TLAN_TIMER_PHY_PDOWN 3 #define TLAN_TIMER_PHY_PDOWN 3
#define TLAN_TIMER_PHY_PUP 4 #define TLAN_TIMER_PHY_PUP 4
...@@ -241,6 +239,7 @@ struct tlan_priv { ...@@ -241,6 +239,7 @@ struct tlan_priv {
#define TLAN_EEPROM_ACK 0 #define TLAN_EEPROM_ACK 0
#define TLAN_EEPROM_STOP 1 #define TLAN_EEPROM_STOP 1
#define TLAN_EEPROM_SIZE 256
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment