lkml.org 
[lkml]   [2020]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC net-next 04/28] hostap: use ndo_siocdevprivate
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    hostap has a combination of iwpriv ioctls that do not work at
    all, and two SIOCDEVPRIVATE commands that work natively but
    lack a compat conversion handler.

    For the moment, move them over to the new ndo_siocdevprivate
    interface and return an error for compat mode.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    drivers/net/wireless/intersil/hostap/hostap.h | 3 +-
    .../wireless/intersil/hostap/hostap_ioctl.c | 30 +++++++++++++++----
    .../wireless/intersil/hostap/hostap_main.c | 3 ++
    3 files changed, 29 insertions(+), 7 deletions(-)

    diff --git a/drivers/net/wireless/intersil/hostap/hostap.h b/drivers/net/wireless/intersil/hostap/hostap.h
    index c4b81ff7d7e4..0c41efa252f0 100644
    --- a/drivers/net/wireless/intersil/hostap/hostap.h
    +++ b/drivers/net/wireless/intersil/hostap/hostap.h
    @@ -93,6 +93,7 @@ extern const struct iw_handler_def hostap_iw_handler_def;
    extern const struct ethtool_ops prism2_ethtool_ops;

    int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
    -
    +int hostap_siocdevprivate(struct net_device *dev, struct ifreq *ifr,
    + void __user *data, int cmd);

    #endif /* HOSTAP_H */
    diff --git a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
    index 514c7b01dbf6..7b6471e44255 100644
    --- a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
    +++ b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
    @@ -3952,7 +3952,8 @@ const struct iw_handler_def hostap_iw_handler_def =
    .get_wireless_stats = hostap_get_wireless_stats,
    };

    -
    +/* Private ioctls (iwpriv) that have not yet been converted
    + * into new wireless extensions API */
    int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
    {
    struct iwreq *wrq = (struct iwreq *) ifr;
    @@ -3964,9 +3965,6 @@ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
    local = iface->local;

    switch (cmd) {
    - /* Private ioctls (iwpriv) that have not yet been converted
    - * into new wireless extensions API */
    -
    case PRISM2_IOCTL_INQUIRE:
    if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
    else ret = prism2_ioctl_priv_inquire(dev, (int *) wrq->u.name);
    @@ -4020,11 +4018,31 @@ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
    wrq->u.ap_addr.sa_data);
    break;
    #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
    + default:
    + ret = -EOPNOTSUPP;
    + break;
    + }
    +
    + return ret;
    +}

    +/* Private ioctls that are not used with iwpriv;
    + * in SIOCDEVPRIVATE range */
    +int hostap_siocdevprivate(struct net_device *dev, struct ifreq *ifr,
    + void __user *data, int cmd)
    +{
    + struct iwreq *wrq = (struct iwreq *)ifr;
    + struct hostap_interface *iface;
    + local_info_t *local;
    + int ret = 0;

    - /* Private ioctls that are not used with iwpriv;
    - * in SIOCDEVPRIVATE range */
    + iface = netdev_priv(dev);
    + local = iface->local;
    +
    + if (in_compat_syscall()) /* not implemented yet */
    + return -EOPNOTSUPP;

    + switch (cmd) {
    #ifdef PRISM2_DOWNLOAD_SUPPORT
    case PRISM2_IOCTL_DOWNLOAD:
    if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
    diff --git a/drivers/net/wireless/intersil/hostap/hostap_main.c b/drivers/net/wireless/intersil/hostap/hostap_main.c
    index de97b3304115..54f67b682b6a 100644
    --- a/drivers/net/wireless/intersil/hostap/hostap_main.c
    +++ b/drivers/net/wireless/intersil/hostap/hostap_main.c
    @@ -797,6 +797,7 @@ static const struct net_device_ops hostap_netdev_ops = {
    .ndo_open = prism2_open,
    .ndo_stop = prism2_close,
    .ndo_do_ioctl = hostap_ioctl,
    + .ndo_siocdevprivate = hostap_siocdevprivate,
    .ndo_set_mac_address = prism2_set_mac_address,
    .ndo_set_rx_mode = hostap_set_multicast_list,
    .ndo_tx_timeout = prism2_tx_timeout,
    @@ -809,6 +810,7 @@ static const struct net_device_ops hostap_mgmt_netdev_ops = {
    .ndo_open = prism2_open,
    .ndo_stop = prism2_close,
    .ndo_do_ioctl = hostap_ioctl,
    + .ndo_siocdevprivate = hostap_siocdevprivate,
    .ndo_set_mac_address = prism2_set_mac_address,
    .ndo_set_rx_mode = hostap_set_multicast_list,
    .ndo_tx_timeout = prism2_tx_timeout,
    @@ -821,6 +823,7 @@ static const struct net_device_ops hostap_master_ops = {
    .ndo_open = prism2_open,
    .ndo_stop = prism2_close,
    .ndo_do_ioctl = hostap_ioctl,
    + .ndo_siocdevprivate = hostap_siocdevprivate,
    .ndo_set_mac_address = prism2_set_mac_address,
    .ndo_set_rx_mode = hostap_set_multicast_list,
    .ndo_tx_timeout = prism2_tx_timeout,
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-11-06 23:19    [W:4.146 / U:0.604 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site