net/batman-adv/patches/0004-batman-adv_process_broadcast_packets_in_BLA_earlier.patch

   1 From ordex@autistici.org Fri Nov 16 16:49:18 2012
   2 X-Apparently-To: lindner_marek@yahoo.de via 188.125.84.189; Fri, 16 Nov 2012 08:50:26 +0000
   3 Received-SPF: pass (domain of autistici.org designates 178.255.144.35 as permitted sender)
   4 X-YMailISG: qdh1iTQWLDs62bkFFSythfvhHaZxhfpJ5PSKnjpe7hExOA6w
   5  0Hc3JpktYyerT5XQmK0XpfEp9b0El16poZFQ_PqNppiGeXVbVwgYE8uvjLm1
   6  kNwrYEvCc0nHo78mCSQkk_ilI7QHsL0vneWF0aISE9yqNNXjqyQkimfmRRfQ
   7  U7DiQvok4JxuXMCS9G86op0LQLt0H9_iTX8cZbvEXjERIlpIKSVn7PScRlSw
   8  1DwoTaTewPT5dANPP9vv5ABNNcAzPsn1krQ1_.bPyorrDCQBWScspYXaxyD5
   9  WogJDPx5.tpKbyvcx.ke7zNRpChO4Uu5HThhh0y8wZYSWWuo5qqXA82ZHzqT
  10  9ARlQ7Ipvkb18vDmUaLRuCHvsGQh5rSS_ctctbZpvvReA7kOV1y_V_itOE9X
  11  TRJxcQZqqavJUZ0xP9ZAxWc_KiB8BFKwBc_acUbjDr7cRtYLkP89nPFESPH_
  12  zTku3JwOSGw0.s3vGyEqMxTxAuwLfbf.OHLsRH5eaa0FEg2QMvMDJ4rpFTAm
  13  8AW08y0Yas.Do1MFuaqX__dn0dOyzvh_jABfSg2mcBqO5XCgo4JG4HNdDUWN
  14  lc8Z82D1zIRm5XZczZa97xi81_bNB8Gut7deqJLasqjpJ4q4S7NpMUaDDC..
  15  5beC2z.krETtVHhB1JIQl8gOKLgvJBqEcxvxedbqGpV7lbLXSDgqZG.KobYC
  16  j4jsdXWEJV6hBl.mJggEWlcMSAsVI.ZVPqrtOIcdGhBis3KDAwp2ULlj3Iu4
  17  hEwgED_.r_adAqcC1GSqAEIMNF4tvvjsN5GvEcwX2hWnEOYFZ6Kp93SilV1l
  18  D3rXsN_d8M5jVAvbFw7qOYFZ5rCr0LXcNFuclqDJznNsY8xMkhvP0PP53lwU
  19  bpZEVuO2UzqA.r_4SeBTHy7tcDvYXlQlW4Q16xYT6sZrE8dXVMrgSBlOKq5G
  20  1o6N6Xkg2I29H0w.vu2KU6b1WAJlMy2H4dcEv3Zooh5VtQmtYwtmbZDHrIQG
  21  8lJ381Z9jh7pIFCMsp2epxXWbAqkHd6_r6a3lxpHtnHLWI55RWFI5qNxvxQd
  22  bTIgorpXL.WAmwiLv6MNomPSuHdRy_rHIX9R8DljaWlLKdI_uoa_lbrdjblJ
  23  iokyPUKRSx_VKHi.eIfz9JaFOTdJQACoxmSoL391XOewRlctIBRDTvB6yOss
  24  7Nt9dmv0ePFvTJN9euRL
  25 X-Originating-IP: [178.255.144.35]
  26 Authentication-Results: mta1067.mail.ird.yahoo.com  from=autistici.org; domainkeys=neutral (no sig);  from=autistici.org; dkim=pass (ok)
  27 Received: from 127.0.0.1  (EHLO contumacia.investici.org) (178.255.144.35)
  28   by mta1067.mail.ird.yahoo.com with SMTP; Fri, 16 Nov 2012 08:50:26 +0000
  29 Received: from [178.255.144.35] (contumacia [178.255.144.35]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id D78F1E878B;
  30         Fri, 16 Nov 2012 08:50:23 +0000 (UTC)
  31 X-DKIM: Sendmail DKIM Filter v2.8.2 contumacia.investici.org D78F1E878B
  32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
  33         s=stigmate; t=1353055825;
  34         bh=mBzsqJo806YwPoG1l/528KrliiW3q+mkiMzUs+PZfkI=;
  35         h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References;
  36         b=RO+bvxnncVKR0YL3Kl8GMbrFsqGikhqR3MzXRrdYewxnNXaSfY55bVw8C9Av108Id
  37          0FIk7xS/FYydezTX95Ln+kRCU96uKVktfvi9+3M3k5Ht/pAaAnRr5DkQ8AbE8+NFyT
  38          VmQUdEYEqU8x7/DlrMOsrjxyqmA5a5By+75mm5jk=
  39 From: Antonio Quartulli <ordex@autistici.org>
  40 To: davem@davemloft.net
  41 Cc: netdev@vger.kernel.org,
  42  Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>,
  43  Marek Lindner <lindner_marek@yahoo.de>,
  44  Sven Eckelmann <sven@narfation.org>,
  45  Antonio Quartulli <ordex@autistici.org>,
  46  Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
  47 Subject: [PATCH] batman-adv: process broadcast packets in BLA earlier
  48 Date: Fri, 16 Nov 2012 09:49:18 +0100
  49 Message-Id: <1353055758-2901-5-git-send-email-ordex@autistici.org>
  50 X-Mailer: git-send-email 1.8.0
  51 In-Reply-To: <1353055758-2901-1-git-send-email-ordex@autistici.org>
  52 References: <1353055758-2901-1-git-send-email-ordex@autistici.org>
  53 Status: R
  54 X-Status: N
  55 X-KMail-EncryptionState:
  56 X-KMail-SignatureState:
  57 X-KMail-MDN-Sent:
  58
  59 The logic in the BLA mechanism may decide to drop broadcast packets
  60 because the node may still be in the setup phase. For this reason,
  61 further broadcast processing like the early client detection mechanism
  62 must be done only after the BLA check.
  63
  64 This patches moves the invocation to BLA before any other broadcast
  65 processing.
  66
  67 This was introduced 30cfd02b60e1cb16f5effb0a01f826c5bb7e4c59
  68 ("batman-adv: detect not yet announced clients")
  69
  70 Reported-by: Glen Page <glen.page@thet.net>
  71 Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
  72 Signed-off-by: Antonio Quartulli <ordex@autistici.org>
  73 Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
  74 ---
  75  net/batman-adv/soft-interface.c | 12 ++++++------
  76  1 file changed, 6 insertions(+), 6 deletions(-)
  77
  78 diff --git a/soft-interface.c b/soft-interface.c
  79 index b9a28d2..ce0684a 100644
  80 --- a/soft-interface.c
  81 +++ b/soft-interface.c
  82 @@ -325,6 +325,12 @@ void batadv_interface_rx(struct net_device *soft_iface,
  83
  84         soft_iface->last_rx = jiffies;
  85
  86 +       /* Let the bridge loop avoidance check the packet. If will
  87 +        * not handle it, we can safely push it up.
  88 +        */
  89 +       if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))
  90 +               goto out;
  91 +
  92         if (orig_node)
  93                 batadv_tt_add_temporary_global_entry(bat_priv, orig_node,
  94                                                      ethhdr->h_source);
  95 @@ -332,12 +338,6 @@ void batadv_interface_rx(struct net_device *soft_iface,
  96         if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest))
  97                 goto dropped;
  98
  99 -       /* Let the bridge loop avoidance check the packet. If will
 100 -        * not handle it, we can safely push it up.
 101 -        */
 102 -       if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))
 103 -               goto out;
 104 -
 105         netif_rx(skb);
 106         goto out;
 107
 108 --
 109 1.8.0
 110