From patchwork Fri Feb 11 23:21:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 82848 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 E7649B7173 for ; Sat, 12 Feb 2011 10:21:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758454Ab1BKXVu (ORCPT ); Fri, 11 Feb 2011 18:21:50 -0500 Received: from narfation.org ([79.140.41.39]:35952 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758432Ab1BKXVu (ORCPT ); Fri, 11 Feb 2011 18:21:50 -0500 Received: from sven-desktop.home.narfation.org (i59F6C012.versanet.de [89.246.192.18]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 2486A940AE; Sat, 12 Feb 2011 00:21:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1297466500; bh=aETYsRhBGX1EqxvicESk/1jcAhGCyHZK1UV0OBE1gh4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding; b=FHcSUloqHf5yrG/1zefd75VCQcEF5XMfksTaNFbxYe+T82jR4zgCbhWUhXsC7XzIQ 4QPp+Jty+BKvJlbielo4F1cdus8fOepGXxTudAkRi6BNK4gpD+/cwKH0+VEkM9Y0bx HAQIAXH00WSvKwZ7OdgsZKZxrAew20YjbczXolb8= 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-02-12 Date: Sat, 12 Feb 2011 00:21:39 +0100 Message-Id: <1297466503-13246-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.2.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, I would like propose following changes for net-next-2.6.git. Two of them are minor code style changes and the other two change minor issues in the routing/fragmentation code. thanks, Sven The following changes since commit 091b948306d2628320e77977eb7ae4a757b12180: batman-adv: Merge README of v2011.0.0 release (2011-01-31 14:57:13 +0100) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Linus Lüssing (2): batman-adv: Remove duplicate types.h inclusions batman-adv: Disallow originator addressing within mesh layer Marek Lindner (1): batman-adv: Split combined variable declarations Sven Eckelmann (1): batman-adv: Use successive sequence numbers for fragments net/batman-adv/icmp_socket.c | 1 - net/batman-adv/icmp_socket.h | 2 -- net/batman-adv/main.c | 1 - net/batman-adv/routing.c | 1 - net/batman-adv/routing.h | 2 -- net/batman-adv/send.c | 1 - net/batman-adv/send.h | 2 -- net/batman-adv/soft-interface.c | 1 - net/batman-adv/translation-table.c | 1 - net/batman-adv/translation-table.h | 2 -- net/batman-adv/unicast.c | 19 +++++++------------ 11 files changed, 7 insertions(+), 26 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