summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-13 14:46:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-13 14:46:57 -0700
commitc19e80808b34b3de5c20884f11f58c3b6988daff (patch)
tree97a19986b95a23fb9da450e7d6b19fcc94ed6da9 /include
parent344a7829c421ce6c626cb94c6576f66a7c28a871 (diff)
parentcff502a38394fd33693f6233e03fca363dfa956d (diff)
downloadop-kernel-dev-c19e80808b34b3de5c20884f11f58c3b6988daff.zip
op-kernel-dev-c19e80808b34b3de5c20884f11f58c3b6988daff.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: niu: panic on reset netlink: fix overrun in attribute iteration [Bluetooth] Fix regression from using default link policy ath9k: Assign seq# when mac80211 requests this
Diffstat (limited to 'include')
-rw-r--r--include/net/netlink.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 18024b8..208fe5a 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -702,7 +702,7 @@ static inline int nla_len(const struct nlattr *nla)
*/
static inline int nla_ok(const struct nlattr *nla, int remaining)
{
- return remaining >= sizeof(*nla) &&
+ return remaining >= (int) sizeof(*nla) &&
nla->nla_len >= sizeof(*nla) &&
nla->nla_len <= remaining;
}
OpenPOWER on IntegriCloud