Re: [PATCH 3/6] mac802154: Use netif flow control
Hello. On 04/02/2013 10:47 PM, Alan Ott wrote: Use netif_stop_queue() and netif_wake_queue() to control the flow of packets to mac802154 devices. Since many IEEE 802.15.4 devices have no output buffer, and since the mac802154 xmit() function is designed to block, netif_stop_queue() is called after each packet. Signed-off-by: Alan Ott --- net/mac802154/tx.c | 16 1 file changed, 16 insertions(+) diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index a248246..fe3e02c 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c [...] @@ -71,6 +73,12 @@ static void mac802154_xmit_worker(struct work_struct *work) out: mutex_unlock(>priv->phy->pib_lock); + /* Restart the netif queue on each sub_if_data object. */ + rcu_read_lock(); + list_for_each_entry_rcu(sdata, >priv->slaves, list) { + netif_wake_queue(sdata->dev); + } Are {} really necessary here? @@ -108,6 +117,13 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, return NETDEV_TX_BUSY; } + /* Stop the netif queue on each sub_if_data object. */ + rcu_read_lock(); + list_for_each_entry_rcu(sdata, >slaves, list) { + netif_stop_queue(sdata->dev); + } And here? WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/6] mac802154: Use netif flow control
Use netif_stop_queue() and netif_wake_queue() to control the flow of packets to mac802154 devices. Since many IEEE 802.15.4 devices have no output buffer, and since the mac802154 xmit() function is designed to block, netif_stop_queue() is called after each packet. Signed-off-by: Alan Ott --- net/mac802154/tx.c | 16 1 file changed, 16 insertions(+) diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index a248246..fe3e02c 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -45,6 +46,7 @@ static void mac802154_xmit_worker(struct work_struct *work) { struct xmit_work *xw = container_of(work, struct xmit_work, work); u8 xmit_attempts = 0; + struct mac802154_sub_if_data *sdata; int res; mutex_lock(>priv->phy->pib_lock); @@ -71,6 +73,12 @@ static void mac802154_xmit_worker(struct work_struct *work) out: mutex_unlock(>priv->phy->pib_lock); + /* Restart the netif queue on each sub_if_data object. */ + rcu_read_lock(); + list_for_each_entry_rcu(sdata, >priv->slaves, list) { + netif_wake_queue(sdata->dev); + } + rcu_read_unlock(); dev_kfree_skb(xw->skb); @@ -81,6 +89,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, u8 page, u8 chan) { struct xmit_work *work; + struct mac802154_sub_if_data *sdata; if (!(priv->phy->channels_supported[page] & (1 << chan))) { WARN_ON(1); @@ -108,6 +117,13 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, return NETDEV_TX_BUSY; } + /* Stop the netif queue on each sub_if_data object. */ + rcu_read_lock(); + list_for_each_entry_rcu(sdata, >slaves, list) { + netif_stop_queue(sdata->dev); + } + rcu_read_unlock(); + INIT_WORK(>work, mac802154_xmit_worker); work->skb = skb; work->priv = priv; -- 1.7.11.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/6] mac802154: Use netif flow control
Use netif_stop_queue() and netif_wake_queue() to control the flow of packets to mac802154 devices. Since many IEEE 802.15.4 devices have no output buffer, and since the mac802154 xmit() function is designed to block, netif_stop_queue() is called after each packet. Signed-off-by: Alan Ott a...@signal11.us --- net/mac802154/tx.c | 16 1 file changed, 16 insertions(+) diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index a248246..fe3e02c 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -25,6 +25,7 @@ #include linux/if_arp.h #include linux/crc-ccitt.h +#include net/ieee802154_netdev.h #include net/mac802154.h #include net/wpan-phy.h @@ -45,6 +46,7 @@ static void mac802154_xmit_worker(struct work_struct *work) { struct xmit_work *xw = container_of(work, struct xmit_work, work); u8 xmit_attempts = 0; + struct mac802154_sub_if_data *sdata; int res; mutex_lock(xw-priv-phy-pib_lock); @@ -71,6 +73,12 @@ static void mac802154_xmit_worker(struct work_struct *work) out: mutex_unlock(xw-priv-phy-pib_lock); + /* Restart the netif queue on each sub_if_data object. */ + rcu_read_lock(); + list_for_each_entry_rcu(sdata, xw-priv-slaves, list) { + netif_wake_queue(sdata-dev); + } + rcu_read_unlock(); dev_kfree_skb(xw-skb); @@ -81,6 +89,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, u8 page, u8 chan) { struct xmit_work *work; + struct mac802154_sub_if_data *sdata; if (!(priv-phy-channels_supported[page] (1 chan))) { WARN_ON(1); @@ -108,6 +117,13 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, return NETDEV_TX_BUSY; } + /* Stop the netif queue on each sub_if_data object. */ + rcu_read_lock(); + list_for_each_entry_rcu(sdata, priv-slaves, list) { + netif_stop_queue(sdata-dev); + } + rcu_read_unlock(); + INIT_WORK(work-work, mac802154_xmit_worker); work-skb = skb; work-priv = priv; -- 1.7.11.2 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/6] mac802154: Use netif flow control
Hello. On 04/02/2013 10:47 PM, Alan Ott wrote: Use netif_stop_queue() and netif_wake_queue() to control the flow of packets to mac802154 devices. Since many IEEE 802.15.4 devices have no output buffer, and since the mac802154 xmit() function is designed to block, netif_stop_queue() is called after each packet. Signed-off-by: Alan Ott a...@signal11.us --- net/mac802154/tx.c | 16 1 file changed, 16 insertions(+) diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index a248246..fe3e02c 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c [...] @@ -71,6 +73,12 @@ static void mac802154_xmit_worker(struct work_struct *work) out: mutex_unlock(xw-priv-phy-pib_lock); + /* Restart the netif queue on each sub_if_data object. */ + rcu_read_lock(); + list_for_each_entry_rcu(sdata, xw-priv-slaves, list) { + netif_wake_queue(sdata-dev); + } Are {} really necessary here? @@ -108,6 +117,13 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, return NETDEV_TX_BUSY; } + /* Stop the netif queue on each sub_if_data object. */ + rcu_read_lock(); + list_for_each_entry_rcu(sdata, priv-slaves, list) { + netif_stop_queue(sdata-dev); + } And here? WBR, Sergei -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/