diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 20:38:16 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 20:38:16 +0200 |
| commit | 9c78965ca18594fe0a34a1a1b13781b10f85e4bc (patch) | |
| tree | 60c9e83d3c2b56e3c7f5169b63577a72bf7ddb57 /net/caif | |
| parent | Revert adding some arch-specific signal syscalls to <linux/syscalls.h>. (diff) | |
| parent | Linux 2.6.35-rc3 (diff) | |
| download | linux-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.tar.xz linux-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'net/caif')
| -rw-r--r-- | net/caif/cfrfml.c | 2 | ||||
| -rw-r--r-- | net/caif/cfveil.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/caif/cfrfml.c b/net/caif/cfrfml.c index cd2830fec935..fd27b172fb5d 100644 --- a/net/caif/cfrfml.c +++ b/net/caif/cfrfml.c @@ -83,7 +83,7 @@ static int cfrfml_transmit(struct cflayer *layr, struct cfpkt *pkt) if (!cfsrvl_ready(service, &ret)) return ret; - if (!cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) { + if (cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) { pr_err("CAIF: %s():Packet too large - size=%d\n", __func__, cfpkt_getlen(pkt)); return -EOVERFLOW; diff --git a/net/caif/cfveil.c b/net/caif/cfveil.c index 0fd827f49491..e04f7d964e83 100644 --- a/net/caif/cfveil.c +++ b/net/caif/cfveil.c @@ -84,7 +84,7 @@ static int cfvei_transmit(struct cflayer *layr, struct cfpkt *pkt) return ret; caif_assert(layr->dn != NULL); caif_assert(layr->dn->transmit != NULL); - if (!cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) { + if (cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) { pr_warning("CAIF: %s(): Packet too large - size=%d\n", __func__, cfpkt_getlen(pkt)); return -EOVERFLOW; |