From patchwork Sat May 14 22:16:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 95588 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 5056BB6EF0 for ; Sun, 15 May 2011 08:17:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754988Ab1ENWQq (ORCPT ); Sat, 14 May 2011 18:16:46 -0400 Received: from narfation.org ([79.140.41.39]:45195 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754919Ab1ENWQo (ORCPT ); Sat, 14 May 2011 18:16:44 -0400 Received: from sven-desktop.home.narfation.org (i59F6B9BF.versanet.de [89.246.185.191]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id E46ED940E7; Sun, 15 May 2011 00:17:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1305411421; bh=vIKfpbsyhndALULMefVMhAzA5wm7VB38tv0x0EDAvU0=; h=From:To:Cc:Subject:Date:Message-Id; b=dYC2s1JJB5mG5HeJL6KwBib1j2jL0swLc7rnbj5/QRv1Tj3xOq/bAknssUS9nnnZX aNB+b37NCaNsibHL9RsHn0AspVUHUfyf8238tJBZ5ZkYHKVKvWJVgZEFNttwWxVTTn c0J33ogrQLiHoXAwy9IRj3nqhc0YsdwZdl99TylY= From: Sven Eckelmann To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: pull request: batman-adv 2011-05-14 Date: Sun, 15 May 2011 00:16:32 +0200 Message-Id: <1305411394-28807-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.5.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, I would like tp propose following corrections for net-next-2.6/2.6.40. Both are bug fixes. The first one fixes the regression introduced by "batman-adv: Make bat_priv->primary_if an rcu protected pointer" which prevented that the attached net_devices could be destroyed because the references to them were incorrectly counted. The second one is a bug which may "filled" the broadcast queue when at the same time primary_if got changed and a broadcast was initiated. The queue counter were never reduced because there were no actual packets attached to the the queue. thanks, Sven The following changes since commit 27aea2128ec09924dfe08e97739b2bf8b15c8619: batman-adv: remove duplicate code from function is_bidirectional_neigh() (2011-05-08 16:10:42 +0200) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Marek Lindner (1): batman-adv: reset broadcast flood protection on error Sven Eckelmann (1): batman-adv: Add missing hardif_free_ref in forw_packet_free net/batman-adv/aggregation.c | 14 +++++++++++--- net/batman-adv/send.c | 19 ++++++++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html