Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / include / net / netlink.h

diff --git a/include/net/netlink.h b/include/net/netlink.h
index 4fc05b58503eb4beab8fc20b3ab0b762f9f3d293..9801c55de5d64e5357006f9cfb129bce139572dd 100644 (file)
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -35,7 +35,7 @@
  *   nlmsg_new()                       create a new netlink message
  *   nlmsg_put()                       add a netlink message to an skb
  *   nlmsg_put_answer()                        callback based nlmsg_put()
- *   nlmsg_end()                       finanlize netlink message
+ *   nlmsg_end()                       finalize netlink message
  *   nlmsg_get_pos()                   return current position in message
  *   nlmsg_trim()                      trim part of message
  *   nlmsg_cancel()                    cancel message construction
@@ -384,7 +384,7 @@ static inline int nlmsg_parse(const struct nlmsghdr *nlh, int hdrlen,
  *
  * Returns the first attribute which matches the specified type.
  */
-static inline struct nlattr *nlmsg_find_attr(struct nlmsghdr *nlh,
+static inline struct nlattr *nlmsg_find_attr(const struct nlmsghdr *nlh,
                                             int hdrlen, int attrtype)
 {
        return nla_find(nlmsg_attrdata(nlh, hdrlen),