diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/net/rtnetlink.h | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'include/net/rtnetlink.h')
| -rw-r--r-- | include/net/rtnetlink.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h index 48d3efcb0880..af60fd050844 100644 --- a/include/net/rtnetlink.h +++ b/include/net/rtnetlink.h | |||
| @@ -87,6 +87,8 @@ extern void rtnl_link_unregister(struct rtnl_link_ops *ops); | |||
| 87 | extern struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]); | 87 | extern struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]); |
| 88 | extern struct net_device *rtnl_create_link(struct net *src_net, struct net *net, | 88 | extern struct net_device *rtnl_create_link(struct net *src_net, struct net *net, |
| 89 | char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]); | 89 | char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]); |
| 90 | extern int rtnl_configure_link(struct net_device *dev, | ||
| 91 | const struct ifinfomsg *ifm); | ||
| 90 | extern const struct nla_policy ifla_policy[IFLA_MAX+1]; | 92 | extern const struct nla_policy ifla_policy[IFLA_MAX+1]; |
| 91 | 93 | ||
| 92 | #define MODULE_ALIAS_RTNL_LINK(kind) MODULE_ALIAS("rtnl-link-" kind) | 94 | #define MODULE_ALIAS_RTNL_LINK(kind) MODULE_ALIAS("rtnl-link-" kind) |