import 15.2.0 Octopus source

[ceph.git] / ceph / src / seastar / dpdk / drivers / net / sfc / sfc_dp.c

diff --git a/ceph/src/seastar/dpdk/drivers/net/sfc/sfc_dp.c b/ceph/src/seastar/dpdk/drivers/net/sfc/sfc_dp.c
index 860aa9213fd54be9115e0a208bfd6400a8fee955..b121dc098eed713a6ad2521de0cffca79c1261f2 100644 (file)
--- a/ceph/src/seastar/dpdk/drivers/net/sfc/sfc_dp.c
+++ b/ceph/src/seastar/dpdk/drivers/net/sfc/sfc_dp.c
@@ -1,32 +1,10 @@
-/*-
- *   BSD LICENSE
+/* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2017 Solarflare Communications Inc.
+ * Copyright (c) 2017-2018 Solarflare Communications Inc.
  * All rights reserved.
  *
  * This software was jointly developed between OKTET Labs (under contract
  * for Solarflare) and Solarflare Communications, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/queue.h>
@@ -36,6 +14,7 @@
 #include <rte_log.h>
 
 #include "sfc_dp.h"
+#include "sfc_log.h"
 
 void
 sfc_dp_queue_init(struct sfc_dp_queue *dpq, uint16_t port_id, uint16_t queue_id,
@@ -85,8 +64,8 @@ int
 sfc_dp_register(struct sfc_dp_list *head, struct sfc_dp *entry)
 {
        if (sfc_dp_find_by_name(head, entry->type, entry->name) != NULL) {
-               rte_log(RTE_LOG_ERR, RTE_LOGTYPE_PMD,
-                       "sfc %s dapapath '%s' already registered\n",
+               SFC_GENERIC_LOG(ERR,
+                       "sfc %s dapapath '%s' already registered",
                        entry->type == SFC_DP_RX ? "Rx" :
                        entry->type == SFC_DP_TX ? "Tx" :
                        "unknown",