remove trailing whitespaces

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

diff --git a/lib/librte_pmd_ixgbe/ixgbe_fdir.c b/lib/librte_pmd_ixgbe/ixgbe_fdir.c
index 3b4f5b7..bf9fe69 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_fdir.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_fdir.c
@@ -1,35 +1,34 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *
+ *   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 
+ *
+ *   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 
+ *
+ *     * 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 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * 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.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * 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 
- *   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 
+ *
+ *   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 <stdio.h>
@@ -183,7 +182,7 @@ ixgbe_fdir_configure(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE();
 
-       if (hw->mac.type != ixgbe_mac_82599EB)
+       if (hw->mac.type != ixgbe_mac_82599EB && hw->mac.type !=ixgbe_mac_X540)
                return -ENOSYS;
 
        err = configure_fdir_flags(&dev->data->dev_conf.fdir_conf, &fdirctrl);
@@ -465,7 +464,7 @@ fdir_add_update_signature_filter(struct rte_eth_dev *dev,
        union ixgbe_atr_input input;
        int err;
 
-       if (hw->mac.type != ixgbe_mac_82599EB)
+       if (hw->mac.type != ixgbe_mac_82599EB && hw->mac.type !=ixgbe_mac_X540)
                return -ENOSYS;
 
        err = fdir_filter_to_atr_input(fdir_filter, &input);
@@ -501,8 +500,8 @@ ixgbe_fdir_update_signature_filter(struct rte_eth_dev *dev,
  * that it can be used for removing signature and perfect filters.
  */
 static s32
-fdir_erase_filter_82599(struct ixgbe_hw *hw, union ixgbe_atr_input *input,
-               uint32_t fdirhash)
+fdir_erase_filter_82599(struct ixgbe_hw *hw,
+       __rte_unused union ixgbe_atr_input *input, uint32_t fdirhash)
 {
        u32 fdircmd = 0;
        u32 retry_count;
@@ -551,7 +550,7 @@ ixgbe_fdir_remove_signature_filter(struct rte_eth_dev *dev,
 
        PMD_INIT_FUNC_TRACE();
 
-       if (hw->mac.type != ixgbe_mac_82599EB)
+       if (hw->mac.type != ixgbe_mac_82599EB && hw->mac.type !=ixgbe_mac_X540)
                return -ENOSYS;
 
        err = fdir_filter_to_atr_input(fdir_filter, &input);
@@ -608,7 +607,7 @@ fdir_set_input_mask_82599(struct ixgbe_hw *hw,
 
        /*
         * Program the relevant mask registers.  If src/dst_port or src/dst_addr
-        * are zero, then assume a full mask for that field.  Also assume that
+        * are zero, then assume a full mask for that field. Also assume that
         * a VLAN of 0 is unspecified, so mask that out as well.  L4type
         * cannot be masked out in this implementation.
         */
@@ -649,10 +648,10 @@ fdir_set_input_mask_82599(struct ixgbe_hw *hw,
 
        if (!input_mask->set_ipv6_mask) {
                /* Store source and destination IPv4 masks (big-endian) */
-       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIP4M,
-                       IXGBE_NTOHL(~input_mask->src_ipv4_mask));
-       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRDIP4M,
-                       IXGBE_NTOHL(~input_mask->dst_ipv4_mask));
+               IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIP4M,
+                               IXGBE_NTOHL(~input_mask->src_ipv4_mask));
+               IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRDIP4M,
+                               IXGBE_NTOHL(~input_mask->dst_ipv4_mask));
        }
        else {
                /* Store source and destination IPv6 masks (bit reversed) */
@@ -675,7 +674,7 @@ ixgbe_fdir_set_masks(struct rte_eth_dev *dev, struct rte_fdir_masks *fdir_masks)
 
        hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-       if (hw->mac.type != ixgbe_mac_82599EB)
+       if (hw->mac.type != ixgbe_mac_82599EB && hw->mac.type !=ixgbe_mac_X540)
                return -ENOSYS;
 
        err = ixgbe_reinit_fdir_tables_82599(hw);
@@ -785,7 +784,7 @@ fdir_add_update_perfect_filter(struct rte_eth_dev *dev,
        union ixgbe_atr_input input;
        int err;
 
-       if (hw->mac.type != ixgbe_mac_82599EB)
+       if (hw->mac.type != ixgbe_mac_82599EB && hw->mac.type !=ixgbe_mac_X540)
                return -ENOSYS;
 
        err = fdir_filter_to_atr_input(fdir_filter, &input);
@@ -837,7 +836,7 @@ ixgbe_fdir_remove_perfect_filter(struct rte_eth_dev *dev,
 
        PMD_INIT_FUNC_TRACE();
 
-       if (hw->mac.type != ixgbe_mac_82599EB)
+       if (hw->mac.type != ixgbe_mac_82599EB && hw->mac.type !=ixgbe_mac_X540)
                return -ENOSYS;
 
        err = fdir_filter_to_atr_input(fdir_filter, &input);
@@ -860,7 +859,7 @@ ixgbe_fdir_info_get(struct rte_eth_dev *dev, struct rte_eth_fdir *fdir)
                        IXGBE_DEV_PRIVATE_TO_FDIR_INFO(dev->data->dev_private);
        uint32_t reg;
 
-       if (hw->mac.type != ixgbe_mac_82599EB)
+       if (hw->mac.type != ixgbe_mac_82599EB && hw->mac.type !=ixgbe_mac_X540)
                return;
 
        /* Get the information from registers */