diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /drivers/usb/net/kaweth.c | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/usb/net/kaweth.c')
| -rw-r--r-- | drivers/usb/net/kaweth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c index a9a7cf4a38eb..fd6ff4cb2c62 100644 --- a/drivers/usb/net/kaweth.c +++ b/drivers/usb/net/kaweth.c | |||
| @@ -520,7 +520,7 @@ static void int_callback(struct urb *u, struct pt_regs *regs) | |||
| 520 | 520 | ||
| 521 | /* we check the link state to report changes */ | 521 | /* we check the link state to report changes */ |
| 522 | if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) { | 522 | if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) { |
| 523 | if (!act_state) | 523 | if (act_state) |
| 524 | netif_carrier_on(kaweth->net); | 524 | netif_carrier_on(kaweth->net); |
| 525 | else | 525 | else |
| 526 | netif_carrier_off(kaweth->net); | 526 | netif_carrier_off(kaweth->net); |