From patchwork Sat May 14 22:16:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 95590 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7F492B6EF0 for ; Sun, 15 May 2011 08:17:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755251Ab1ENWQw (ORCPT ); Sat, 14 May 2011 18:16:52 -0400 Received: from narfation.org ([79.140.41.39]:45203 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755132Ab1ENWQv (ORCPT ); Sat, 14 May 2011 18:16:51 -0400 Received: from sven-desktop.home.narfation.org (i59F6B9BF.versanet.de [89.246.185.191]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 59173940E9; Sun, 15 May 2011 00:17:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1305411429; bh=VUc5fPfgbcIaaqRifMdesqYz1PQX9E8sPgV9Hl+PQdU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=JbyYHAHsPAFHNkbBF5dODTuOq2I2TKtM/SmAPVcug/nrUxW6L5U9Y9t/PsTkhGtR7 DJEa5vjqhLpJGufLgnvWpmhgi19cUIyoVAfleQOrHF5BbQ1yGLIfsD1qg/rKclttHI Fklqd7hnK7AJjTRsMWeNnCvbcXJdDoEMTHntEqrs= From: Sven Eckelmann To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Marek Lindner , Sven Eckelmann Subject: [PATCH 2/2] batman-adv: reset broadcast flood protection on error Date: Sun, 15 May 2011 00:16:34 +0200 Message-Id: <1305411394-28807-3-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1305411394-28807-1-git-send-email-sven@narfation.org> References: <1305411394-28807-1-git-send-email-sven@narfation.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Marek Lindner The broadcast flood protection should be reset to its original value if the primary interface could not be retrieved. Signed-off-by: Marek Lindner Signed-off-by: Sven Eckelmann --- net/batman-adv/send.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 76daa46..3377927 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -421,7 +421,7 @@ int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb) primary_if = primary_if_get_selected(bat_priv); if (!primary_if) - goto out; + goto out_and_inc; forw_packet = kmalloc(sizeof(struct forw_packet), GFP_ATOMIC);