diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-26 18:42:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-26 18:42:40 +0100 |
| commit | 137b529e4df7b9cd6b235654a3f1a8f280e3463d (patch) | |
| tree | 30a84ff048ac3e42a767ffa9c6da2b81358baf7a /drivers | |
| parent | V4L/DVB (4874): Fix oops on symbol rate==0 (diff) | |
| parent | [XFRM] STATE: Fix to respond error to get operation if no matching entry exists. (diff) | |
| download | linux-137b529e4df7b9cd6b235654a3f1a8f280e3463d.tar.xz linux-137b529e4df7b9cd6b235654a3f1a8f280e3463d.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[XFRM] STATE: Fix to respond error to get operation if no matching entry exists.
[NET]: Re-fix of doc-comment in sock.h
[6PACK]: Masking bug in 6pack driver.
[NET]: Fix kfifo_alloc() error check.
[UDP]: Make udp_encap_rcv use pskb_may_pull
[NETFILTER]: H.323 conntrack: fix crash with CONFIG_IP_NF_CT_ACCT
Diffstat (limited to 'drivers')
| -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) printk(KERN_DEBUG "6pack: protocol violation\n"); else sp->status = 0; - cmd &= !SIXP_RX_DCD_MASK; + cmd &= ~SIXP_RX_DCD_MASK; } sp->status = cmd & SIXP_PRIO_DATA_MASK; } else { /* output watchdog char if idle */ |