1 files changed, 9 insertions, 9 deletions

diff --git a/include/net/netlink.h b/include/net/netlink.h
index bcaf67b7a19d..0bf325c29aff 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -171,6 +171,7 @@ enum {
         NLA_MSECS,
         NLA_NESTED,
         NLA_NUL_STRING,
+        NLA_BINARY,
         __NLA_TYPE_MAX,
 };
 
@@ -188,12 +189,13 @@ enum {
  *    NLA_STRING           Maximum length of string
  *    NLA_NUL_STRING       Maximum length of string (excluding NUL)
  *    NLA_FLAG             Unused
+ *    NLA_BINARY           Maximum length of attribute payload
  *    All other            Exact length of attribute payload
  *
  * Example:
  * static struct nla_policy my_policy[ATTR_MAX+1] __read_mostly = {
  *      [ATTR_FOO] = { .type = NLA_U16 },
- *      [ATTR_BAR] = { .type = NLA_STRING, len = BARSIZ },
+ *      [ATTR_BAR] = { .type = NLA_STRING, .len = BARSIZ },
  *      [ATTR_BAZ] = { .len = sizeof(struct mystruct) },
  * };
  */
@@ -214,9 +216,7 @@ struct nl_info {
 
 extern void             netlink_run_queue(struct sock *sk, unsigned int *qlen,
                                           int (*cb)(struct sk_buff *,
-                                                    struct nlmsghdr *, int *));
-extern void             netlink_queue_skip(struct nlmsghdr *nlh,
-                                           struct sk_buff *skb);
+                                                    struct nlmsghdr *));
 extern int              nlmsg_notify(struct sock *sk, struct sk_buff *skb,
                                      u32 pid, unsigned int group, int report,
                                      gfp_t flags);
@@ -525,7 +525,7 @@ static inline struct sk_buff *nlmsg_new(size_t payload, gfp_t flags)
  */
 static inline int nlmsg_end(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
-        nlh->nlmsg_len = skb->tail - (unsigned char *) nlh;
+        nlh->nlmsg_len = skb_tail_pointer(skb) - (unsigned char *)nlh;
 
         return skb->len;
 }
@@ -538,7 +538,7 @@ static inline int nlmsg_end(struct sk_buff *skb, struct nlmsghdr *nlh)
  */
 static inline void *nlmsg_get_pos(struct sk_buff *skb)
 {
-        return skb->tail;
+        return skb_tail_pointer(skb);
 }
 
 /**
@@ -548,7 +548,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
  *
  * Trims the message to the provided mark. Returns -1.
  */
-static inline int nlmsg_trim(struct sk_buff *skb, void *mark)
+static inline int nlmsg_trim(struct sk_buff *skb, const void *mark)
 {
         if (mark)
                 skb_trim(skb, (unsigned char *) mark - skb->data);
@@ -940,7 +940,7 @@ static inline unsigned long nla_get_msecs(struct nlattr *nla)
  */
 static inline struct nlattr *nla_nest_start(struct sk_buff *skb, int attrtype)
 {
-        struct nlattr *start = (struct nlattr *) skb->tail;
+        struct nlattr *start = (struct nlattr *)skb_tail_pointer(skb);
 
         if (nla_put(skb, attrtype, 0, NULL) < 0)
                 return NULL;
@@ -960,7 +960,7 @@ static inline struct nlattr *nla_nest_start(struct sk_buff *skb, int attrtype)
  */
 static inline int nla_nest_end(struct sk_buff *skb, struct nlattr *start)
 {
-        start->nla_len = skb->tail - (unsigned char *) start;
+        start->nla_len = skb_tail_pointer(skb) - (unsigned char *)start;
         return skb->len;
 }