summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-06-26 03:23:44 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-10 22:15:40 -0700
commit2371baa4bdab3268b32009926f75e7a5d3a41506 (patch)
tree1c9d118ee17261b92da75550ef2a7b453bbe5bc9 /include/linux
parentafdc3238ec948531205f5c5f77d2de7bae519c71 (diff)
downloadlinux-stable-2371baa4bdab3268b32009926f75e7a5d3a41506.tar.gz
linux-stable-2371baa4bdab3268b32009926f75e7a5d3a41506.tar.bz2
linux-stable-2371baa4bdab3268b32009926f75e7a5d3a41506.zip
[RTNETLINK]: Fix rtnetlink compat attribute patch
Sent the wrong patch previously. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/rtnetlink.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 6731e7f4cc0f..c91476ce314a 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -570,12 +570,16 @@ static __inline__ int rtattr_strcmp(const struct rtattr *rta, const char *str)
}
extern int rtattr_parse(struct rtattr *tb[], int maxattr, struct rtattr *rta, int len);
-extern int rtattr_parse_nested_compat(struct rtattr *tb[], int maxattr,
- struct rtattr *rta, void **data, int len);
+extern int __rtattr_parse_nested_compat(struct rtattr *tb[], int maxattr,
+ struct rtattr *rta, int len);
#define rtattr_parse_nested(tb, max, rta) \
rtattr_parse((tb), (max), RTA_DATA((rta)), RTA_PAYLOAD((rta)))
+#define rtattr_parse_nested_compat(tb, max, rta, data, len) \
+({ data = RTA_PAYLOAD(rta) >= len ? RTA_DATA(rta) : NULL; \
+ __rtattr_parse_nested_compat(tb, max, rta, len); })
+
extern int rtnetlink_send(struct sk_buff *skb, u32 pid, u32 group, int echo);
extern int rtnl_unicast(struct sk_buff *skb, u32 pid);
extern int rtnl_notify(struct sk_buff *skb, u32 pid, u32 group,