diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /net/rose | |
| parent | 42099d7a3941d4aaf853caac92b3ae76149fc6e7 (diff) | |
| parent | 2cc6d2bf3d6195fabcf0febc192c01f99519a8f3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/af_rose.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 8e45e76a95f5..d952e7eac188 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c | |||
| @@ -679,7 +679,7 @@ static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
| 679 | if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1) | 679 | if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1) |
| 680 | return -EINVAL; | 680 | return -EINVAL; |
| 681 | 681 | ||
| 682 | if (addr->srose_ndigis > ROSE_MAX_DIGIS) | 682 | if ((unsigned int) addr->srose_ndigis > ROSE_MAX_DIGIS) |
| 683 | return -EINVAL; | 683 | return -EINVAL; |
| 684 | 684 | ||
| 685 | if ((dev = rose_dev_get(&addr->srose_addr)) == NULL) { | 685 | if ((dev = rose_dev_get(&addr->srose_addr)) == NULL) { |
| @@ -739,7 +739,7 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le | |||
| 739 | if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1) | 739 | if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1) |
| 740 | return -EINVAL; | 740 | return -EINVAL; |
| 741 | 741 | ||
| 742 | if (addr->srose_ndigis > ROSE_MAX_DIGIS) | 742 | if ((unsigned int) addr->srose_ndigis > ROSE_MAX_DIGIS) |
| 743 | return -EINVAL; | 743 | return -EINVAL; |
| 744 | 744 | ||
| 745 | /* Source + Destination digis should not exceed ROSE_MAX_DIGIS */ | 745 | /* Source + Destination digis should not exceed ROSE_MAX_DIGIS */ |