Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/14980/?format=api
https://patches.dpdk.org/api/patches/14980/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1469121780-26099-15-git-send-email-ferruh.yigit@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1469121780-26099-15-git-send-email-ferruh.yigit@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1469121780-26099-15-git-send-email-ferruh.yigit@intel.com", "date": "2016-07-21T17:22:53", "name": "[dpdk-dev,RFC,14/21] net/pcap: reorder functions", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "30bab67730ac84b5ad3b875676a52b40cb8482b7", "submitter": { "id": 324, "url": "https://patches.dpdk.org/api/people/324/?format=api", "name": "Ferruh Yigit", "email": "ferruh.yigit@intel.com" }, "delegate": { "id": 10, "url": "https://patches.dpdk.org/api/users/10/?format=api", "username": "bruce", "first_name": "Bruce", "last_name": "Richardson", "email": "bruce.richardson@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1469121780-26099-15-git-send-email-ferruh.yigit@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/14980/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/14980/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 817645A45;\n\tThu, 21 Jul 2016 19:24:59 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id 771A05A30\n\tfor <dev@dpdk.org>; Thu, 21 Jul 2016 19:24:58 +0200 (CEST)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga104.fm.intel.com with ESMTP; 21 Jul 2016 10:24:58 -0700", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga003.jf.intel.com with ESMTP; 21 Jul 2016 10:24:57 -0700", "from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com\n\t[10.237.217.46])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tu6LHOthr017044; Thu, 21 Jul 2016 18:24:56 +0100", "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id u6LHOt0I026308;\n\tThu, 21 Jul 2016 18:24:55 +0100", "(from fyigit@localhost)\n\tby sivswdev02.ir.intel.com with id u6LHOtiW026302;\n\tThu, 21 Jul 2016 18:24:55 +0100" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.28,400,1464678000\"; d=\"scan'208\";a=\"850755908\"", "X-Authentication-Warning": "sivswdev02.ir.intel.com: fyigit set sender to\n\tferruh.yigit@intel.com using -f", "From": "Ferruh Yigit <ferruh.yigit@intel.com>", "To": "dev@dpdk.org", "Cc": "Nicolas Pernas Maradei <nicolas.pernas.maradei@emutex.com>", "Date": "Thu, 21 Jul 2016 18:22:53 +0100", "Message-Id": "<1469121780-26099-15-git-send-email-ferruh.yigit@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1469121780-26099-1-git-send-email-ferruh.yigit@intel.com>", "References": "<1469121780-26099-1-git-send-email-ferruh.yigit@intel.com>", "Subject": "[dpdk-dev] [RFC 14/21] net/pcap: reorder functions", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Reorder functions to be able to remove function declarations in .c file.\nFunction definitions not modified.\n\nSigned-off-by: Ferruh Yigit <ferruh.yigit@intel.com>\n---\n drivers/net/pcap/rte_eth_pcap.c | 129 ++++++++++++++++++++--------------------\n 1 file changed, 64 insertions(+), 65 deletions(-)", "diff": "diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c\nindex a142e38..8e011ea 100644\n--- a/drivers/net/pcap/rte_eth_pcap.c\n+++ b/drivers/net/pcap/rte_eth_pcap.c\n@@ -112,10 +112,6 @@ static const char *valid_arguments[] = {\n \tNULL\n };\n \n-static int open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper);\n-static int open_single_rx_pcap(const char *pcap_filename, pcap_t **pcap);\n-static int open_single_iface(const char *iface, pcap_t **pcap);\n-\n static struct ether_addr eth_addr = { .addr_bytes = { 0, 0, 0, 0x1, 0x2, 0x3 } };\n static const char *drivername = \"Pcap PMD\";\n static struct rte_eth_link pmd_link = {\n@@ -369,6 +365,70 @@ eth_pcap_tx(void *queue,\n \treturn num_tx;\n }\n \n+/*\n+ * pcap_open_live wrapper function\n+ */\n+static inline int\n+open_iface_live(const char *iface, pcap_t **pcap) {\n+\t*pcap = pcap_open_live(iface, RTE_ETH_PCAP_SNAPLEN,\n+\t\t\tRTE_ETH_PCAP_PROMISC, RTE_ETH_PCAP_TIMEOUT, errbuf);\n+\n+\tif (*pcap == NULL) {\n+\t\tRTE_LOG(ERR, PMD, \"Couldn't open %s: %s\\n\", iface, errbuf);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+open_single_iface(const char *iface, pcap_t **pcap)\n+{\n+\tif (open_iface_live(iface, pcap) < 0) {\n+\t\tRTE_LOG(ERR, PMD, \"Couldn't open interface %s\\n\", iface);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper)\n+{\n+\tpcap_t *tx_pcap;\n+\n+\t/*\n+\t * We need to create a dummy empty pcap_t to use it\n+\t * with pcap_dump_open(). We create big enough an Ethernet\n+\t * pcap holder.\n+\t */\n+\tif ((tx_pcap = pcap_open_dead(DLT_EN10MB, RTE_ETH_PCAP_SNAPSHOT_LEN))\n+\t\t\t== NULL) {\n+\t\tRTE_LOG(ERR, PMD, \"Couldn't create dead pcap\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\t/* The dumper is created using the previous pcap_t reference */\n+\tif ((*dumper = pcap_dump_open(tx_pcap, pcap_filename)) == NULL) {\n+\t\tRTE_LOG(ERR, PMD, \"Couldn't open %s for writing.\\n\",\n+\t\t\tpcap_filename);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+open_single_rx_pcap(const char *pcap_filename, pcap_t **pcap)\n+{\n+\tif ((*pcap = pcap_open_offline(pcap_filename, errbuf)) == NULL) {\n+\t\tRTE_LOG(ERR, PMD, \"Couldn't open %s: %s\\n\", pcap_filename, errbuf);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int\n eth_dev_start(struct rte_eth_dev *dev)\n {\n@@ -636,16 +696,6 @@ open_rx_pcap(const char *key, const char *value, void *extra_args)\n \treturn 0;\n }\n \n-static int\n-open_single_rx_pcap(const char *pcap_filename, pcap_t **pcap)\n-{\n-\tif ((*pcap = pcap_open_offline(pcap_filename, errbuf)) == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't open %s: %s\\n\", pcap_filename, errbuf);\n-\t\treturn -1;\n-\t}\n-\treturn 0;\n-}\n-\n /*\n * Opens a pcap file for writing and stores a reference to it\n * for use it later on.\n@@ -670,46 +720,6 @@ open_tx_pcap(const char *key, const char *value, void *extra_args)\n \treturn 0;\n }\n \n-static int\n-open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper)\n-{\n-\tpcap_t *tx_pcap;\n-\t/*\n-\t * We need to create a dummy empty pcap_t to use it\n-\t * with pcap_dump_open(). We create big enough an Ethernet\n-\t * pcap holder.\n-\t */\n-\n-\tif ((tx_pcap = pcap_open_dead(DLT_EN10MB, RTE_ETH_PCAP_SNAPSHOT_LEN))\n-\t\t\t== NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't create dead pcap\\n\");\n-\t\treturn -1;\n-\t}\n-\n-\t/* The dumper is created using the previous pcap_t reference */\n-\tif ((*dumper = pcap_dump_open(tx_pcap, pcap_filename)) == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't open %s for writing.\\n\", pcap_filename);\n-\t\treturn -1;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-/*\n- * pcap_open_live wrapper function\n- */\n-static inline int\n-open_iface_live(const char *iface, pcap_t **pcap) {\n-\t*pcap = pcap_open_live(iface, RTE_ETH_PCAP_SNAPLEN,\n-\t\t\tRTE_ETH_PCAP_PROMISC, RTE_ETH_PCAP_TIMEOUT, errbuf);\n-\n-\tif (*pcap == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't open %s: %s\\n\", iface, errbuf);\n-\t\treturn -1;\n-\t}\n-\treturn 0;\n-}\n-\n /*\n * Opens an interface for reading and writing\n */\n@@ -775,17 +785,6 @@ open_tx_iface(const char *key, const char *value, void *extra_args)\n }\n \n static int\n-open_single_iface(const char *iface, pcap_t **pcap)\n-{\n-\tif (open_iface_live(iface, pcap) < 0) {\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't open interface %s\\n\", iface);\n-\t\treturn -1;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-static int\n rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues,\n \t\tconst unsigned nb_tx_queues, struct pmd_internals **internals,\n \t\tstruct rte_eth_dev **eth_dev)\n", "prefixes": [ "dpdk-dev", "RFC", "14/21" ] }{ "id": 14980, "url": "