Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324784
b: refs/heads/master
c: 4febd64
h: refs/heads/master
v: v3
  • Loading branch information
Priit Laes authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent 778b77a commit 6b06399
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 59e6201d383a15e152611d245a7bdc1585b8c59c
refs/heads/master: 4febd649bbaaff71dae4cb7bda5473e92c590e01
2 changes: 1 addition & 1 deletion trunk/drivers/staging/csr/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
}

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/csr/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/csr/sdio_events.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
}

Expand Down Expand Up @@ -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]);
}
}

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/csr/sme_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions trunk/drivers/staging/csr/unifi_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6b06399

Please sign in to comment.