diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/rtnetlink.h | 8 | ||||
-rw-r--r-- | include/net/net_namespace.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index e20dcc89a836..b014f6b7fe29 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
@@ -620,11 +620,11 @@ extern int __rtattr_parse_nested_compat(struct rtattr *tb[], int maxattr, | |||
620 | ({ data = RTA_PAYLOAD(rta) >= len ? RTA_DATA(rta) : NULL; \ | 620 | ({ data = RTA_PAYLOAD(rta) >= len ? RTA_DATA(rta) : NULL; \ |
621 | __rtattr_parse_nested_compat(tb, max, rta, len); }) | 621 | __rtattr_parse_nested_compat(tb, max, rta, len); }) |
622 | 622 | ||
623 | extern int rtnetlink_send(struct sk_buff *skb, u32 pid, u32 group, int echo); | 623 | extern int rtnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, u32 group, int echo); |
624 | extern int rtnl_unicast(struct sk_buff *skb, u32 pid); | 624 | extern int rtnl_unicast(struct sk_buff *skb, struct net *net, u32 pid); |
625 | extern int rtnl_notify(struct sk_buff *skb, u32 pid, u32 group, | 625 | extern int rtnl_notify(struct sk_buff *skb, struct net *net, u32 pid, u32 group, |
626 | struct nlmsghdr *nlh, gfp_t flags); | 626 | struct nlmsghdr *nlh, gfp_t flags); |
627 | extern void rtnl_set_sk_err(u32 group, int error); | 627 | extern void rtnl_set_sk_err(struct net *net, u32 group, int error); |
628 | extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics); | 628 | extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics); |
629 | extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, | 629 | extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, |
630 | u32 id, u32 ts, u32 tsage, long expires, | 630 | u32 id, u32 ts, u32 tsage, long expires, |
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 5dd6d90b37eb..90802a668c23 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -10,6 +10,7 @@ | |||
10 | 10 | ||
11 | struct proc_dir_entry; | 11 | struct proc_dir_entry; |
12 | struct net_device; | 12 | struct net_device; |
13 | struct sock; | ||
13 | struct net { | 14 | struct net { |
14 | atomic_t count; /* To decided when the network | 15 | atomic_t count; /* To decided when the network |
15 | * namespace should be freed. | 16 | * namespace should be freed. |
@@ -29,6 +30,8 @@ struct net { | |||
29 | struct list_head dev_base_head; | 30 | struct list_head dev_base_head; |
30 | struct hlist_head *dev_name_head; | 31 | struct hlist_head *dev_name_head; |
31 | struct hlist_head *dev_index_head; | 32 | struct hlist_head *dev_index_head; |
33 | |||
34 | struct sock *rtnl; /* rtnetlink socket */ | ||
32 | }; | 35 | }; |
33 | 36 | ||
34 | #ifdef CONFIG_NET | 37 | #ifdef CONFIG_NET |