Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 66457
b: refs/heads/master
c: 3cf8409
h: refs/heads/master
i:
  66455: 5d6ebcd
v: v3
  • Loading branch information
Holger Schurig authored and David S. Miller committed Oct 10, 2007
1 parent 51fc02c commit 15e4a9f
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c95c7f930ec6fee029c8e7957ab95b3967578070
refs/heads/master: 3cf840914bd467fa4cc76af1a01bba4d2813131c
12 changes: 8 additions & 4 deletions trunk/drivers/net/wireless/libertas/join.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,8 +739,10 @@ int libertas_ret_80211_associate(wlan_private * priv,
netif_carrier_on(priv->dev);
netif_wake_queue(priv->dev);

netif_carrier_on(priv->mesh_dev);
netif_wake_queue(priv->mesh_dev);
if (priv->mesh_dev) {
netif_carrier_on(priv->mesh_dev);
netif_wake_queue(priv->mesh_dev);
}

lbs_deb_join("ASSOC_RESP: Associated \n");

Expand Down Expand Up @@ -827,8 +829,10 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
netif_carrier_on(priv->dev);
netif_wake_queue(priv->dev);

netif_carrier_on(priv->mesh_dev);
netif_wake_queue(priv->mesh_dev);
if (priv->mesh_dev) {
netif_carrier_on(priv->mesh_dev);
netif_wake_queue(priv->mesh_dev);
}

memset(&wrqu, 0, sizeof(wrqu));
memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN);
Expand Down
16 changes: 10 additions & 6 deletions trunk/drivers/net/wireless/libertas/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,12 @@ static int libertas_dev_open(struct net_device *dev)

if (adapter->connect_status == LIBERTAS_CONNECTED) {
netif_carrier_on(priv->dev);
netif_carrier_on(priv->mesh_dev);
if (priv->mesh_dev)
netif_carrier_on(priv->mesh_dev);
} else {
netif_carrier_off(priv->dev);
netif_carrier_off(priv->mesh_dev);
if (priv->mesh_dev)
netif_carrier_off(priv->mesh_dev);
}

lbs_deb_leave(LBS_DEB_NET);
Expand Down Expand Up @@ -408,7 +410,8 @@ static int libertas_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
}

netif_stop_queue(priv->dev);
netif_stop_queue(priv->mesh_dev);
if (priv->mesh_dev)
netif_stop_queue(priv->mesh_dev);

if (libertas_process_tx(priv, skb) == 0)
dev->trans_start = jiffies;
Expand Down Expand Up @@ -474,7 +477,8 @@ static void libertas_tx_timeout(struct net_device *dev)
wake_up_interruptible(&priv->waitq);
} else if (priv->adapter->connect_status == LIBERTAS_CONNECTED) {
netif_wake_queue(priv->dev);
netif_wake_queue(priv->mesh_dev);
if (priv->mesh_dev)
netif_wake_queue(priv->mesh_dev);
}

lbs_deb_leave(LBS_DEB_TX);
Expand Down Expand Up @@ -1254,7 +1258,6 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
ret = 0;
goto done;


err_unregister:
unregister_netdev(mesh_dev);

Expand Down Expand Up @@ -1454,7 +1457,8 @@ void libertas_interrupt(struct net_device *dev)
if (priv->adapter->psstate == PS_STATE_SLEEP) {
priv->adapter->psstate = PS_STATE_AWAKE;
netif_wake_queue(dev);
netif_wake_queue(priv->mesh_dev);
if (priv->mesh_dev)
netif_wake_queue(priv->mesh_dev);
}

wake_up_interruptible(&priv->waitq);
Expand Down
12 changes: 8 additions & 4 deletions trunk/drivers/net/wireless/libertas/scan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,8 +793,10 @@ int wlan_scan_networks(wlan_private * priv,
if (!scancurrentchanonly) {
netif_stop_queue(priv->dev);
netif_carrier_off(priv->dev);
netif_stop_queue(priv->mesh_dev);
netif_carrier_off(priv->mesh_dev);
if (priv->mesh_dev) {
netif_stop_queue(priv->mesh_dev);
netif_carrier_off(priv->mesh_dev);
}
}

ret = wlan_scan_channel_list(priv,
Expand All @@ -820,8 +822,10 @@ int wlan_scan_networks(wlan_private * priv,
if (priv->adapter->connect_status == LIBERTAS_CONNECTED) {
netif_carrier_on(priv->dev);
netif_wake_queue(priv->dev);
netif_carrier_on(priv->mesh_dev);
netif_wake_queue(priv->mesh_dev);
if (priv->mesh_dev) {
netif_carrier_on(priv->mesh_dev);
netif_wake_queue(priv->mesh_dev);
}
}

out:
Expand Down
12 changes: 8 additions & 4 deletions trunk/drivers/net/wireless/libertas/tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
skb_orphan(skb);
/* stop processing outgoing pkts */
netif_stop_queue(priv->dev);
netif_stop_queue(priv->mesh_dev);
if (priv->mesh_dev)
netif_stop_queue(priv->mesh_dev);
/* freeze any packets already in our queues */
priv->adapter->TxLockFlag = 1;
} else {
Expand Down Expand Up @@ -198,10 +199,12 @@ static void wlan_tx_queue(wlan_private *priv, struct sk_buff *skb)
adapter->tx_queue_ps[adapter->tx_queue_idx++] = skb;
if (adapter->tx_queue_idx == NR_TX_QUEUE) {
netif_stop_queue(priv->dev);
netif_stop_queue(priv->mesh_dev);
if (priv->mesh_dev)
netif_stop_queue(priv->mesh_dev);
} else {
netif_start_queue(priv->dev);
netif_start_queue(priv->mesh_dev);
if (priv->mesh_dev)
netif_start_queue(priv->mesh_dev);
}

spin_unlock(&adapter->txqueue_lock);
Expand Down Expand Up @@ -285,7 +288,8 @@ void libertas_send_tx_feedback(wlan_private * priv)
priv->adapter->TxLockFlag = 0;
if (priv->adapter->connect_status == LIBERTAS_CONNECTED) {
netif_wake_queue(priv->dev);
netif_wake_queue(priv->mesh_dev);
if (priv->mesh_dev)
netif_wake_queue(priv->mesh_dev);
}
}
EXPORT_SYMBOL_GPL(libertas_send_tx_feedback);

0 comments on commit 15e4a9f

Please sign in to comment.