From 0c270d15c50d9dd9ec3331c4a77261ade47020ec Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 11 Oct 2007 19:48:04 -0700 Subject: [PATCH] --- yaml --- r: 67596 b: refs/heads/master c: df3fe1f318b226453b8dc48622c2b6eb78d75dbb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fe0a06259e82..c96f6ca5ee86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff35164e72648e0bf0b10ec4410c195e8607e88b +refs/heads/master: df3fe1f318b226453b8dc48622c2b6eb78d75dbb diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index c9ee8a2c24b5..55cda58bf59f 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -296,10 +296,10 @@ static const u16 copper_fc_adv[] = { /* flow control to advertise bits when using 1000BaseX */ static const u16 fiber_fc_adv[] = { - [FC_BOTH] = PHY_M_P_BOTH_MD_X, + [FC_NONE] = PHY_M_P_NO_PAUSE_X, [FC_TX] = PHY_M_P_ASYM_MD_X, [FC_RX] = PHY_M_P_SYM_MD_X, - [FC_NONE] = PHY_M_P_NO_PAUSE_X, + [FC_BOTH] = PHY_M_P_BOTH_MD_X, }; /* flow control to GMA disable bits */