nl80211: Add CMD_CONTROL_PORT_FRAME API
This commit also adds cfg80211_rx_control_port function. This is used to generate a CMD_CONTROL_PORT_FRAME event out to userspace. The conn_owner_nlportid is used as the unicast destination. This means that userspace must specify NL80211_ATTR_SOCKET_OWNER flag if control port over nl80211 routing is requested in NL80211_CMD_CONNECT, NL80211_CMD_ASSOCIATE, NL80211_CMD_START_AP or IBSS/mesh join. Signed-off-by: Denis Kenzior <denkenz@gmail.com> [johannes: fix return value of cfg80211_rx_control_port()] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:

committed by
Johannes Berg

parent
4d191c7536
commit
6a671a50f8
@@ -14553,6 +14553,64 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,
|
||||
}
|
||||
EXPORT_SYMBOL(cfg80211_mgmt_tx_status);
|
||||
|
||||
static int __nl80211_rx_control_port(struct net_device *dev,
|
||||
const u8 *buf, size_t len,
|
||||
const u8 *addr, u16 proto,
|
||||
bool unencrypted, gfp_t gfp)
|
||||
{
|
||||
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
||||
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
|
||||
struct sk_buff *msg;
|
||||
void *hdr;
|
||||
u32 nlportid = READ_ONCE(wdev->conn_owner_nlportid);
|
||||
|
||||
if (!nlportid)
|
||||
return -ENOENT;
|
||||
|
||||
msg = nlmsg_new(100 + len, gfp);
|
||||
if (!msg)
|
||||
return -ENOMEM;
|
||||
|
||||
hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_CONTROL_PORT_FRAME);
|
||||
if (!hdr) {
|
||||
nlmsg_free(msg);
|
||||
return -ENOBUFS;
|
||||
}
|
||||
|
||||
if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
|
||||
nla_put_u32(msg, NL80211_ATTR_IFINDEX, dev->ifindex) ||
|
||||
nla_put_u64_64bit(msg, NL80211_ATTR_WDEV, wdev_id(wdev),
|
||||
NL80211_ATTR_PAD) ||
|
||||
nla_put(msg, NL80211_ATTR_FRAME, len, buf) ||
|
||||
nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, addr) ||
|
||||
nla_put_u16(msg, NL80211_ATTR_CONTROL_PORT_ETHERTYPE, proto) ||
|
||||
(unencrypted && nla_put_flag(msg,
|
||||
NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT)))
|
||||
goto nla_put_failure;
|
||||
|
||||
genlmsg_end(msg, hdr);
|
||||
|
||||
return genlmsg_unicast(wiphy_net(&rdev->wiphy), msg, nlportid);
|
||||
|
||||
nla_put_failure:
|
||||
nlmsg_free(msg);
|
||||
return -ENOBUFS;
|
||||
}
|
||||
|
||||
bool cfg80211_rx_control_port(struct net_device *dev,
|
||||
const u8 *buf, size_t len,
|
||||
const u8 *addr, u16 proto, bool unencrypted)
|
||||
{
|
||||
int ret;
|
||||
|
||||
trace_cfg80211_rx_control_port(dev, buf, len, addr, proto, unencrypted);
|
||||
ret = __nl80211_rx_control_port(dev, buf, len, addr, proto,
|
||||
unencrypted, GFP_ATOMIC);
|
||||
trace_cfg80211_return_bool(ret == 0);
|
||||
return ret == 0;
|
||||
}
|
||||
EXPORT_SYMBOL(cfg80211_rx_control_port);
|
||||
|
||||
static struct sk_buff *cfg80211_prepare_cqm(struct net_device *dev,
|
||||
const char *mac, gfp_t gfp)
|
||||
{
|
||||
|
Reference in New Issue
Block a user