diff options
Diffstat (limited to 'drivers/net/sis900.c')
-rw-r--r-- | drivers/net/sis900.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 84d4167eee9a..cb317cd069ff 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -1180,7 +1180,7 @@ sis900_init_rx_ring(struct net_device *net_dev) | |||
1180 | * | 1180 | * |
1181 | * 630E equalizer workaround rule(Cyrus Huang 08/15) | 1181 | * 630E equalizer workaround rule(Cyrus Huang 08/15) |
1182 | * PHY register 14h(Test) | 1182 | * PHY register 14h(Test) |
1183 | * Bit 14: 0 -- Automatically dectect (default) | 1183 | * Bit 14: 0 -- Automatically detect (default) |
1184 | * 1 -- Manually set Equalizer filter | 1184 | * 1 -- Manually set Equalizer filter |
1185 | * Bit 13: 0 -- (Default) | 1185 | * Bit 13: 0 -- (Default) |
1186 | * 1 -- Speed up convergence of equalizer setting | 1186 | * 1 -- Speed up convergence of equalizer setting |
@@ -1192,7 +1192,7 @@ sis900_init_rx_ring(struct net_device *net_dev) | |||
1192 | * Then set equalizer value, and set Bit 14 to 1, Bit 9 to 0 | 1192 | * Then set equalizer value, and set Bit 14 to 1, Bit 9 to 0 |
1193 | * Link Off:Set Bit 13 to 1, Bit 14 to 0 | 1193 | * Link Off:Set Bit 13 to 1, Bit 14 to 0 |
1194 | * Calculate Equalizer value: | 1194 | * Calculate Equalizer value: |
1195 | * When Link is ON and Bit 14 is 0, SIS900PHY will auto-dectect proper equalizer value. | 1195 | * When Link is ON and Bit 14 is 0, SIS900PHY will auto-detect proper equalizer value. |
1196 | * When the equalizer is stable, this value is not a fixed value. It will be within | 1196 | * When the equalizer is stable, this value is not a fixed value. It will be within |
1197 | * a small range(eg. 7~9). Then we get a minimum and a maximum value(eg. min=7, max=9) | 1197 | * a small range(eg. 7~9). Then we get a minimum and a maximum value(eg. min=7, max=9) |
1198 | * 0 <= max <= 4 --> set equalizer to max | 1198 | * 0 <= max <= 4 --> set equalizer to max |
@@ -1723,7 +1723,7 @@ static int sis900_rx(struct net_device *net_dev) | |||
1723 | rx_size = data_size - CRC_SIZE; | 1723 | rx_size = data_size - CRC_SIZE; |
1724 | 1724 | ||
1725 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) | 1725 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) |
1726 | /* ``TOOLONG'' flag means jumbo packet recived. */ | 1726 | /* ``TOOLONG'' flag means jumbo packet received. */ |
1727 | if ((rx_status & TOOLONG) && data_size <= MAX_FRAME_SIZE) | 1727 | if ((rx_status & TOOLONG) && data_size <= MAX_FRAME_SIZE) |
1728 | rx_status &= (~ ((unsigned int)TOOLONG)); | 1728 | rx_status &= (~ ((unsigned int)TOOLONG)); |
1729 | #endif | 1729 | #endif |