Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4febd649 authored by Priit Laes's avatar Priit Laes Committed by Greg Kroah-Hartman
Browse files

staging: csr: Remove unneeded UF_NETIF_TX_* macros 



Signed-off-by: default avatarPriit Laes <plaes@plaes.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59e6201d

drivers/staging/csr/io.c

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ unregister_unifi_sdio(int bus_id) 
        if(interfacePriv->netdev_registered)

        {

            netif_carrier_off(priv->netdev[interfaceTag]);

            UF_NETIF_TX_STOP_ALL_QUEUES(priv->netdev[interfaceTag]);

            netif_tx_stop_all_queues(priv->netdev[interfaceTag]);

        }

    }

drivers/staging/csr/netdev.c

+3 −3
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ uf_net_open(struct net_device *dev) 
    }

#endif



    UF_NETIF_TX_START_ALL_QUEUES(dev);

    netif_tx_start_all_queues(dev);



    func_exit();

    return 0;
@@ -643,7 +643,7 @@ uf_net_stop(struct net_device *dev) 
    func_enter();

#endif



    UF_NETIF_TX_STOP_ALL_QUEUES(dev);

    netif_tx_stop_all_queues(dev);



    func_exit();

    return 0;
@@ -2977,7 +2977,7 @@ uf_netdev_event(struct notifier_block *notif, unsigned long event, void* ptr) { 
                    interfacePriv->wait_netdev_change ? "" : "not");



        if (interfacePriv->wait_netdev_change) {

            UF_NETIF_TX_WAKE_ALL_QUEUES(priv->netdev[interfacePriv->InterfaceTag]);

            netif_tx_wake_all_queues(priv->netdev[interfacePriv->InterfaceTag]);

            interfacePriv->connected = UnifiConnected;

            interfacePriv->wait_netdev_change = FALSE;

            /* Note: passing the broadcast address here will allow anyone to attempt to join our adhoc network */

drivers/staging/csr/sdio_events.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void unifi_suspend(void *ospriv) 
                unifi_trace(priv, UDBG1, "unifi_suspend: netif_carrier_off");

                netif_carrier_off(priv->netdev[interfaceTag]);

            }

            UF_NETIF_TX_STOP_ALL_QUEUES(priv->netdev[interfaceTag]);

            netif_tx_stop_all_queues(priv->netdev[interfaceTag]);

        }

    }
@@ -119,7 +119,7 @@ void unifi_resume(void *ospriv) 
            if (interfacePriv->netdev_registered == 1)

            {

                netif_carrier_on(priv->netdev[interfaceTag]);

                UF_NETIF_TX_START_ALL_QUEUES(priv->netdev[interfaceTag]);

                netif_tx_start_all_queues(priv->netdev[interfaceTag]);

            }

        }

drivers/staging/csr/sme_sys.c

+3 −3
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ void CsrWifiRouterCtrlMediaStatusReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
#endif

                    unifi_trace(priv, UDBG1,

                                "CsrWifiRouterCtrlMediaStatusReqHandler: AP/P2PGO setting netif_carrier_on\n");

                    UF_NETIF_TX_WAKE_ALL_QUEUES(priv->netdev[req->interfaceTag]);

                    netif_tx_wake_all_queues(priv->netdev[req->interfaceTag]);

                    break;



                default:
@@ -226,7 +226,7 @@ void CsrWifiRouterCtrlMediaStatusReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
                    unifi_trace(priv, UDBG1,

                                "CsrWifiRouterMediaStatusReqHandler: UnifiConnected && netif_carrier_on\n");

                    netif_carrier_on(priv->netdev[req->interfaceTag]);

                    UF_NETIF_TX_WAKE_ALL_QUEUES(priv->netdev[req->interfaceTag]);

                    netif_tx_wake_all_queues(priv->netdev[req->interfaceTag]);

                    uf_process_rx_pending_queue(priv, UF_UNCONTROLLED_PORT_Q, broadcast_address, 1, interfacePriv->InterfaceTag);

                    uf_process_rx_pending_queue(priv, UF_CONTROLLED_PORT_Q, broadcast_address, 1, interfacePriv->InterfaceTag);

                }
@@ -955,7 +955,7 @@ void CsrWifiRouterCtrlWifiOffReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
        netInterface_priv_t *interfacePriv = priv->interfacePriv[i];

        if (interfacePriv->netdev_registered == 1) {

            netif_carrier_off(priv->netdev[i]);

            UF_NETIF_TX_STOP_ALL_QUEUES(priv->netdev[i]);

            netif_tx_stop_all_queues(priv->netdev[i]);

            interfacePriv->connected = UnifiConnectedUnknown;

        }

        interfacePriv->interfaceMode = 0;

drivers/staging/csr/unifi_priv.h

+0 −5
Original line number Diff line number Diff line
@@ -71,11 +71,6 @@ extern struct wake_lock unifi_sdio_wake_lock; 


#include "unifi_clients.h"



#define UF_NETIF_TX_WAKE_ALL_QUEUES(_netdev)    netif_tx_wake_all_queues(_netdev)

#define UF_NETIF_TX_START_ALL_QUEUES(_netdev)   netif_tx_start_all_queues(_netdev)

#define UF_NETIF_TX_STOP_ALL_QUEUES(_netdev)    netif_tx_stop_all_queues(_netdev)





#ifdef CSR_NATIVE_LINUX

#include "sme_native/unifi_native.h"

#else