From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by dpdk.org (Postfix) with ESMTP id 67F1A590F for ; Wed, 19 Mar 2014 14:43:01 +0100 (CET) Received: by mail-wg0-f51.google.com with SMTP id k14so7213076wgh.10 for ; Wed, 19 Mar 2014 06:44:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type; bh=yJmNtp76xH1mA4TsROS5l7VIGoFzBOGtedbymR9ivFo=; b=M8WsHU74TRtQS7bhDbLNj4G9OiEjtYgJl8bQWwZN++crfOv7kS8l8CGYJECpTAe2vN lp6A43FQ/jYl2DA+C7jLlRtVlpcA3uurxwL+b9mse19IMgCYowKw3qQq4Rh7Ar9v4kmF OytXaWlT2srfG/IhoRdxENWEg9r6ok+Zb6c9THGYFdUuGNFDbWjSm6tpSLLwxgUftZcU uS+Pe7+ZyS4or4ZB5vDakTbkw3zhlRPebToglA2TMKy4LhgT+pP3/yjiq/UNAgmdhFBv BajO2jn8mu5FQVsiZAsW1egnJ9Pa++8lNkGaO7k7gVGJlFkaWaEK2+FRtxAs+9URXDCG v5FA== X-Gm-Message-State: ALoCoQmN2p6Y3xu2jgTJww0tBalTHT3Nho9GZ7VFNna5IgK8lNqpXQLuxCMBXxVzzWrwAjpwAU4e X-Received: by 10.180.19.130 with SMTP id f2mr19613539wie.6.1395236672719; Wed, 19 Mar 2014 06:44:32 -0700 (PDT) Received: from xps13.localnet (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id fq16sm56125726wjc.3.2014.03.19.06.44.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Mar 2014 06:44:31 -0700 (PDT) From: Thomas Monjalon To: Olivier Matz Date: Wed, 19 Mar 2014 14:44:31 +0100 Message-ID: <1559530.9fFZGPfV9j@xps13> Organization: 6WIND User-Agent: KMail/4.12.3 (Linux/3.13.6-1-ARCH; KDE/4.12.3; x86_64; ; ) In-Reply-To: <1393797088-25730-1-git-send-email-olivier.matz@6wind.com> References: <1393797088-25730-1-git-send-email-olivier.matz@6wind.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Cc: dev@dpdk.org, mirots@gmail.com Subject: Re: [dpdk-dev] [PATCH] pcap: fix compilation error introduced by kvargs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Mar 2014 13:43:01 -0000 02/03/2014 22:51, Olivier Matz : > Due to a merge conflict between commits 4c745617a1 and 9d5752d80, > rte_eth_pcap.c was not compiling with the following error: > > rte_eth_pcap.c: In function 'rte_pmd_init_internals': > rte_eth_pcap.c:559:30: error: dereferencing pointer to incomplete type > rte_eth_pcap.c:560:15: error: dereferencing pointer to incomplete type > rte_eth_pcap.c:561:18: error: dereferencing pointer to incomplete type > rte_eth_pcap.c:603:47: error: dereferencing pointer to incomplete type > rte_eth_pcap.c: In function 'rte_pmd_pcap_init': > rte_eth_pcap.c:732:73: error: 'dict' undeclared (first use in this > function) > rte_eth_pcap.c:732:73: note: each undeclared identifier is reported > only once for each function it appears in > > This commit replaces "struct args_dict" by "struct rte_kvargs" to fix > the compilation issue. > > By the way, it also removes the declaration of these functions from > the header file as no other file in DPDK references one of them. It > avoids to include in rte_eth_pcap.h. > > Pointed-out-by: Meir Tseitlin > Signed-off-by: Olivier Matz I missed it when applying the patches. Sorry for the inconvenience. It's now acked and applied. -- Thomas