diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-11 13:32:31 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-11 13:32:31 -0700 |
commit | 62522d36d74a843e78d17f2dffc90468c6762803 (patch) | |
tree | d9d21de6724425c1b0ba12991e0865556aeda6b4 /net/caif | |
parent | a71fba97295db924c0b90266e9833e5059fead24 (diff) | |
parent | e79aa8671033535c2e9ffc0a68010ae49ed5734c (diff) | |
download | op-kernel-dev-62522d36d74a843e78d17f2dffc90468c6762803.zip op-kernel-dev-62522d36d74a843e78d17f2dffc90468c6762803.tar.gz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 cd2830f..fd27b17 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 0fd827f..e04f7d9 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; |