aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-10 05:51:34 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-12 17:03:27 -0400
commit134e63756d5f3d0f7604dfcca847b09d1b14fd66 (patch)
treed2b5eab085d90cde0a4c0136a118800ca72b76ad /net/wireless
parent11a28d373ed2539a110d56419457e2e7db221ac7 (diff)
genetlink: make netns aware
This makes generic netlink network namespace aware. No generic netlink families except for the controller family are made namespace aware, they need to be checked one by one and then set the family->netnsok member to true. A new function genlmsg_multicast_netns() is introduced to allow sending a multicast message in a given namespace, for example when it applies to an object that lives in that namespace, a new function genlmsg_multicast_allns() to send a message to all network namespaces (for objects that do not have an associated netns). The function genlmsg_multicast() is changed to multicast the message in just init_net, which is currently correct for all generic netlink families since they only work in init_net right now. Some will later want to work in all net namespaces because they do not care about the netns at all -- those will have to be converted to use one of the new functions genlmsg_multicast_allns() or genlmsg_multicast_netns() whenever they are made netns aware in some way. After this patch families can easily decide whether or not they should be available in all net namespaces. Many genl families us it for objects not related to networking and should therefore be available in all namespaces, but that will have to be done on a per family basis. Note that this doesn't touch on the checkpoint/restart problem where network namespaces could be used, genl families and multicast groups are numbered globally and I see no easy way of changing that, especially since it must be possible to multicast to all network namespaces for those families that do not care about netns. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 9deb12f73c44..2a04beba4369 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -413,7 +413,7 @@ static int nl80211_get_wiphy(struct sk_buff *skb, struct genl_info *info)
413 413
414 cfg80211_unlock_rdev(dev); 414 cfg80211_unlock_rdev(dev);
415 415
416 return genlmsg_unicast(msg, info->snd_pid); 416 return genlmsg_reply(msg, info);
417 417
418 out_free: 418 out_free:
419 nlmsg_free(msg); 419 nlmsg_free(msg);
@@ -739,7 +739,7 @@ static int nl80211_get_interface(struct sk_buff *skb, struct genl_info *info)
739 dev_put(netdev); 739 dev_put(netdev);
740 cfg80211_unlock_rdev(dev); 740 cfg80211_unlock_rdev(dev);
741 741
742 return genlmsg_unicast(msg, info->snd_pid); 742 return genlmsg_reply(msg, info);
743 743
744 out_free: 744 out_free:
745 nlmsg_free(msg); 745 nlmsg_free(msg);
@@ -1030,7 +1030,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info)
1030 goto nla_put_failure; 1030 goto nla_put_failure;
1031 1031
1032 genlmsg_end(msg, hdr); 1032 genlmsg_end(msg, hdr);
1033 err = genlmsg_unicast(msg, info->snd_pid); 1033 err = genlmsg_reply(msg, info);
1034 goto out; 1034 goto out;
1035 1035
1036 nla_put_failure: 1036 nla_put_failure:
@@ -1618,7 +1618,7 @@ static int nl80211_get_station(struct sk_buff *skb, struct genl_info *info)
1618 dev, mac_addr, &sinfo) < 0) 1618 dev, mac_addr, &sinfo) < 0)
1619 goto out_free; 1619 goto out_free;
1620 1620
1621 err = genlmsg_unicast(msg, info->snd_pid); 1621 err = genlmsg_reply(msg, info);
1622 goto out; 1622 goto out;
1623 1623
1624 out_free: 1624 out_free:
@@ -2087,7 +2087,7 @@ static int nl80211_get_mpath(struct sk_buff *skb, struct genl_info *info)
2087 dev, dst, next_hop, &pinfo) < 0) 2087 dev, dst, next_hop, &pinfo) < 0)
2088 goto out_free; 2088 goto out_free;
2089 2089
2090 err = genlmsg_unicast(msg, info->snd_pid); 2090 err = genlmsg_reply(msg, info);
2091 goto out; 2091 goto out;
2092 2092
2093 out_free: 2093 out_free:
@@ -2436,7 +2436,7 @@ static int nl80211_get_mesh_params(struct sk_buff *skb,
2436 cur_params.dot11MeshHWMPnetDiameterTraversalTime); 2436 cur_params.dot11MeshHWMPnetDiameterTraversalTime);
2437 nla_nest_end(msg, pinfoattr); 2437 nla_nest_end(msg, pinfoattr);
2438 genlmsg_end(msg, hdr); 2438 genlmsg_end(msg, hdr);
2439 err = genlmsg_unicast(msg, info->snd_pid); 2439 err = genlmsg_reply(msg, info);
2440 goto out; 2440 goto out;
2441 2441
2442 nla_put_failure: 2442 nla_put_failure:
@@ -2624,7 +2624,7 @@ static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
2624 nla_nest_end(msg, nl_reg_rules); 2624 nla_nest_end(msg, nl_reg_rules);
2625 2625
2626 genlmsg_end(msg, hdr); 2626 genlmsg_end(msg, hdr);
2627 err = genlmsg_unicast(msg, info->snd_pid); 2627 err = genlmsg_reply(msg, info);
2628 goto out; 2628 goto out;
2629 2629
2630nla_put_failure: 2630nla_put_failure: