diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-05 14:59:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 14:59:02 -0700 |
| commit | 7143b7d41218d4fc2ea33e6056c73609527ae687 (patch) | |
| tree | 9a842daee1deb57a2c8084bc5d300f6d8428fe34 /drivers/net/mii.c | |
| parent | 90864fbc7639d7a2300c67a18c9fb9fbcf7d51d2 (diff) | |
| parent | 87e9af6cc67d842cd92b52b81f3f14e665e7ab05 (diff) | |
| download | olio-linux-3.10-7143b7d41218d4fc2ea33e6056c73609527ae687.tar.xz olio-linux-3.10-7143b7d41218d4fc2ea33e6056c73609527ae687.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
Diffstat (limited to 'drivers/net/mii.c')
| -rw-r--r-- | drivers/net/mii.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/mii.c b/drivers/net/mii.c index 4fbc816efee..c62e7816d54 100644 --- a/drivers/net/mii.c +++ b/drivers/net/mii.c @@ -49,6 +49,10 @@ static u32 mii_get_an(struct mii_if_info *mii, u16 addr) result |= ADVERTISED_100baseT_Half; if (advert & ADVERTISE_100FULL) result |= ADVERTISED_100baseT_Full; + if (advert & ADVERTISE_PAUSE_CAP) + result |= ADVERTISED_Pause; + if (advert & ADVERTISE_PAUSE_ASYM) + result |= ADVERTISED_Asym_Pause; return result; } |