Merge ../linux-2.6
This commit is contained in:
@@ -513,7 +513,7 @@ struct mii_phy {
|
||||
u_char *rst; /* Start of reset sequence in SROM */
|
||||
u_int mc; /* Media Capabilities */
|
||||
u_int ana; /* NWay Advertisement */
|
||||
u_int fdx; /* Full DupleX capabilites for each media */
|
||||
u_int fdx; /* Full DupleX capabilities for each media */
|
||||
u_int ttm; /* Transmit Threshold Mode for each media */
|
||||
u_int mci; /* 21142 MII Connector Interrupt info */
|
||||
};
|
||||
|
@@ -199,7 +199,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
|
||||
/* negotiation ended successfully */
|
||||
|
||||
/* get the link partners reply and mask out all but
|
||||
* bits 24-21 which show the partners capabilites
|
||||
* bits 24-21 which show the partners capabilities
|
||||
* and match those to what we advertised
|
||||
*
|
||||
* then begin to interpret the results of the negotiation.
|
||||
|
Reference in New Issue
Block a user