diff --git a/[refs] b/[refs] index 269406b1ee03..c9f9bf0fced6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11b4aa03b212cbaa969df25e723fbd400a6e24b9 +refs/heads/master: a7f75c0c9cfb628512b30795bcba02c8a97e03a0 diff --git a/trunk/drivers/net/usb/asix.c b/trunk/drivers/net/usb/asix.c index e12cdb4543b4..de57490103fc 100644 --- a/trunk/drivers/net/usb/asix.c +++ b/trunk/drivers/net/usb/asix.c @@ -1102,12 +1102,14 @@ static int ax88178_link_reset(struct usbnet *dev) mode = AX88178_MEDIUM_DEFAULT; if (ecmd.speed == SPEED_1000) - mode |= AX_MEDIUM_GM | AX_MEDIUM_ENCK; + mode |= AX_MEDIUM_GM; else if (ecmd.speed == SPEED_100) mode |= AX_MEDIUM_PS; else mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM); + mode |= AX_MEDIUM_ENCK; + if (ecmd.duplex == DUPLEX_FULL) mode |= AX_MEDIUM_FD; else