ixgbe: check rxd number to avoid mbuf leak

[dpdk.git] / lib / librte_pmd_ixgbe / ixgbe_bypass.c

diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass.c b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
index c32f5a1..832f415 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_bypass.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   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
@@ -40,20 +40,20 @@
 #define        BYPASS_STATUS_OFF_MASK  3
 
 /* Macros to check for invlaid function pointers. */
-#define        FUNC_PTR_OR_ERR_RET(func, retval) do {             \
-       if ((func) == NULL) {                              \
-               DEBUGOUT("%s:%d function not supported\n", \
-                       __func__, __LINE__);               \
-               return (retval);                           \
-       }                                                  \
+#define        FUNC_PTR_OR_ERR_RET(func, retval) do {              \
+       if ((func) == NULL) {                               \
+               PMD_DRV_LOG(ERR, "%s:%d function not supported", \
+                           __func__, __LINE__);            \
+               return retval;                            \
+       }                                                   \
 } while(0)
 
-#define        FUNC_PTR_OR_RET(func) do {                         \
-       if ((func) == NULL) {                              \
-               DEBUGOUT("%s:%d function not supported\n", \
-                       __func__, __LINE__);               \
-               return;                                    \
-       }                                                  \
+#define        FUNC_PTR_OR_RET(func) do {                          \
+       if ((func) == NULL) {                               \
+               PMD_DRV_LOG(ERR, "%s:%d function not supported", \
+                           __func__, __LINE__);            \
+               return;                                     \
+       }                                                   \
 } while(0)
 
 
@@ -95,9 +95,9 @@ ixgbe_bypass_set_time(struct ixgbe_adapter *adapter)
 }
 
 /**
- * ixgbe_bypass_init - Make some enviroment changes for bypass
+ * ixgbe_bypass_init - Make some environment changes for bypass
  *
- * @adapter: pointer to ixgbe_adapter sturcture for access to state bits
+ * @adapter: pointer to ixgbe_adapter structure for access to state bits
  *
  * This function collects all the modifications needed by the bypass
  * driver.
@@ -114,7 +114,7 @@ ixgbe_bypass_init(struct rte_eth_dev *dev)
        /* Only allow BYPASS ops on the first port */
        if (hw->device_id != IXGBE_DEV_ID_82599_BYPASS ||
                        hw->bus.func != 0) {
-               DEBUGOUT("bypass function is not supported on that device\n");
+               PMD_DRV_LOG(ERR, "bypass function is not supported on that device");
                return;
        }
 
@@ -173,7 +173,7 @@ ixgbe_bypass_state_store(struct rte_eth_dev *dev, u32 *new_state)
        if (ret_val)
                goto exit;
 
-       /* Set AUTO back on so FW can recieve events */
+       /* Set AUTO back on so FW can receive events */
        ret_val = adapter->bps.ops.bypass_set(hw, BYPASS_PAGE_CTL0,
                                         BYPASS_MODE_OFF_M, BYPASS_AUTO);