diff options
| author | Alexander Aring | 2014-10-28 18:21:23 +0100 |
|---|---|---|
| committer | Marcel Holtmann | 2014-10-28 23:19:07 +0100 |
| commit | a543c5989d7711d984608f4e12a73218642ca865 (patch) | |
| tree | 2a0613d1873fbd5d37de7c330430309ddfc72e1c /net/ieee802154/nl-mac.c | |
| parent | mac802154: remove might_sleep from driver layer (diff) | |
| download | kernel-qcow2-linux-a543c5989d7711d984608f4e12a73218642ca865.tar.gz kernel-qcow2-linux-a543c5989d7711d984608f4e12a73218642ca865.tar.xz kernel-qcow2-linux-a543c5989d7711d984608f4e12a73218642ca865.zip | |
mac802154: remove driver ops in wpan-phy
This patch removes the driver ops callbacks inside of wpan_phy struct.
It was used to check if a phy supports this driver ops call. We do this
now via hardware flags.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/ieee802154/nl-mac.c')
| -rw-r--r-- | net/ieee802154/nl-mac.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c index fb6866d1dd39..abd0f31bdc66 100644 --- a/net/ieee802154/nl-mac.c +++ b/net/ieee802154/nl-mac.c @@ -664,20 +664,6 @@ int ieee802154_set_macparams(struct sk_buff *skb, struct genl_info *info) phy = ops->get_phy(dev); - if ((!phy->set_lbt && info->attrs[IEEE802154_ATTR_LBT_ENABLED]) || - (!phy->set_cca_mode && info->attrs[IEEE802154_ATTR_CCA_MODE]) || - (!phy->set_cca_ed_level && - info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL]) || - (!phy->set_csma_params && - (info->attrs[IEEE802154_ATTR_CSMA_RETRIES] || - info->attrs[IEEE802154_ATTR_CSMA_MIN_BE] || - info->attrs[IEEE802154_ATTR_CSMA_MAX_BE])) || - (!phy->set_frame_retries && - info->attrs[IEEE802154_ATTR_FRAME_RETRIES])) { - rc = -EOPNOTSUPP; - goto out_phy; - } - ops->get_mac_params(dev, ¶ms); if (info->attrs[IEEE802154_ATTR_TXPOWER]) @@ -708,10 +694,9 @@ int ieee802154_set_macparams(struct sk_buff *skb, struct genl_info *info) wpan_phy_put(phy); dev_put(dev); - return rc; -out_phy: - wpan_phy_put(phy); + return 0; + out: dev_put(dev); return rc; |