diff options
author | Patrick McHardy <kaber@trash.net> | 2007-06-26 06:23:44 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:15:40 -0400 |
commit | 2371baa4bdab3268b32009926f75e7a5d3a41506 (patch) | |
tree | 1c9d118ee17261b92da75550ef2a7b453bbe5bc9 /net | |
parent | afdc3238ec948531205f5c5f77d2de7bae519c71 (diff) |
[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 'net')
-rw-r--r-- | net/core/rtnetlink.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index c25d23ba6d5d..54c17e4cd28f 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
@@ -97,13 +97,11 @@ int rtattr_parse(struct rtattr *tb[], int maxattr, struct rtattr *rta, int len) | |||
97 | return 0; | 97 | return 0; |
98 | } | 98 | } |
99 | 99 | ||
100 | int rtattr_parse_nested_compat(struct rtattr *tb[], int maxattr, | 100 | int __rtattr_parse_nested_compat(struct rtattr *tb[], int maxattr, |
101 | struct rtattr *rta, void **data, int len) | 101 | struct rtattr *rta, int len) |
102 | { | 102 | { |
103 | if (RTA_PAYLOAD(rta) < len) | 103 | if (RTA_PAYLOAD(rta) < len) |
104 | return -1; | 104 | return -1; |
105 | *data = RTA_DATA(rta); | ||
106 | |||
107 | if (RTA_PAYLOAD(rta) >= RTA_ALIGN(len) + sizeof(struct rtattr)) { | 105 | if (RTA_PAYLOAD(rta) >= RTA_ALIGN(len) + sizeof(struct rtattr)) { |
108 | rta = RTA_DATA(rta) + RTA_ALIGN(len); | 106 | rta = RTA_DATA(rta) + RTA_ALIGN(len); |
109 | return rtattr_parse_nested(tb, maxattr, rta); | 107 | return rtattr_parse_nested(tb, maxattr, rta); |
@@ -1312,7 +1310,7 @@ void __init rtnetlink_init(void) | |||
1312 | EXPORT_SYMBOL(__rta_fill); | 1310 | EXPORT_SYMBOL(__rta_fill); |
1313 | EXPORT_SYMBOL(rtattr_strlcpy); | 1311 | EXPORT_SYMBOL(rtattr_strlcpy); |
1314 | EXPORT_SYMBOL(rtattr_parse); | 1312 | EXPORT_SYMBOL(rtattr_parse); |
1315 | EXPORT_SYMBOL(rtattr_parse_nested_compat); | 1313 | EXPORT_SYMBOL(__rtattr_parse_nested_compat); |
1316 | EXPORT_SYMBOL(rtnetlink_put_metrics); | 1314 | EXPORT_SYMBOL(rtnetlink_put_metrics); |
1317 | EXPORT_SYMBOL(rtnl_lock); | 1315 | EXPORT_SYMBOL(rtnl_lock); |
1318 | EXPORT_SYMBOL(rtnl_trylock); | 1316 | EXPORT_SYMBOL(rtnl_trylock); |