From patchwork Wed Aug 24 13:00:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 111337 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 693E6B6F64 for ; Wed, 24 Aug 2011 23:00:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751405Ab1HXNAs (ORCPT ); Wed, 24 Aug 2011 09:00:48 -0400 Received: from nm4-vm0.bullet.mail.ukl.yahoo.com ([217.146.183.230]:47429 "HELO nm4-vm0.bullet.mail.ukl.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751090Ab1HXNAr (ORCPT ); Wed, 24 Aug 2011 09:00:47 -0400 Received: from [217.146.183.217] by nm4.bullet.mail.ukl.yahoo.com with NNFMP; 24 Aug 2011 13:00:45 -0000 Received: from [77.238.184.77] by tm10.bullet.mail.ukl.yahoo.com with NNFMP; 24 Aug 2011 13:00:45 -0000 Received: from [127.0.0.1] by smtp146.mail.ukl.yahoo.com with NNFMP; 24 Aug 2011 13:00:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1314190845; bh=GG4A7OXft4xtUdoE2y/4p3u41xnB+lZNufeuKh0tg6w=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=jhZReyrijgP8OObe93R8z1sGPlDt5Gw60ih2V2aKQ4tOxbDKDRqPQF634z1cAmY/S/5xmoy9lYrierdNn8XfRHJ9AqplMHYtOzCHUQfeZCl5gBbCft2ZwNVu8wLdGbFm9IPEzAoXtAk5mT6KKUjuQnZ2sBzBrPNgUZ8jLegTkaI= X-Yahoo-Newman-Id: 901365.81415.bm@smtp146.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: sGgeitQVM1lMoFftEHIo.pC31gdw8oiWdr8Rd7mdYhXUqP8 CTcwTC99Z4ypPFh0THax26O4C5x.CLskHe_Im5qX4UBuJf8s_8T8_wAE5XbG YJ57Qf5xQKPiYuFJrs5aLC2W_odBX.FzrIDATx3EZ_bR1Z1W5lWpYdUcLcRc aB99eQbh7tYOC.RUQZgGDgBesN6LY3ptdqDIDvB2_DCbuq_BTib7vYJTZaYN iwTrihJJ74hVaN8zBrVwCgBi4_sX0Y4lDqPzGtZqUmXw9CjyIFEIn7gC4YUg tGfLu3.Irdu5F8al2zjxW_5Qz2gKgxJBXRpuSFsUzgW.u.jVm6UVmSb0nmcr lQIsq2kNQSW.WxJ97yhPXz9syg6mp6.dAyEiwxEtAfW4D75EQd1NiyVtLSOI RZHlmBwl5NMiXimBD_yG0rIOTkvC1S4ms7gm8OiTZe_Ti6jjsrBPCozs_lAw EtUD5pMRvAaLHBEQ- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@90.61.151.134 with plain) by smtp146.mail.ukl.yahoo.com with SMTP; 24 Aug 2011 13:00:45 +0000 GMT From: Marek Lindner 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-08-24 Date: Wed, 24 Aug 2011 15:00:30 +0200 Message-Id: <1314190838-2273-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, the following 8 patches constitute the first batch I'd like to get the pulled into net-next-2.6/3.2. They bring a new feature (AP isolation on the mesh layer), some minor cleanups, spelling fixes and some additional debugfs output. Thanks, Marek The following changes since commit 322a8b034003c0d46d39af85bf24fee27b902f48: Linux 3.1-rc1 (2011-08-07 18:23:30 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git batman-adv/next Antonio Quartulli (6): batman-adv: hash_add() has to discriminate on the return value batman-adv: correct several typ0s in the comments batman-adv: detect clients connected through a 802.11 device batman-adv: implement AP-isolation on the receiver side batman-adv: implement AP-isolation on the sender side batman-adv: print client flags in the local/global transtables output Marek Lindner (2): batman-adv: reuse tt_len() to calculate tt buffer length batman-adv: merge update_transtable() into tt related code Documentation/ABI/testing/sysfs-class-net-mesh | 8 + net/batman-adv/aggregation.h | 3 +- net/batman-adv/bat_sysfs.c | 2 + net/batman-adv/bitarray.c | 6 +- net/batman-adv/gateway_client.c | 10 +- net/batman-adv/hard-interface.c | 34 ++++- net/batman-adv/hard-interface.h | 1 + net/batman-adv/hash.h | 25 +++- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 6 +- net/batman-adv/originator.c | 2 +- net/batman-adv/packet.h | 1 + net/batman-adv/routing.c | 77 +-------- net/batman-adv/send.c | 10 +- net/batman-adv/soft-interface.c | 13 +- net/batman-adv/translation-table.c | 199 ++++++++++++++++++++---- net/batman-adv/translation-table.h | 21 ++-- net/batman-adv/types.h | 5 +- net/batman-adv/unicast.c | 6 +- net/batman-adv/unicast.h | 2 +- net/batman-adv/vis.c | 6 +- 21 files changed, 291 insertions(+), 148 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