From patchwork Thu Mar 12 13:24:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 449463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5068C1400F1 for ; Fri, 13 Mar 2015 00:24:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=bVzioGCk; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id BF1FF2846F9; Thu, 12 Mar 2015 14:24:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D45CF2846F9 for ; Thu, 12 Mar 2015 14:23:58 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 12 Mar 2015 14:23:58 +0100 (CET) Received: by wevl61 with SMTP id l61so16293086wev.10 for ; Thu, 12 Mar 2015 06:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=9Q+XS51oHyRhKgjT/VgVklRN0IQZ1i5yy6aceVyt4qA=; b=bVzioGCkfUbTi6LFicSxTCv418ZIkRv08kdX31c5616cggFH+4qO8jSPZl4vIdMUpT Qd4QUeVn4oGpUwsNVA/PghkWVupBRi35qAcba7RNBqm7hAlhNHw9tPDGoEp0vz2xA9UZ hctCzXMeMU0avdcSLALWE1kJg8yi4kau1rbinCmcLotyTwQz+gHqExdUBEUGHbxfl4LA rjeLvJtkuujERrSAe4sjKVL5ZNeP5qwhZKZJmAQRYF/QYjtzmejqRjw/UczQnNR7KhJ7 Efd/rN6fPKUagCIk4YxAGoMyuEnKCaU4xGrm8TsZ0FXKg1ZYSS1iyXZoKCq9BP13ktDU 6l1w== X-Received: by 10.194.91.129 with SMTP id ce1mr43240639wjb.53.1426166660696; Thu, 12 Mar 2015 06:24:20 -0700 (PDT) Received: from orion.local ([194.105.29.179]) by mx.google.com with ESMTPSA id lb6sm10047061wjb.22.2015.03.12.06.24.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Mar 2015 06:24:20 -0700 (PDT) From: Alexandru Ardelean To: openwrt-devel@lists.openwrt.org Date: Thu, 12 Mar 2015 15:24:11 +0200 Message-Id: <1426166651-27698-1-git-send-email-ardeleanalex@gmail.com> X-Mailer: git-send-email 2.1.2 Subject: [OpenWrt-Devel] [PATCH] lldpd: make LLDP-MED, DOT1 and DOT3 extensions disable-able X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" The names for the config options were taken from lldpd's configure.ac file. Signed-off-by: Alexandru Ardelean --- package/network/services/lldpd/Config.in | 16 ++++++++++++++++ package/network/services/lldpd/Makefile | 3 +++ 2 files changed, 19 insertions(+) diff --git a/package/network/services/lldpd/Config.in b/package/network/services/lldpd/Config.in index c7d4795..a416490 100644 --- a/package/network/services/lldpd/Config.in +++ b/package/network/services/lldpd/Config.in @@ -21,8 +21,24 @@ config LLDPD_WITH_SONMP default y prompt "Enable support for the SynOptics Network Management Protocol" +config LLDPD_WITH_LLDPMED + bool + prompt "Enable LLDP-MED extension" + default y + +config LLDPD_WITH_DOT1 + bool + prompt "Enable Dot1 extension (VLAN stuff)" + default y + +config LLDPD_WITH_DOT3 + bool + prompt "Enable Dot3 extension (PHY stuff)" + default y + config LLDPD_WITH_JSON bool prompt "Enable JSON output for the LLDP Command-Line Interface" default n + endmenu diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile index 5a1921e..6f97f45 100644 --- a/package/network/services/lldpd/Makefile +++ b/package/network/services/lldpd/Makefile @@ -85,6 +85,9 @@ CONFIGURE_ARGS += \ $(if $(CONFIG_LLDPD_WITH_CDP),,--disable-cdp) \ $(if $(CONFIG_LLDPD_WITH_FDP),,--disable-fdp) \ $(if $(CONFIG_LLDPD_WITH_EDP),,--disable-edp) \ + $(if $(CONFIG_LLDPD_WITH_LLDPMED),,--disable-lldpmed) \ + $(if $(CONFIG_LLDPD_WITH_DOT1),,--disable-dot1) \ + $(if $(CONFIG_LLDPD_WITH_DOT3),,--disable-dot3) \ $(if $(CONFIG_LLDPD_WITH_SONMP),,--disable-sonmp) \ $(if $(CONFIG_LLDPD_WITH_JSON),--with-json=json-c)