diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/net/hamradio/6pack.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/net/hamradio/6pack.c')
| -rw-r--r-- | drivers/net/hamradio/6pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 86b3bb9bec2d..92420f007b97 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
| @@ -914,7 +914,7 @@ static void decode_prio_command(struct sixpack *sp, unsigned char cmd) | |||
| 914 | printk(KERN_DEBUG "6pack: protocol violation\n"); | 914 | printk(KERN_DEBUG "6pack: protocol violation\n"); |
| 915 | else | 915 | else |
| 916 | sp->status = 0; | 916 | sp->status = 0; |
| 917 | cmd &= !SIXP_RX_DCD_MASK; | 917 | cmd &= ~SIXP_RX_DCD_MASK; |
| 918 | } | 918 | } |
| 919 | sp->status = cmd & SIXP_PRIO_DATA_MASK; | 919 | sp->status = cmd & SIXP_PRIO_DATA_MASK; |
| 920 | } else { /* output watchdog char if idle */ | 920 | } else { /* output watchdog char if idle */ |