| From stable-bounces@linux.kernel.org Thu Jan 31 23:06:27 2008 |
| From: Al Viro <viro@ZenIV.linux.org.uk> |
| Date: Fri, 1 Feb 2008 07:05:44 +0000 |
| Subject: Fix dl2k constants |
| To: Jeff Garzik <jgarzik@pobox.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org>, stable@kernel.org |
| Message-ID: <20080201070544.GL27894@ZenIV.linux.org.uk> |
| Content-Disposition: inline |
| |
| |
| patch 9c52fab2f187636b39afb0dcf562872ed42ab608 in mainline. |
| |
| The MSSR constants didn't match the reality - bitfield declarations |
| used to be correct (1000BT_FD - bit 11, 1000BT_HD - bit 10), but enum |
| had them the other way round. Went unnoticed until the switch from |
| the bitfields use to the explicit arithmetics and I hadn't caught that one |
| when verifying correctness of change... |
| |
| Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/dl2k.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/dl2k.h |
| +++ b/drivers/net/dl2k.h |
| @@ -388,8 +388,8 @@ enum _mii_mssr { |
| MII_MSSR_CFG_RES = 0x4000, |
| MII_MSSR_LOCAL_RCV_STATUS = 0x2000, |
| MII_MSSR_REMOTE_RCVR = 0x1000, |
| - MII_MSSR_LP_1000BT_HD = 0x0800, |
| - MII_MSSR_LP_1000BT_FD = 0x0400, |
| + MII_MSSR_LP_1000BT_FD = 0x0800, |
| + MII_MSSR_LP_1000BT_HD = 0x0400, |
| MII_MSSR_IDLE_ERR_COUNT = 0x00ff, |
| }; |
| |
