From patchwork Fri Jan 27 14:29:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92657 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230229obz; Fri, 27 Jan 2017 06:33:43 -0800 (PST) X-Received: by 10.36.252.65 with SMTP id b62mr3172454ith.38.1485527623588; Fri, 27 Jan 2017 06:33:43 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t68si1806093ita.12.2017.01.27.06.33.43; Fri, 27 Jan 2017 06:33:43 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0E18160D72; Fri, 27 Jan 2017 14:33:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 1F96E62DFA; Fri, 27 Jan 2017 14:30:06 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0FB1160A27; Fri, 27 Jan 2017 14:29:54 +0000 (UTC) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by lists.linaro.org (Postfix) with ESMTPS id 8051E609AC for ; Fri, 27 Jan 2017 14:29:52 +0000 (UTC) Received: by mail-lf0-f54.google.com with SMTP id x1so76116444lff.0 for ; Fri, 27 Jan 2017 06:29:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=656yjR6JPdxnfMJgtcJYYQhVBPCgvrdsv6/JOruDomE=; b=BMdmd4gpUwWvVTtiuCrs53pXtuA+oT8y3XdmwmswSkMealv1Ir7ikd/jlDGY0Bvqve FW9yRPBqmMZG8qrIeQXXSfxvEwiVC+BViYqPum3v0BTqzqtWqeJ9WRxCcbS9i0A0zHOf XBsczYnGXA/9v91zJsgxKpCYh/EfK7tQxh+6gqtiCR/SsIzBtXaznTQqz7CwBtbqgmWE ktQmC5NH4CiP3KBL76sbLl59Jr/GNySAQEp4RyEgKHQIQHBnHplMDjnOFmzUlI4b331i MP/vmFTysJazrNsZJasqKmGqeqSXE8a98Uy7MGHPG8T2Zw8l/CPGeZEH95BsowNUbekt yaZg== X-Gm-Message-State: AIkVDXKdSInnw/jQBYxnLrLXqFn6kWs7Mlas7wTyJXQFKT9fGI1nc+IjDMQPLp8l8kvbXIZGWKU= X-Received: by 10.46.7.10 with SMTP id 10mr3277111ljh.58.1485527391389; Fri, 27 Jan 2017 06:29:51 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:50 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:12 +0300 Message-Id: <20170127142921.29029-7-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 06/15] merge fix: odp_packet_internal.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- .../linux-generic/include/odp_packet_internal.h | 25 ---------------------- 1 file changed, 25 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 9ba5b58b..c5dc989d 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -185,7 +185,6 @@ typedef struct odp_packet_hdr_t { uint32_t headroom; uint32_t tailroom; -<<<<<<< HEAD /* Fields used to support packet references */ uint32_t unshared_len; struct odp_packet_hdr_t *ref_hdr; @@ -206,21 +205,6 @@ typedef struct odp_packet_hdr_t { /* Classifier destination queue */ odp_queue_t dst_queue; -======= - /* - * Members below are not initialized by packet_init() - */ - - /* Flow hash value */ - uint32_t flow_hash; - - /* Timestamp value */ - odp_time_t timestamp; - - /* Classifier destination queue */ - odp_queue_t dst_queue; - ->>>>>>> v1.13.0.0 /* Result for crypto */ odp_crypto_generic_op_result_t op_result; @@ -258,7 +242,6 @@ static inline odp_packet_hdr_t *odp_packet_last_hdr(odp_packet_t pkt, return pkt_hdr; } -<<<<<<< HEAD static inline odp_packet_hdr_t *odp_packet_prev_hdr(odp_packet_hdr_t *pkt_hdr, odp_packet_hdr_t *cur_hdr, uint32_t *offset) @@ -304,15 +287,10 @@ static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr, static inline void pull_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) { -======= -static inline void pull_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) -{ ->>>>>>> v1.13.0.0 int last = pkt_hdr->buf_hdr.segcount - 1; pkt_hdr->tailroom += len; pkt_hdr->frame_len -= len; -<<<<<<< HEAD pkt_hdr->unshared_len -= len; pkt_hdr->buf_hdr.seg[last].len -= len; } @@ -337,9 +315,6 @@ static inline uint32_t packet_len(odp_packet_hdr_t *pkt_hdr) static inline uint32_t packet_ref_count(odp_packet_hdr_t *pkt_hdr) { return odp_atomic_load_u32(&pkt_hdr->ref_count); -======= - pkt_hdr->buf_hdr.seg[last].len -= len; ->>>>>>> v1.13.0.0 } static inline void packet_ref_count_set(odp_packet_hdr_t *pkt_hdr, uint32_t n)