Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 237561
b: refs/heads/master
c: 48de36c
h: refs/heads/master
i:
  237559: 6d0c5b7
v: v3
  • Loading branch information
Emil Tantilov authored and Jeff Kirsher committed Mar 3, 2011
1 parent bf471b4 commit 7bae99a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 76d97dd4c44c6847029ae9021fe0d880cad90d33
refs/heads/master: 48de36c5656113ce6cfe4207da2f90f46917e53d
11 changes: 10 additions & 1 deletion trunk/drivers/net/ixgbe/ixgbe_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -2769,10 +2769,19 @@ s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw)
s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
bool *link_up, bool link_up_wait_to_complete)
{
u32 links_reg;
u32 links_reg, links_orig;
u32 i;

/* clear the old state */
links_orig = IXGBE_READ_REG(hw, IXGBE_LINKS);

links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);

if (links_orig != links_reg) {
hw_dbg(hw, "LINKS changed from %08X to %08X\n",
links_orig, links_reg);
}

if (link_up_wait_to_complete) {
for (i = 0; i < IXGBE_LINK_UP_TIME; i++) {
if (links_reg & IXGBE_LINKS_UP) {
Expand Down

0 comments on commit 7bae99a

Please sign in to comment.