From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alan Ott Subject: [PATCH 1/6] mac802154: Immediately retry sending failed packets Date: Tue, 2 Apr 2013 14:47:56 -0400 Message-ID: <1364928481-1813-2-git-send-email-alan@signal11.us> References: <1364928481-1813-1-git-send-email-alan@signal11.us> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Alan Ott , netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Alexander Smirnov , Dmitry Eremin-Solenikov , "David S. Miller" Return-path: In-Reply-To: <1364928481-1813-1-git-send-email-alan-yzvJWuRpmD1zbRFIqnYvSA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-zigbee-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: netdev.vger.kernel.org When ops->xmit() fails, immediately retry. Previously the packet was sent to the back of the workqueue. Signed-off-by: Alan Ott --- net/mac802154/tx.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index 4e09d07..fbf937c 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -59,19 +59,18 @@ static void mac802154_xmit_worker(struct work_struct *work) } } - res = xw->priv->ops->xmit(&xw->priv->hw, xw->skb); + do { + res = xw->priv->ops->xmit(&xw->priv->hw, xw->skb); + if (res && ++xw->xmit_attempts >= MAC802154_MAX_XMIT_ATTEMPTS) { + pr_debug("transmission failed for %d times", + MAC802154_MAX_XMIT_ATTEMPTS); + break; + } + } while (res); out: mutex_unlock(&xw->priv->phy->pib_lock); - if (res) { - if (xw->xmit_attempts++ < MAC802154_MAX_XMIT_ATTEMPTS) { - queue_work(xw->priv->dev_workqueue, &xw->work); - return; - } else - pr_debug("transmission failed for %d times", - MAC802154_MAX_XMIT_ATTEMPTS); - } dev_kfree_skb(xw->skb); -- 1.7.11.2 ------------------------------------------------------------------------------ Minimize network downtime and maximize team effectiveness. Reduce network management and security costs.Learn how to hire the most talented Cisco Certified professionals. Visit the Employer Resources Portal http://www.cisco.com/web/learning/employer_resources/index.html