|
@@ -2345,12 +2345,16 @@ static int nl80211_send_chandef(struct sk_buff *msg,
|
|
|
|
|
|
static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flags,
|
|
|
struct cfg80211_registered_device *rdev,
|
|
|
- struct wireless_dev *wdev)
|
|
|
+ struct wireless_dev *wdev, bool removal)
|
|
|
{
|
|
|
struct net_device *dev = wdev->netdev;
|
|
|
+ u8 cmd = NL80211_CMD_NEW_INTERFACE;
|
|
|
void *hdr;
|
|
|
|
|
|
- hdr = nl80211hdr_put(msg, portid, seq, flags, NL80211_CMD_NEW_INTERFACE);
|
|
|
+ if (removal)
|
|
|
+ cmd = NL80211_CMD_DEL_INTERFACE;
|
|
|
+
|
|
|
+ hdr = nl80211hdr_put(msg, portid, seq, flags, cmd);
|
|
|
if (!hdr)
|
|
|
return -1;
|
|
|
|
|
@@ -2417,7 +2421,7 @@ static int nl80211_dump_interface(struct sk_buff *skb, struct netlink_callback *
|
|
|
}
|
|
|
if (nl80211_send_iface(skb, NETLINK_CB(cb->skb).portid,
|
|
|
cb->nlh->nlmsg_seq, NLM_F_MULTI,
|
|
|
- rdev, wdev) < 0) {
|
|
|
+ rdev, wdev, false) < 0) {
|
|
|
goto out;
|
|
|
}
|
|
|
if_idx++;
|
|
@@ -2445,7 +2449,7 @@ static int nl80211_get_interface(struct sk_buff *skb, struct genl_info *info)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
if (nl80211_send_iface(msg, info->snd_portid, info->snd_seq, 0,
|
|
|
- rdev, wdev) < 0) {
|
|
|
+ rdev, wdev, false) < 0) {
|
|
|
nlmsg_free(msg);
|
|
|
return -ENOBUFS;
|
|
|
}
|
|
@@ -2591,7 +2595,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
|
|
|
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
|
|
struct vif_params params;
|
|
|
struct wireless_dev *wdev;
|
|
|
- struct sk_buff *msg;
|
|
|
+ struct sk_buff *msg, *event;
|
|
|
int err;
|
|
|
enum nl80211_iftype type = NL80211_IFTYPE_UNSPECIFIED;
|
|
|
u32 flags;
|
|
@@ -2689,11 +2693,25 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
|
|
|
}
|
|
|
|
|
|
if (nl80211_send_iface(msg, info->snd_portid, info->snd_seq, 0,
|
|
|
- rdev, wdev) < 0) {
|
|
|
+ rdev, wdev, false) < 0) {
|
|
|
nlmsg_free(msg);
|
|
|
return -ENOBUFS;
|
|
|
}
|
|
|
|
|
|
+ event = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
|
|
+ if (event) {
|
|
|
+ if (nl80211_send_iface(event, 0, 0, 0,
|
|
|
+ rdev, wdev, false) < 0) {
|
|
|
+ nlmsg_free(event);
|
|
|
+ goto out;
|
|
|
+ }
|
|
|
+
|
|
|
+ genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy),
|
|
|
+ event, 0, NL80211_MCGRP_CONFIG,
|
|
|
+ GFP_KERNEL);
|
|
|
+ }
|
|
|
+
|
|
|
+out:
|
|
|
return genlmsg_reply(msg, info);
|
|
|
}
|
|
|
|
|
@@ -2701,10 +2719,18 @@ static int nl80211_del_interface(struct sk_buff *skb, struct genl_info *info)
|
|
|
{
|
|
|
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
|
|
struct wireless_dev *wdev = info->user_ptr[1];
|
|
|
+ struct sk_buff *msg;
|
|
|
+ int status;
|
|
|
|
|
|
if (!rdev->ops->del_virtual_intf)
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
|
|
+ if (msg && nl80211_send_iface(msg, 0, 0, 0, rdev, wdev, true) < 0) {
|
|
|
+ nlmsg_free(msg);
|
|
|
+ msg = NULL;
|
|
|
+ }
|
|
|
+
|
|
|
/*
|
|
|
* If we remove a wireless device without a netdev then clear
|
|
|
* user_ptr[1] so that nl80211_post_doit won't dereference it
|
|
@@ -2715,7 +2741,15 @@ static int nl80211_del_interface(struct sk_buff *skb, struct genl_info *info)
|
|
|
if (!wdev->netdev)
|
|
|
info->user_ptr[1] = NULL;
|
|
|
|
|
|
- return rdev_del_virtual_intf(rdev, wdev);
|
|
|
+ status = rdev_del_virtual_intf(rdev, wdev);
|
|
|
+ if (status >= 0 && msg)
|
|
|
+ genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy),
|
|
|
+ msg, 0, NL80211_MCGRP_CONFIG,
|
|
|
+ GFP_KERNEL);
|
|
|
+ else
|
|
|
+ nlmsg_free(msg);
|
|
|
+
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int nl80211_set_noack_map(struct sk_buff *skb, struct genl_info *info)
|