mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
For the current cycle, we have the following right now:
* many internal fixes, API improvements, cleanups, etc. * full AP client state tracking in cfg80211/mac80211 from Ayala * VHT support (in mac80211) for mesh * some A-MSDU in A-MPDU support from Emmanuel * show current TX power to userspace (from Rafał) * support for netlink dump in vendor commands (myself) -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJWEp5XAAoJEDBSmw7B7bqr8DsQAICgQL7gSkHUlc6rbMJ9MzX+ 9W0SNpZHSmfE0ZsL3cCoeHbk5dGhX82GumIz4GeqtvIKUNHkC8qlnXJIKTEva+sp PjcF1wS0qQFdt6sg/Zxq+4Q8lZrZf1xP9W0x0ORYi9d9qej07JAZku8zYt4agpNV R4nCl/gKVF375aV8y+qi+WSZXx4j80dJkokoVk4hzotWjd0bGVL1T9YwDRzxg4FI S0DnkxlsD3MRHJXq+9+DbF5cuTjCG2LZNcDIBy455eWN27j9CWgEPVXoySQjDgQc ayf2siw7BccqnV84et0vi+0WYXdZCHm3zCen44s4vaCflhdGxdx48V+Lib6mluR3 OEM1V1l9uV97UyORPljRKvDURq2IUdLQw00of26CTX8qEnmQIfxC7qaRg0rYEiGW SbTClbEiEkBLV+sCStnkv8GJHNpvtI/2VQXH1ydrHsrWC3Sl9bpPOWYlNBPwdzM9 U4zgpxf6gLqlsukQKmMDmoKW7T04Fs0qgE99ThU2x6uTGsux8bfbxgzPCfUdeY8M HmCB5oBCZKJ5pzv6z6lUGc0cO42IL50aBrrlatrEekjevUXW3MMOZCwGrUXxpMw1 gd+2PnLCCUeDyKNvkpXEgr4uS9Egc0sWH1RlpDPaAA5gRdRHiDn7MK7Z+s5OpNIC wnFCQKB+KrNNrQFuXz9k =BF9F -----END PGP SIGNATURE----- Merge tag 'mac80211-next-for-davem-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Johannes Berg says: ==================== For the current cycle, we have the following right now: * many internal fixes, API improvements, cleanups, etc. * full AP client state tracking in cfg80211/mac80211 from Ayala * VHT support (in mac80211) for mesh * some A-MSDU in A-MPDU support from Emmanuel * show current TX power to userspace (from Rafał) * support for netlink dump in vendor commands (myself) ==================== Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller
commit
2579c98f0d
53 changed files with 981 additions and 488 deletions
|
|
@ -419,6 +419,7 @@ use_default_name:
|
|||
device_initialize(&rdev->wiphy.dev);
|
||||
rdev->wiphy.dev.class = &ieee80211_class;
|
||||
rdev->wiphy.dev.platform_data = rdev;
|
||||
device_enable_async_suspend(&rdev->wiphy.dev);
|
||||
|
||||
INIT_LIST_HEAD(&rdev->destroy_list);
|
||||
spin_lock_init(&rdev->destroy_list_lock);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
*
|
||||
* Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
|
||||
* Copyright 2013-2014 Intel Mobile Communications GmbH
|
||||
* Copyright 2015 Intel Deutschland GmbH
|
||||
*/
|
||||
|
||||
#include <linux/if.h>
|
||||
|
|
@ -2403,6 +2404,16 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag
|
|||
}
|
||||
}
|
||||
|
||||
if (rdev->ops->get_tx_power) {
|
||||
int dbm, ret;
|
||||
|
||||
ret = rdev_get_tx_power(rdev, wdev, &dbm);
|
||||
if (ret == 0 &&
|
||||
nla_put_u32(msg, NL80211_ATTR_WIPHY_TX_POWER_LEVEL,
|
||||
DBM_TO_MBM(dbm)))
|
||||
goto nla_put_failure;
|
||||
}
|
||||
|
||||
if (wdev->ssid_len) {
|
||||
if (nla_put(msg, NL80211_ATTR_SSID, wdev->ssid_len, wdev->ssid))
|
||||
goto nla_put_failure;
|
||||
|
|
@ -3998,7 +4009,8 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
|
|||
params->sta_flags_mask &= ~BIT(NL80211_STA_FLAG_TDLS_PEER);
|
||||
}
|
||||
|
||||
if (statype != CFG80211_STA_TDLS_PEER_SETUP) {
|
||||
if (statype != CFG80211_STA_TDLS_PEER_SETUP &&
|
||||
statype != CFG80211_STA_AP_CLIENT_UNASSOC) {
|
||||
/* reject other things that can't change */
|
||||
if (params->sta_modify_mask & STATION_PARAM_APPLY_UAPSD)
|
||||
return -EINVAL;
|
||||
|
|
@ -4010,7 +4022,8 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (statype != CFG80211_STA_AP_CLIENT) {
|
||||
if (statype != CFG80211_STA_AP_CLIENT &&
|
||||
statype != CFG80211_STA_AP_CLIENT_UNASSOC) {
|
||||
if (params->vlan)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -4022,6 +4035,7 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
|
|||
return -EOPNOTSUPP;
|
||||
break;
|
||||
case CFG80211_STA_AP_CLIENT:
|
||||
case CFG80211_STA_AP_CLIENT_UNASSOC:
|
||||
/* accept only the listed bits */
|
||||
if (params->sta_flags_mask &
|
||||
~(BIT(NL80211_STA_FLAG_AUTHORIZED) |
|
||||
|
|
@ -9938,6 +9952,9 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info)
|
|||
if (!wdev->netdev && !wdev->p2p_started)
|
||||
return -ENETDOWN;
|
||||
}
|
||||
|
||||
if (!vcmd->doit)
|
||||
return -EOPNOTSUPP;
|
||||
} else {
|
||||
wdev = NULL;
|
||||
}
|
||||
|
|
@ -9957,6 +9974,193 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info)
|
|||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static int nl80211_prepare_vendor_dump(struct sk_buff *skb,
|
||||
struct netlink_callback *cb,
|
||||
struct cfg80211_registered_device **rdev,
|
||||
struct wireless_dev **wdev)
|
||||
{
|
||||
u32 vid, subcmd;
|
||||
unsigned int i;
|
||||
int vcmd_idx = -1;
|
||||
int err;
|
||||
void *data = NULL;
|
||||
unsigned int data_len = 0;
|
||||
|
||||
rtnl_lock();
|
||||
|
||||
if (cb->args[0]) {
|
||||
/* subtract the 1 again here */
|
||||
struct wiphy *wiphy = wiphy_idx_to_wiphy(cb->args[0] - 1);
|
||||
struct wireless_dev *tmp;
|
||||
|
||||
if (!wiphy) {
|
||||
err = -ENODEV;
|
||||
goto out_unlock;
|
||||
}
|
||||
*rdev = wiphy_to_rdev(wiphy);
|
||||
*wdev = NULL;
|
||||
|
||||
if (cb->args[1]) {
|
||||
list_for_each_entry(tmp, &(*rdev)->wdev_list, list) {
|
||||
if (tmp->identifier == cb->args[1] - 1) {
|
||||
*wdev = tmp;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* keep rtnl locked in successful case */
|
||||
return 0;
|
||||
}
|
||||
|
||||
err = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize,
|
||||
nl80211_fam.attrbuf, nl80211_fam.maxattr,
|
||||
nl80211_policy);
|
||||
if (err)
|
||||
goto out_unlock;
|
||||
|
||||
if (!nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_ID] ||
|
||||
!nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_SUBCMD]) {
|
||||
err = -EINVAL;
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
*wdev = __cfg80211_wdev_from_attrs(sock_net(skb->sk),
|
||||
nl80211_fam.attrbuf);
|
||||
if (IS_ERR(*wdev))
|
||||
*wdev = NULL;
|
||||
|
||||
*rdev = __cfg80211_rdev_from_attrs(sock_net(skb->sk),
|
||||
nl80211_fam.attrbuf);
|
||||
if (IS_ERR(*rdev)) {
|
||||
err = PTR_ERR(*rdev);
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
vid = nla_get_u32(nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_ID]);
|
||||
subcmd = nla_get_u32(nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_SUBCMD]);
|
||||
|
||||
for (i = 0; i < (*rdev)->wiphy.n_vendor_commands; i++) {
|
||||
const struct wiphy_vendor_command *vcmd;
|
||||
|
||||
vcmd = &(*rdev)->wiphy.vendor_commands[i];
|
||||
|
||||
if (vcmd->info.vendor_id != vid || vcmd->info.subcmd != subcmd)
|
||||
continue;
|
||||
|
||||
if (!vcmd->dumpit) {
|
||||
err = -EOPNOTSUPP;
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
vcmd_idx = i;
|
||||
break;
|
||||
}
|
||||
|
||||
if (vcmd_idx < 0) {
|
||||
err = -EOPNOTSUPP;
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
if (nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_DATA]) {
|
||||
data = nla_data(nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_DATA]);
|
||||
data_len = nla_len(nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_DATA]);
|
||||
}
|
||||
|
||||
/* 0 is the first index - add 1 to parse only once */
|
||||
cb->args[0] = (*rdev)->wiphy_idx + 1;
|
||||
/* add 1 to know if it was NULL */
|
||||
cb->args[1] = *wdev ? (*wdev)->identifier + 1 : 0;
|
||||
cb->args[2] = vcmd_idx;
|
||||
cb->args[3] = (unsigned long)data;
|
||||
cb->args[4] = data_len;
|
||||
|
||||
/* keep rtnl locked in successful case */
|
||||
return 0;
|
||||
out_unlock:
|
||||
rtnl_unlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
static int nl80211_vendor_cmd_dump(struct sk_buff *skb,
|
||||
struct netlink_callback *cb)
|
||||
{
|
||||
struct cfg80211_registered_device *rdev;
|
||||
struct wireless_dev *wdev;
|
||||
unsigned int vcmd_idx;
|
||||
const struct wiphy_vendor_command *vcmd;
|
||||
void *data;
|
||||
int data_len;
|
||||
int err;
|
||||
struct nlattr *vendor_data;
|
||||
|
||||
err = nl80211_prepare_vendor_dump(skb, cb, &rdev, &wdev);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
vcmd_idx = cb->args[2];
|
||||
data = (void *)cb->args[3];
|
||||
data_len = cb->args[4];
|
||||
vcmd = &rdev->wiphy.vendor_commands[vcmd_idx];
|
||||
|
||||
if (vcmd->flags & (WIPHY_VENDOR_CMD_NEED_WDEV |
|
||||
WIPHY_VENDOR_CMD_NEED_NETDEV)) {
|
||||
if (!wdev)
|
||||
return -EINVAL;
|
||||
if (vcmd->flags & WIPHY_VENDOR_CMD_NEED_NETDEV &&
|
||||
!wdev->netdev)
|
||||
return -EINVAL;
|
||||
|
||||
if (vcmd->flags & WIPHY_VENDOR_CMD_NEED_RUNNING) {
|
||||
if (wdev->netdev &&
|
||||
!netif_running(wdev->netdev))
|
||||
return -ENETDOWN;
|
||||
if (!wdev->netdev && !wdev->p2p_started)
|
||||
return -ENETDOWN;
|
||||
}
|
||||
}
|
||||
|
||||
while (1) {
|
||||
void *hdr = nl80211hdr_put(skb, NETLINK_CB(cb->skb).portid,
|
||||
cb->nlh->nlmsg_seq, NLM_F_MULTI,
|
||||
NL80211_CMD_VENDOR);
|
||||
if (!hdr)
|
||||
break;
|
||||
|
||||
if (nla_put_u32(skb, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
|
||||
(wdev && nla_put_u64(skb, NL80211_ATTR_WDEV,
|
||||
wdev_id(wdev)))) {
|
||||
genlmsg_cancel(skb, hdr);
|
||||
break;
|
||||
}
|
||||
|
||||
vendor_data = nla_nest_start(skb, NL80211_ATTR_VENDOR_DATA);
|
||||
if (!vendor_data) {
|
||||
genlmsg_cancel(skb, hdr);
|
||||
break;
|
||||
}
|
||||
|
||||
err = vcmd->dumpit(&rdev->wiphy, wdev, skb, data, data_len,
|
||||
(unsigned long *)&cb->args[5]);
|
||||
nla_nest_end(skb, vendor_data);
|
||||
|
||||
if (err == -ENOBUFS || err == -ENOENT) {
|
||||
genlmsg_cancel(skb, hdr);
|
||||
break;
|
||||
} else if (err) {
|
||||
genlmsg_cancel(skb, hdr);
|
||||
goto out;
|
||||
}
|
||||
|
||||
genlmsg_end(skb, hdr);
|
||||
}
|
||||
|
||||
err = skb->len;
|
||||
out:
|
||||
rtnl_unlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
struct sk_buff *__cfg80211_alloc_reply_skb(struct wiphy *wiphy,
|
||||
enum nl80211_commands cmd,
|
||||
enum nl80211_attrs attr,
|
||||
|
|
@ -10994,6 +11198,7 @@ static const struct genl_ops nl80211_ops[] = {
|
|||
{
|
||||
.cmd = NL80211_CMD_VENDOR,
|
||||
.doit = nl80211_vendor_cmd,
|
||||
.dumpit = nl80211_vendor_cmd_dump,
|
||||
.policy = nl80211_policy,
|
||||
.flags = GENL_ADMIN_PERM,
|
||||
.internal_flags = NL80211_FLAG_NEED_WIPHY |
|
||||
|
|
|
|||
|
|
@ -1040,8 +1040,8 @@ freq_reg_info_regd(struct wiphy *wiphy, u32 center_freq,
|
|||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
const struct ieee80211_reg_rule *__freq_reg_info(struct wiphy *wiphy,
|
||||
u32 center_freq, u32 min_bw)
|
||||
static const struct ieee80211_reg_rule *
|
||||
__freq_reg_info(struct wiphy *wiphy, u32 center_freq, u32 min_bw)
|
||||
{
|
||||
const struct ieee80211_regdomain *regd = reg_get_regdomain(wiphy);
|
||||
const struct ieee80211_reg_rule *reg_rule = NULL;
|
||||
|
|
|
|||
Loading…
Reference in a new issue