diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
| commit | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch) | |
| tree | eb2060681552a00e9efa98224b95f69a3dc84390 /include/net/netlink.h | |
| parent | b1add0480a95b6ceaece5caf6c50614771eae9b2 (diff) | |
| parent | 7bff3c4ce44ea48f50dc47a5994454984bd08c59 (diff) | |
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
Diffstat (limited to 'include/net/netlink.h')
| -rw-r--r-- | include/net/netlink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netlink.h b/include/net/netlink.h index 18024b8cecb8..208fe5a38546 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h | |||
| @@ -702,7 +702,7 @@ static inline int nla_len(const struct nlattr *nla) | |||
| 702 | */ | 702 | */ |
| 703 | static inline int nla_ok(const struct nlattr *nla, int remaining) | 703 | static inline int nla_ok(const struct nlattr *nla, int remaining) |
| 704 | { | 704 | { |
| 705 | return remaining >= sizeof(*nla) && | 705 | return remaining >= (int) sizeof(*nla) && |
| 706 | nla->nla_len >= sizeof(*nla) && | 706 | nla->nla_len >= sizeof(*nla) && |
| 707 | nla->nla_len <= remaining; | 707 | nla->nla_len <= remaining; |
| 708 | } | 708 | } |