diff options
author | 2009-09-10 18:17:09 -0700 | |
---|---|---|
committer | 2009-09-10 18:17:09 -0700 | |
commit | 9a0da0d19c573e01aded6ac17747d2efc5b1115f (patch) | |
tree | 76294327bae4b3e45b16c690bda4b24951f237cf /include/net/rtnetlink.h | |
parent | dm9000: Use resource_size instead of private macro (diff) | |
parent | netfilter: ebt_ulog: fix checkentry return value (diff) | |
download | linux-9a0da0d19c573e01aded6ac17747d2efc5b1115f.tar.gz linux-9a0da0d19c573e01aded6ac17747d2efc5b1115f.tar.bz2 linux-9a0da0d19c573e01aded6ac17747d2efc5b1115f.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include/net/rtnetlink.h')
-rw-r--r-- | include/net/rtnetlink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h index b630196b5627..c3aa044d3fc3 100644 --- a/include/net/rtnetlink.h +++ b/include/net/rtnetlink.h @@ -14,7 +14,7 @@ extern void rtnl_register(int protocol, int msgtype, extern int rtnl_unregister(int protocol, int msgtype); extern void rtnl_unregister_all(int protocol); -static inline int rtnl_msg_family(struct nlmsghdr *nlh) +static inline int rtnl_msg_family(const struct nlmsghdr *nlh) { if (nlmsg_len(nlh) >= sizeof(struct rtgenmsg)) return ((struct rtgenmsg *) nlmsg_data(nlh))->rtgen_family; |