From patchwork Fri Nov 30 10:14:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 202909 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 184092C0087 for ; Fri, 30 Nov 2012 21:15:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752269Ab2K3KPO (ORCPT ); Fri, 30 Nov 2012 05:15:14 -0500 Received: from contumacia.investici.org ([178.255.144.35]:38452 "EHLO contumacia.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403Ab2K3KPM (ORCPT ); Fri, 30 Nov 2012 05:15:12 -0500 Received: from [178.255.144.35] (contumacia [178.255.144.35]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 1206CE881E; Fri, 30 Nov 2012 10:15:08 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 contumacia.investici.org 1206CE881E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1354270510; bh=76ZrAEhm7mKX9dmXt/77bclGbpdOp8UcuBpqa8j2DNg=; h=From:To:Cc:Subject:Date:Message-Id; b=LkR7u52anDguCBkpGxXWxxe+8iNpKRsdS5XDg1RdquBtZiKoHoGpMkO33lPJLRl/K 5E54h1q7o5bI13ixfttj5dpl9IXHfW9t3DvW5h1L/GmQt/5jLYLr0bycoK6Euhrwcz NdCt5fGegghXhUWvDLEeKakwW8pTdHFAbuhBlExw= From: Antonio Quartulli To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: pull request: batman-adv 2012-11-30 Date: Fri, 30 Nov 2012 11:14:09 +0100 Message-Id: <1354270450-25935-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.8.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Here is a lonely patch intended for net-next/linux-3.8. It it simply adapting the batman-adv code to use the new ETH_P_BATMAN define recently introduced in if_ether.h. Let me know if there is any problem! Thank you, Antonio The following changes since commit bb728820fe7c42fdb838ab2745fb5fe6b18b5ffa: core: make GRO methods static. (2012-11-29 13:18:32 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to af5d4f7737963f2112f148f97c5820425f050650: batman-adv: use ETH_P_BATMAN (2012-11-30 10:50:22 +0100) ---------------------------------------------------------------- Included changes: - Use the new ETH_P_BATMAN define instead of the private BATADV_ETH_P_BATMAN ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: use ETH_P_BATMAN net/batman-adv/hard-interface.c | 3 ++- net/batman-adv/packet.h | 2 -- net/batman-adv/send.c | 6 ++++-- net/batman-adv/soft-interface.c | 9 +++++---- 4 files changed, 11 insertions(+), 9 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