diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
commit | 24912420e923d56461b400d83f250a31bed8a964 (patch) | |
tree | 3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 /net/rds/rdma.c | |
parent | 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 (diff) | |
parent | 0302b8622ce696af1cda22fcf207d3793350e896 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
Diffstat (limited to 'net/rds/rdma.c')
-rw-r--r-- | net/rds/rdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/rdma.c b/net/rds/rdma.c index 8920f2a8332..4e37c1cbe8b 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c | |||
@@ -567,7 +567,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, | |||
567 | goto out; | 567 | goto out; |
568 | } | 568 | } |
569 | 569 | ||
570 | if (args->nr_local > (u64)UINT_MAX) { | 570 | if (args->nr_local > UIO_MAXIOV) { |
571 | ret = -EMSGSIZE; | 571 | ret = -EMSGSIZE; |
572 | goto out; | 572 | goto out; |
573 | } | 573 | } |