diff options
| author |   Adham Abozaeid <adham.abozaeid@microchip.com> | 2019-08-01 20:15:11 +0000 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-02 13:56:59 +0200 |
| commit | 4b1b8b08ab9f4db41e30e3a1bbdba1d58aa624a3 (patch) | |
| tree | 3e5c07c8c36355bf346f026affe17395c748ca31 /drivers/staging/wilc1000/wilc_netdev.c | |
| parent | staging: wlan-ng: Remove function prism2mib_excludeunencrypted() (diff) | |
| download | linux-dev-4b1b8b08ab9f4db41e30e3a1bbdba1d58aa624a3.tar.xz linux-dev-4b1b8b08ab9f4db41e30e3a1bbdba1d58aa624a3.zip | |
staging: wilc1000: merge drv_handle and operation_mode wids
wilc_set_wfi_drv_handler and wilc_set_operation_mode sends the same
parameters to the FW, so it's better to combine them together.
Kept wilc_set_wfi_drv_handler implementation since it sends all the
required parameters, and renamed it to wilc_set_operation_mode to be
more descriptive.
Signed-off-by: Adham Abozaeid <adham.abozaeid@microchip.com>
Link: https://lore.kernel.org/r/20190801200909.12605-2-adham.abozaeid@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_netdev.c')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_netdev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/wilc_netdev.c b/drivers/staging/wilc1000/wilc_netdev.c index 68129a0ba55f..57510400f243 100644 --- a/drivers/staging/wilc1000/wilc_netdev.c +++ b/drivers/staging/wilc1000/wilc_netdev.c @@ -626,10 +626,8 @@ static int wilc_mac_open(struct net_device *ndev) return ret; } - wilc_set_wfi_drv_handler(vif, wilc_get_vif_idx(vif), vif->iftype, - vif->idx); - wilc_set_operation_mode(vif, vif->iftype); - + wilc_set_operation_mode(vif, wilc_get_vif_idx(vif), vif->iftype, + vif->idx); wilc_get_mac_address(vif, mac_add); netdev_dbg(ndev, "Mac address: %pM\n", mac_add); ether_addr_copy(ndev->dev_addr, mac_add); |