diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-21 23:18:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 23:18:00 -0700 |
| commit | 97c7b1798f3de24315f0a3a7abcc7cf5de3285b9 (patch) | |
| tree | 9d35320f2cd153359811980a4070eae766ce6646 /drivers/net/e1000/e1000_main.c | |
| parent | e933d0198d399842f075c2c8af0f38630e7e4bee (diff) | |
| parent | 082757afcf7d6e44b24c4927ce5b158196d63e84 (diff) | |
| download | kernel_replicant_linux-97c7b1798f3de24315f0a3a7abcc7cf5de3285b9.tar.gz kernel_replicant_linux-97c7b1798f3de24315f0a3a7abcc7cf5de3285b9.tar.bz2 kernel_replicant_linux-97c7b1798f3de24315f0a3a7abcc7cf5de3285b9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index acaebecf0ca7..f97afda941d7 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -2402,13 +2402,16 @@ bool e1000_has_link(struct e1000_adapter *adapter) struct e1000_hw *hw = &adapter->hw; bool link_active = false; - /* get_link_status is set on LSC (link status) interrupt or - * rx sequence error interrupt. get_link_status will stay - * false until the e1000_check_for_link establishes link - * for copper adapters ONLY + /* get_link_status is set on LSC (link status) interrupt or rx + * sequence error interrupt (except on intel ce4100). + * get_link_status will stay false until the + * e1000_check_for_link establishes link for copper adapters + * ONLY */ switch (hw->media_type) { case e1000_media_type_copper: + if (hw->mac_type == e1000_ce4100) + hw->get_link_status = 1; if (hw->get_link_status) { e1000_check_for_link(hw); link_active = !hw->get_link_status; |