remove trailing whitespaces

This commit removes trailing whitespace from lines in files. Almost all
files are affected, as the BSD license copyright header had trailing
whitespace on 4 lines in it [hence the number of files reporting 8 lines
changed in the diffstat].

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
[Thomas: remove spaces before tabs in libs]
[Thomas: remove more trailing spaces in non-C files]
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>

diff --git a/GNUmakefile b/GNUmakefile
index 7afb9ee..d44da43 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/Makefile b/Makefile
index d789491..f4b807e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/app/Makefile b/app/Makefile
index 6267d7b..04417d8 100644 (file)
--- a/app/Makefile
+++ b/app/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/app/cmdline_test/Makefile b/app/cmdline_test/Makefile
index 41f67cf..11c3aba 100644 (file)
--- a/app/cmdline_test/Makefile
+++ b/app/cmdline_test/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/app/cmdline_test/cmdline_test.c b/app/cmdline_test/cmdline_test.c
index 86087f9..716b5f1 100644 (file)
--- a/app/cmdline_test/cmdline_test.c
+++ b/app/cmdline_test/cmdline_test.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/cmdline_test/cmdline_test.h b/app/cmdline_test/cmdline_test.h
index 903c5f6..796fe20 100644 (file)
--- a/app/cmdline_test/cmdline_test.h
+++ b/app/cmdline_test/cmdline_test.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/cmdline_test/cmdline_test.py b/app/cmdline_test/cmdline_test.py
index a6f6154..5d7c7be 100755 (executable)
--- a/app/cmdline_test/cmdline_test.py
+++ b/app/cmdline_test/cmdline_test.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
 #   BSD LICENSE
 #!/usr/bin/python
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/app/cmdline_test/cmdline_test_data.py b/app/cmdline_test/cmdline_test_data.py
index 0721a25..a5d8dd9 100644 (file)
--- a/app/cmdline_test/cmdline_test_data.py
+++ b/app/cmdline_test/cmdline_test_data.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
 #   BSD LICENSE
 #!/usr/bin/python
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/app/cmdline_test/commands.c b/app/cmdline_test/commands.c
index a83ba0d..66c8fb9 100644 (file)
--- a/app/cmdline_test/commands.c
+++ b/app/cmdline_test/commands.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/dump_cfg/Makefile b/app/dump_cfg/Makefile
index 0469d16..4c0714e 100644 (file)
--- a/app/dump_cfg/Makefile
+++ b/app/dump_cfg/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/app/dump_cfg/main.c b/app/dump_cfg/main.c
index e3f7eba..c9b40d1 100644 (file)
--- a/app/dump_cfg/main.c
+++ b/app/dump_cfg/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/dump_cfg/main.h b/app/dump_cfg/main.h
index ce7e697..f54938b 100644 (file)
--- a/app/dump_cfg/main.h
+++ b/app/dump_cfg/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile
index fc58ed9..debf880 100644 (file)
--- a/app/test-pmd/Makefile
+++ b/app/test-pmd/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0be28f6..293c9a7 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.

- * 
+ *

  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
  *   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
  *     * 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


@@ -18,7 +18,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.
  *     * 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
  *   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


@@ -272,10 +272,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "rx_vlan add (vlan_id) port (port_id) vf (vf_mask)\n"
                        "    Add a vlan_id, to the set of VLAN identifiers"
                        "filtered for VF(s) from port_id.\n\n"
                        "rx_vlan add (vlan_id) port (port_id) vf (vf_mask)\n"
                        "    Add a vlan_id, to the set of VLAN identifiers"
                        "filtered for VF(s) from port_id.\n\n"

-                       
+

                        "rx_vlan rm (vlan_id) port (port_id) vf (vf_mask)\n"
                        "    Remove a vlan_id, to the set of VLAN identifiers"
                        "rx_vlan rm (vlan_id) port (port_id) vf (vf_mask)\n"
                        "    Remove a vlan_id, to the set of VLAN identifiers"

-                       "filtered for VF(s) from port_id.\n\n"                  
+                       "filtered for VF(s) from port_id.\n\n"

 
                        "rx_vlan set tpid (value) (port_id)\n"
                        "    Set the outer VLAN TPID for Packet Filtering on"
 
                        "rx_vlan set tpid (value) (port_id)\n"
                        "    Set the outer VLAN TPID for Packet Filtering on"


@@ -309,9 +309,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 
                        "mac_addr add port (port_id) vf (vf_id) (mac_address)\n"
                        "    Add a MAC address for a VF on the port.\n\n"
 
                        "mac_addr add port (port_id) vf (vf_id) (mac_address)\n"
                        "    Add a MAC address for a VF on the port.\n\n"

-                       
+

                        "set port (port_id) uta (mac_address|all) (on|off)\n"
                        "set port (port_id) uta (mac_address|all) (on|off)\n"

-                       "    Add/Remove a or all unicast hash filter(s)" 
+                       "    Add/Remove a or all unicast hash filter(s)"

                        "from port X.\n\n"
 
                        "set promisc (port_id|all) (on|off)\n"
                        "from port X.\n\n"
 
                        "set promisc (port_id|all) (on|off)\n"


@@ -346,8 +346,8 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    BAM:accepts broadcast packets;"
                        "MPE:accepts all multicast packets\n\n"
                        "    Enable/Disable a VF receive mode of a port\n\n"
                        "    BAM:accepts broadcast packets;"
                        "MPE:accepts all multicast packets\n\n"
                        "    Enable/Disable a VF receive mode of a port\n\n"

-                       
-                       "set port (port_id) mirror-rule (rule_id)" 
+
+                       "set port (port_id) mirror-rule (rule_id)"

                        "(pool-mirror|vlan-mirror)\n"
                        " (poolmask|vlanid[,vlanid]*) dst-pool (pool_id) (on|off)\n"
                        "   Set pool or vlan type mirror rule on a port.\n"
                        "(pool-mirror|vlan-mirror)\n"
                        " (poolmask|vlanid[,vlanid]*) dst-pool (pool_id) (on|off)\n"
                        "   Set pool or vlan type mirror rule on a port.\n"


@@ -2927,9 +2927,9 @@ static void cmd_set_burst_tx_retry_parsed(void *parsed_result,
        if (!strcmp(res->set, "set") && !strcmp(res->burst, "burst")
                && !strcmp(res->tx, "tx")) {
                if (!strcmp(res->delay, "delay"))
        if (!strcmp(res->set, "set") && !strcmp(res->burst, "burst")
                && !strcmp(res->tx, "tx")) {
                if (!strcmp(res->delay, "delay"))

-                       burst_tx_delay_time = res->time;        
+                       burst_tx_delay_time = res->time;

                if (!strcmp(res->retry, "retry"))
                if (!strcmp(res->retry, "retry"))

-                       burst_tx_retry_num = res->retry_num;    
+                       burst_tx_retry_num = res->retry_num;

        }
 
 }
        }
 
 }


@@ -4564,15 +4564,15 @@ cmd_set_uc_hash_parsed(void *parsed_result,
 {
        int ret=0;
        struct cmd_set_uc_hash_table *res = parsed_result;
 {
        int ret=0;
        struct cmd_set_uc_hash_table *res = parsed_result;

-       
+

        int is_on = (strcmp(res->mode, "on") == 0) ? 1 : 0;
        int is_on = (strcmp(res->mode, "on") == 0) ? 1 : 0;

-       
+

        if (strcmp(res->what, "uta") == 0)
        if (strcmp(res->what, "uta") == 0)

-               ret = rte_eth_dev_uc_hash_table_set(res->port_id, 
+               ret = rte_eth_dev_uc_hash_table_set(res->port_id,

                                                &res->address,(uint8_t)is_on);
        if (ret < 0)
                printf("bad unicast hash table parameter, return code = %d \n", ret);
                                                &res->address,(uint8_t)is_on);
        if (ret < 0)
                printf("bad unicast hash table parameter, return code = %d \n", ret);

-       
+

 }
 
 cmdline_parse_token_string_t cmd_set_uc_hash_set =
 }
 
 cmdline_parse_token_string_t cmd_set_uc_hash_set =


@@ -4588,7 +4588,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
                                 what, "uta");
 cmdline_parse_token_etheraddr_t cmd_set_uc_hash_mac =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
                                 what, "uta");
 cmdline_parse_token_etheraddr_t cmd_set_uc_hash_mac =

-       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_uc_hash_table, 
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_uc_hash_table,

                                address);
 cmdline_parse_token_string_t cmd_set_uc_hash_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
                                address);
 cmdline_parse_token_string_t cmd_set_uc_hash_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,


@@ -4625,14 +4625,14 @@ cmd_set_uc_all_hash_parsed(void *parsed_result,
 {
        int ret=0;
        struct cmd_set_uc_all_hash_table *res = parsed_result;
 {
        int ret=0;
        struct cmd_set_uc_all_hash_table *res = parsed_result;

-       
+

        int is_on = (strcmp(res->mode, "on") == 0) ? 1 : 0;
        int is_on = (strcmp(res->mode, "on") == 0) ? 1 : 0;

-       
-       if ((strcmp(res->what, "uta") == 0) && 
+
+       if ((strcmp(res->what, "uta") == 0) &&

                (strcmp(res->value, "all") == 0))
                ret = rte_eth_dev_uc_all_hash_table_set(res->port_id,(uint8_t) is_on);
        if (ret < 0)
                (strcmp(res->value, "all") == 0))
                ret = rte_eth_dev_uc_all_hash_table_set(res->port_id,(uint8_t) is_on);
        if (ret < 0)

-               printf("bad unicast hash table parameter," 
+               printf("bad unicast hash table parameter,"

                        "return code = %d \n", ret);
 }
 
                        "return code = %d \n", ret);
 }
 


@@ -4649,7 +4649,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
                                 what, "uta");
 cmdline_parse_token_string_t cmd_set_uc_all_hash_value =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
                                 what, "uta");
 cmdline_parse_token_string_t cmd_set_uc_all_hash_value =

-       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table, 
+       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,

                                value,"all");
 cmdline_parse_token_string_t cmd_set_uc_all_hash_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
                                value,"all");
 cmdline_parse_token_string_t cmd_set_uc_all_hash_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,


@@ -4751,7 +4751,7 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
        int ret;
        uint16_t rx_mode = 0;
        struct cmd_set_vf_rxmode *res = parsed_result;
        int ret;
        uint16_t rx_mode = 0;
        struct cmd_set_vf_rxmode *res = parsed_result;

-       
+

        int is_on = (strcmp(res->on, "on") == 0) ? 1 : 0;
        if (!strcmp(res->what,"rxmode")) {
                if (!strcmp(res->mode, "AUPE"))
        int is_on = (strcmp(res->on, "on") == 0) ? 1 : 0;
        if (!strcmp(res->what,"rxmode")) {
                if (!strcmp(res->mode, "AUPE"))


@@ -4831,7 +4831,7 @@ static void cmd_vf_mac_addr_parsed(void *parsed_result,
        int ret = 0;
 
        if (strcmp(res->what, "add") == 0)
        int ret = 0;
 
        if (strcmp(res->what, "add") == 0)

-               ret = rte_eth_dev_mac_addr_add(res->port_num, 
+               ret = rte_eth_dev_mac_addr_add(res->port_num,

                                        &res->address, res->vf_num);
        if(ret < 0)
                printf("vf_mac_addr_cmd error: (%s)\n", strerror(-ret));
                                        &res->address, res->vf_num);
        if(ret < 0)
                printf("vf_mac_addr_cmd error: (%s)\n", strerror(-ret));


@@ -4842,22 +4842,22 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
                                mac_addr_cmd,"mac_addr");
 cmdline_parse_token_string_t cmd_vf_mac_addr_what =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
                                mac_addr_cmd,"mac_addr");
 cmdline_parse_token_string_t cmd_vf_mac_addr_what =

-       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,

                                what,"add");
 cmdline_parse_token_string_t cmd_vf_mac_addr_port =
                                what,"add");
 cmdline_parse_token_string_t cmd_vf_mac_addr_port =

-       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,

                                port,"port");
 cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =
                                port,"port");
 cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =

-       TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,

                                port_num, UINT8);
 cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
                                port_num, UINT8);
 cmdline_parse_token_string_t cmd_vf_mac_addr_vf =

-       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,

                                vf,"vf");
 cmdline_parse_token_num_t cmd_vf_mac_addr_vfnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
                                vf_num, UINT8);
 cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr =
                                vf,"vf");
 cmdline_parse_token_num_t cmd_vf_mac_addr_vfnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
                                vf_num, UINT8);
 cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr =

-       TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result,

                                address);
 
 cmdline_parse_inst_t cmd_vf_mac_addr_filter = {
                                address);
 
 cmdline_parse_inst_t cmd_vf_mac_addr_filter = {


@@ -5034,7 +5034,7 @@ cmd_set_mirror_mask_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_set_mirror_mask = {
                .f = cmd_set_mirror_mask_parsed,
                .data = NULL,
 cmdline_parse_inst_t cmd_set_mirror_mask = {
                .f = cmd_set_mirror_mask_parsed,
                .data = NULL,

-               .help_str = "set port X mirror-rule Y pool-mirror|vlan-mirror " 
+               .help_str = "set port X mirror-rule Y pool-mirror|vlan-mirror "

                                "pool_mask|vlan_id[,vlan_id]* dst-pool Z on|off",
                .tokens = {
                        (void *)&cmd_mirror_mask_set,
                                "pool_mask|vlan_id[,vlan_id]* dst-pool Z on|off",
                .tokens = {
                        (void *)&cmd_mirror_mask_set,

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index d6291e7..584aeee 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -653,7 +653,7 @@ port_rss_reta_info(portid_t port_id,struct rte_eth_rss_reta *reta_conf)
        uint8_t i,j;
        int ret;
 
        uint8_t i,j;
        int ret;
 

-       if (port_id_is_invalid(port_id)) 
+       if (port_id_is_invalid(port_id))

                return;
 
        ret = rte_eth_dev_rss_reta_query(port_id, reta_conf);
                return;
 
        ret = rte_eth_dev_rss_reta_query(port_id, reta_conf);


@@ -666,14 +666,14 @@ port_rss_reta_info(portid_t port_id,struct rte_eth_rss_reta *reta_conf)
                for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
                        if (reta_conf->mask_lo & (uint64_t)(1ULL << i))
                                printf("RSS RETA configuration: hash index=%d,"
                for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
                        if (reta_conf->mask_lo & (uint64_t)(1ULL << i))
                                printf("RSS RETA configuration: hash index=%d,"

-                                       "queue=%d\n",i,reta_conf->reta[i]);     
+                                       "queue=%d\n",i,reta_conf->reta[i]);

                }
        }
                }
        }

-       
+

        if (reta_conf->mask_hi != 0) {
                for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
                        if(reta_conf->mask_hi & (uint64_t)(1ULL << i)) {
        if (reta_conf->mask_hi != 0) {
                for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
                        if(reta_conf->mask_hi & (uint64_t)(1ULL << i)) {

-                               j = (uint8_t)(i + ETH_RSS_RETA_NUM_ENTRIES/2);          
+                               j = (uint8_t)(i + ETH_RSS_RETA_NUM_ENTRIES/2);

                                printf("RSS RETA configuration: hash index=%d,"
                                        "queue=%d\n",j,reta_conf->reta[j]);
                        }
                                printf("RSS RETA configuration: hash index=%d,"
                                        "queue=%d\n",j,reta_conf->reta[j]);
                        }


@@ -962,13 +962,13 @@ dcb_rxq_2_txq_mapping(queueid_t rxq, queueid_t *txq)
        if(dcb_q_mapping == DCB_4_TCS_Q_MAPPING) {
 
                if (rxq < 32)
        if(dcb_q_mapping == DCB_4_TCS_Q_MAPPING) {
 
                if (rxq < 32)

-                       /* tc0: 0-31 */ 
-                       *txq = rxq;  
+                       /* tc0: 0-31 */
+                       *txq = rxq;

                else if (rxq < 64) {
                else if (rxq < 64) {

-                       /* tc1: 64-95 */ 
+                       /* tc1: 64-95 */

                        *txq =  (uint16_t)(rxq + 32);
                        *txq =  (uint16_t)(rxq + 32);

-               } 
-               else {  
+               }
+               else {

                        /* tc2: 96-111;tc3:112-127 */
                        *txq =  (uint16_t)(rxq/2 + 64);
                }
                        /* tc2: 96-111;tc3:112-127 */
                        *txq =  (uint16_t)(rxq/2 + 64);
                }


@@ -994,7 +994,7 @@ dcb_rxq_2_txq_mapping(queueid_t rxq, queueid_t *txq)
 
 /**
  * For the DCB forwarding test, each core is assigned on every port multi-transmit
 
 /**
  * For the DCB forwarding test, each core is assigned on every port multi-transmit

- * queue. 
+ * queue.

  *
  * Each core is assigned a multi-stream, each stream being composed of
  * a RX queue to poll on a RX port for input messages, associated with
  *
  * Each core is assigned a multi-stream, each stream being composed of
  * a RX queue to poll on a RX port for input messages, associated with


@@ -1006,7 +1006,7 @@ dcb_rxq_2_txq_mapping(queueid_t rxq, queueid_t *txq)
  *    - TxPk = (RxPi + 1) if RxPi is even, (RxPi - 1) if RxPi is odd
  *    - TxQl = RxQj
  * In non-VT mode,
  *    - TxPk = (RxPi + 1) if RxPi is even, (RxPi - 1) if RxPi is odd
  *    - TxQl = RxQj
  * In non-VT mode,

- *    - TxPk = (RxPi + 1) if RxPi is even, (RxPi - 1) if RxPi is odd  
+ *    - TxPk = (RxPi + 1) if RxPi is even, (RxPi - 1) if RxPi is odd

  *    There is a mapping of RxQj to TxQl to be required,and the mapping was implemented
  *    in dcb_rxq_2_txq_mapping function.
  */
  *    There is a mapping of RxQj to TxQl to be required,and the mapping was implemented
  *    in dcb_rxq_2_txq_mapping function.
  */


@@ -1024,7 +1024,7 @@ dcb_fwd_config_setup(void)
 
        cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
        cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 
        cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
        cur_fwd_config.nb_fwd_ports = nb_fwd_ports;

-       cur_fwd_config.nb_fwd_streams = 
+       cur_fwd_config.nb_fwd_streams =

                (streamid_t) (nb_q * cur_fwd_config.nb_fwd_ports);
 
        /* reinitialize forwarding streams */
                (streamid_t) (nb_q * cur_fwd_config.nb_fwd_ports);
 
        /* reinitialize forwarding streams */


@@ -1182,7 +1182,7 @@ fwd_config_display(void)
        if((dcb_config) && (nb_fwd_lcores == 1)) {
                printf("In DCB mode,the nb forwarding cores should be larger than 1\n");
                return;
        if((dcb_config) && (nb_fwd_lcores == 1)) {
                printf("In DCB mode,the nb forwarding cores should be larger than 1\n");
                return;

-       } 
+       }

        fwd_config_setup();
        pkt_fwd_config_display(&cur_fwd_config);
 }
        fwd_config_setup();
        pkt_fwd_config_display(&cur_fwd_config);
 }


@@ -1786,11 +1786,11 @@ fdir_set_masks(portid_t port_id, struct rte_fdir_masks *fdir_masks)
               "diag=%d\n", port_id, diag);
 }
 
               "diag=%d\n", port_id, diag);
 }
 

-void 
+void

 set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on)
 {
        int diag;
 set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on)
 {
        int diag;

-       
+

        if (port_id_is_invalid(port_id))
                return;
        if (is_rx)
        if (port_id_is_invalid(port_id))
                return;
        if (is_rx)


@@ -1799,13 +1799,13 @@ set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on)
                diag = rte_eth_dev_set_vf_tx(port_id,vf,on);
        if (diag == 0)
                return;
                diag = rte_eth_dev_set_vf_tx(port_id,vf,on);
        if (diag == 0)
                return;

-       if(is_rx)       
+       if(is_rx)

                printf("rte_eth_dev_set_vf_rx for port_id=%d failed "
                        "diag=%d\n", port_id, diag);
        else
                printf("rte_eth_dev_set_vf_tx for port_id=%d failed "
                        "diag=%d\n", port_id, diag);
                printf("rte_eth_dev_set_vf_rx for port_id=%d failed "
                        "diag=%d\n", port_id, diag);
        else
                printf("rte_eth_dev_set_vf_tx for port_id=%d failed "
                        "diag=%d\n", port_id, diag);

-               
+

 }
 
 void
 }
 
 void

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 3568ba0..dc2068f 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test-pmd/ieee1588fwd.c b/app/test-pmd/ieee1588fwd.c
index 44f0a89..3ce9979 100644 (file)
--- a/app/test-pmd/ieee1588fwd.c
+++ b/app/test-pmd/ieee1588fwd.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test-pmd/iofwd.c b/app/test-pmd/iofwd.c
index 35348b3..02a5977 100644 (file)
--- a/app/test-pmd/iofwd.c
+++ b/app/test-pmd/iofwd.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test-pmd/macfwd-retry.c b/app/test-pmd/macfwd-retry.c
index 98fc037..f4e06c4 100644 (file)
--- a/app/test-pmd/macfwd-retry.c
+++ b/app/test-pmd/macfwd-retry.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c
index 3099792..fc8f749 100644 (file)
--- a/app/test-pmd/macfwd.c
+++ b/app/test-pmd/macfwd.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test-pmd/mempool_anon.c b/app/test-pmd/mempool_anon.c
index f22e4f9..559a625 100644 (file)
--- a/app/test-pmd/mempool_anon.c
+++ b/app/test-pmd/mempool_anon.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -72,7 +72,7 @@ get_phys_map(void *va, phys_addr_t pa[], uint32_t pg_num, uint32_t pg_sz)
                        "at offset %zu, error code: %d\n",
                        nb, PAGEMAP_FNAME, (size_t)ofs, errno);
                rc = ENOENT;
                        "at offset %zu, error code: %d\n",
                        nb, PAGEMAP_FNAME, (size_t)ofs, errno);
                rc = ENOENT;

-       } 
+       }

 
        close(fd);
 
 
        close(fd);
 


@@ -136,11 +136,11 @@ mempool_anon_create(const char *name, unsigned elt_num, unsigned elt_size,
 
                if ((usz = rte_mempool_xmem_usage(va, elt_num, total_size, pa,
                                pg_num, pg_shift)) < 0) {
 
                if ((usz = rte_mempool_xmem_usage(va, elt_num, total_size, pa,
                                pg_num, pg_shift)) < 0) {

-                       
+

                        n = -usz;
                        rc = ENOENT;
                        RTE_LOG(ERR, USER1, "%s(%s) only %u objects from %u "
                        n = -usz;
                        rc = ENOENT;
                        RTE_LOG(ERR, USER1, "%s(%s) only %u objects from %u "

-                               "requested can  be created over " 
+                               "requested can  be created over "

                                "mmaped region %p of %zu bytes\n",
                                __func__, name, n, elt_num, va, sz);
                } else {
                                "mmaped region %p of %zu bytes\n",
                                __func__, name, n, elt_num, va, sz);
                } else {


@@ -150,7 +150,7 @@ mempool_anon_create(const char *name, unsigned elt_num, unsigned elt_size,
 
                                uv = va + usz;
                                usz = sz - usz;
 
                                uv = va + usz;
                                usz = sz - usz;

-                               
+

                                RTE_LOG(INFO, USER1,
                                        "%s(%s): unmap unused %zu of %zu "
                                        "mmaped bytes @%p\n",
                                RTE_LOG(INFO, USER1,
                                        "%s(%s): unmap unused %zu of %zu "
                                        "mmaped bytes @%p\n",


@@ -159,7 +159,7 @@ mempool_anon_create(const char *name, unsigned elt_num, unsigned elt_size,
                                sz -= usz;
                                pg_num = sz >> pg_shift;
                        }
                                sz -= usz;
                                pg_num = sz >> pg_shift;
                        }

-                       
+

                        if ((mp = rte_mempool_xmem_create(name, elt_num,
                                        elt_size, cache_size, private_data_size,
                                        mp_init, mp_init_arg,
                        if ((mp = rte_mempool_xmem_create(name, elt_num,
                                        elt_size, cache_size, private_data_size,
                                        mp_init, mp_init_arg,


@@ -169,7 +169,7 @@ mempool_anon_create(const char *name, unsigned elt_num, unsigned elt_size,
 
                                RTE_VERIFY(elt_num == mp->size);
                }
 
                                RTE_VERIFY(elt_num == mp->size);
                }

-       } 
+       }

 
        if (mp == NULL) {
                munmap(va, sz);
 
        if (mp == NULL) {
                munmap(va, sz);

diff --git a/app/test-pmd/mempool_osdep.h b/app/test-pmd/mempool_osdep.h
index 9f4a47b..6b8df68 100644 (file)
--- a/app/test-pmd/mempool_osdep.h
+++ b/app/test-pmd/mempool_osdep.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 7a60048..eb14cd3 100644 (file)
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -364,7 +364,7 @@ parse_portnuma_config(const char *q_arg)
                _NUM_FLD
        };
        unsigned long int_fld[_NUM_FLD];
                _NUM_FLD
        };
        unsigned long int_fld[_NUM_FLD];

-       char *str_fld[_NUM_FLD];        
+       char *str_fld[_NUM_FLD];

 
        /* reset from value set at definition */
        while ((p = strchr(p0,'(')) != NULL) {
 
        /* reset from value set at definition */
        while ((p = strchr(p0,'(')) != NULL) {


@@ -417,7 +417,7 @@ parse_ringnuma_config(const char *q_arg)
                _NUM_FLD
        };
        unsigned long int_fld[_NUM_FLD];
                _NUM_FLD
        };
        unsigned long int_fld[_NUM_FLD];

-       char *str_fld[_NUM_FLD];        
+       char *str_fld[_NUM_FLD];

        #define RX_RING_ONLY 0x1
        #define TX_RING_ONLY 0x2
        #define RXTX_RING    0x3
        #define RX_RING_ONLY 0x1
        #define TX_RING_ONLY 0x2
        #define RXTX_RING    0x3


@@ -475,8 +475,8 @@ parse_ringnuma_config(const char *q_arg)
                                ring_flag,port_id);
                        break;
                }
                                ring_flag,port_id);
                        break;
                }

-       }       
-       
+       }
+

        return 0;
 }
 
        return 0;
 }
 


@@ -551,7 +551,7 @@ launch_args_parse(int argc, char** argv)
                { "mp-anon",                    0, 0, 0 },
                { "port-numa-config",           1, 0, 0 },
                { "ring-numa-config",           1, 0, 0 },
                { "mp-anon",                    0, 0, 0 },
                { "port-numa-config",           1, 0, 0 },
                { "ring-numa-config",           1, 0, 0 },

-               { "socket-num",                 1, 0, 0 },      
+               { "socket-num",                 1, 0, 0 },

                { "mbuf-size",                  1, 0, 0 },
                { "total-num-mbufs",            1, 0, 0 },
                { "max-pkt-len",                1, 0, 0 },
                { "mbuf-size",                  1, 0, 0 },
                { "total-num-mbufs",            1, 0, 0 },
                { "max-pkt-len",                1, 0, 0 },

diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c
index 30f8195..5f21a3e 100644 (file)
--- a/app/test-pmd/rxonly.c
+++ b/app/test-pmd/rxonly.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index bc38305..6f71bdb 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -95,10 +95,10 @@ uint8_t auto_start = 0;
 uint8_t numa_support = 0; /**< No numa support by default */
 
 /*
 uint8_t numa_support = 0; /**< No numa support by default */
 
 /*

- * In UMA mode,all memory is allocated from socket 0 if --socket-num is 
+ * In UMA mode,all memory is allocated from socket 0 if --socket-num is

  * not configured.
  */
  * not configured.
  */

-uint8_t socket_num = UMA_NO_CONFIG; 
+uint8_t socket_num = UMA_NO_CONFIG;

 
 /*
  * Use ANONYMOUS mapped memory (might be not physically continuous) for mbufs.
 
 /*
  * Use ANONYMOUS mapped memory (might be not physically continuous) for mbufs.


@@ -178,10 +178,10 @@ uint16_t mb_mempool_cache = DEF_PKT_BURST; /**< Size of mbuf mempool cache. */
 
 /* current configuration is in DCB or not,0 means it is not in DCB mode */
 uint8_t dcb_config = 0;
 
 /* current configuration is in DCB or not,0 means it is not in DCB mode */
 uint8_t dcb_config = 0;

- 
+

 /* Whether the dcb is in testing status */
 uint8_t dcb_test = 0;
 /* Whether the dcb is in testing status */
 uint8_t dcb_test = 0;

- 
+

 /* DCB on and VT on mapping is default */
 enum dcb_queue_mapping_mode dcb_q_mapping = DCB_VT_Q_MAPPING;
 
 /* DCB on and VT on mapping is default */
 enum dcb_queue_mapping_mode dcb_q_mapping = DCB_VT_Q_MAPPING;
 


@@ -273,7 +273,7 @@ uint8_t no_link_check = 0; /* check by default */
 #ifdef RTE_NIC_BYPASS
 
 /* The NIC bypass watchdog timeout. */
 #ifdef RTE_NIC_BYPASS
 
 /* The NIC bypass watchdog timeout. */

-uint32_t bypass_timeout = RTE_BYPASS_TMT_OFF; 
+uint32_t bypass_timeout = RTE_BYPASS_TMT_OFF;

 
 #endif
 
 
 #endif
 


@@ -466,7 +466,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
                                    testpmd_mbuf_pool_ctor, &mbp_ctor_arg,
                                    testpmd_mbuf_ctor, &mb_ctor_arg,
                                    socket_id, 0);
                                    testpmd_mbuf_pool_ctor, &mbp_ctor_arg,
                                    testpmd_mbuf_ctor, &mb_ctor_arg,
                                    socket_id, 0);

-       else 
+       else

                rte_mp = rte_mempool_create(pool_name, nb_mbuf, mb_size,
                                    (unsigned) mb_mempool_cache,
                                    sizeof(struct rte_pktmbuf_pool_private),
                rte_mp = rte_mempool_create(pool_name, nb_mbuf, mb_size,
                                    (unsigned) mb_mempool_cache,
                                    sizeof(struct rte_pktmbuf_pool_private),


@@ -544,13 +544,13 @@ init_config(void)
         * Use the maximum value of nb_rxd and nb_txd here, then nb_rxd and
         * nb_txd can be configured at run time.
         */
         * Use the maximum value of nb_rxd and nb_txd here, then nb_rxd and
         * nb_txd can be configured at run time.
         */

-       if (param_total_num_mbufs) 
+       if (param_total_num_mbufs)

                nb_mbuf_per_pool = param_total_num_mbufs;
        else {
                nb_mbuf_per_pool = RTE_TEST_RX_DESC_MAX + (nb_lcores * mb_mempool_cache)
                                + RTE_TEST_TX_DESC_MAX + MAX_PKT_BURST;
                nb_mbuf_per_pool = param_total_num_mbufs;
        else {
                nb_mbuf_per_pool = RTE_TEST_RX_DESC_MAX + (nb_lcores * mb_mempool_cache)
                                + RTE_TEST_TX_DESC_MAX + MAX_PKT_BURST;

-               
-               if (!numa_support) 
+
+               if (!numa_support)

                        nb_mbuf_per_pool = (nb_mbuf_per_pool * nb_ports);
        }
 
                        nb_mbuf_per_pool = (nb_mbuf_per_pool * nb_ports);
        }
 


@@ -570,13 +570,13 @@ init_config(void)
                rte_exit(EXIT_FAILURE, "rte_zmalloc(%d struct rte_port) "
                                                        "failed\n", nb_ports);
        }
                rte_exit(EXIT_FAILURE, "rte_zmalloc(%d struct rte_port) "
                                                        "failed\n", nb_ports);
        }

-       
+

        for (pid = 0; pid < nb_ports; pid++) {
                port = &ports[pid];
                rte_eth_dev_info_get(pid, &port->dev_info);
 
                if (numa_support) {
        for (pid = 0; pid < nb_ports; pid++) {
                port = &ports[pid];
                rte_eth_dev_info_get(pid, &port->dev_info);
 
                if (numa_support) {

-                       if (port_numa[pid] != NUMA_NO_CONFIG) 
+                       if (port_numa[pid] != NUMA_NO_CONFIG)

                                port_per_socket[port_numa[pid]]++;
                        else {
                                uint32_t socket_id = rte_eth_dev_socket_id(pid);
                                port_per_socket[port_numa[pid]]++;
                        else {
                                uint32_t socket_id = rte_eth_dev_socket_id(pid);


@@ -584,7 +584,7 @@ init_config(void)
                                /* if socket_id is invalid, set to 0 */
                                if (check_socket_id(socket_id) < 0)
                                        socket_id = 0;
                                /* if socket_id is invalid, set to 0 */
                                if (check_socket_id(socket_id) < 0)
                                        socket_id = 0;

-                               port_per_socket[socket_id]++; 
+                               port_per_socket[socket_id]++;

                        }
                }
 
                        }
                }
 


@@ -601,9 +601,9 @@ init_config(void)
                        nb_mbuf_per_pool = nb_mbuf_per_pool/nb_ports;
 
                for (i = 0; i < MAX_SOCKET; i++) {
                        nb_mbuf_per_pool = nb_mbuf_per_pool/nb_ports;
 
                for (i = 0; i < MAX_SOCKET; i++) {

-                       nb_mbuf = (nb_mbuf_per_pool * 
+                       nb_mbuf = (nb_mbuf_per_pool *

                                                port_per_socket[i]);
                                                port_per_socket[i]);

-                       if (nb_mbuf) 
+                       if (nb_mbuf)

                                mbuf_pool_create(mbuf_data_size,
                                                nb_mbuf,i);
                }
                                mbuf_pool_create(mbuf_data_size,
                                                nb_mbuf,i);
                }


@@ -659,10 +659,10 @@ init_fwd_streams(void)
                        }
                }
                else {
                        }
                }
                else {

-                       if (socket_num == UMA_NO_CONFIG)         
+                       if (socket_num == UMA_NO_CONFIG)

                                port->socket_id = 0;
                                port->socket_id = 0;

-                       else 
-                               port->socket_id = socket_num;   
+                       else
+                               port->socket_id = socket_num;

                }
        }
 
                }
        }
 


@@ -1243,7 +1243,7 @@ start_port(portid_t pid)
                printf("Fail from init_fwd_streams()\n");
                return -1;
        }
                printf("Fail from init_fwd_streams()\n");
                return -1;
        }

-       
+

        if(dcb_config)
                dcb_test = 1;
        for (pi = 0; pi < nb_ports; pi++) {
        if(dcb_config)
                dcb_test = 1;
        for (pi = 0; pi < nb_ports; pi++) {


@@ -1281,15 +1281,15 @@ start_port(portid_t pid)
                        /* setup tx queues */
                        for (qi = 0; qi < nb_txq; qi++) {
                                if ((numa_support) &&
                        /* setup tx queues */
                        for (qi = 0; qi < nb_txq; qi++) {
                                if ((numa_support) &&

-                                       (txring_numa[pi] != NUMA_NO_CONFIG)) 
+                                       (txring_numa[pi] != NUMA_NO_CONFIG))

                                        diag = rte_eth_tx_queue_setup(pi, qi,
                                                nb_txd,txring_numa[pi],
                                                &(port->tx_conf));
                                else
                                        diag = rte_eth_tx_queue_setup(pi, qi,
                                                nb_txd,txring_numa[pi],
                                                &(port->tx_conf));
                                else

-                                       diag = rte_eth_tx_queue_setup(pi, qi, 
+                                       diag = rte_eth_tx_queue_setup(pi, qi,

                                                nb_txd,port->socket_id,
                                                &(port->tx_conf));
                                                nb_txd,port->socket_id,
                                                &(port->tx_conf));

-                                       
+

                                if (diag == 0)
                                        continue;
 
                                if (diag == 0)
                                        continue;
 


@@ -1306,9 +1306,9 @@ start_port(portid_t pid)
                        }
                        /* setup rx queues */
                        for (qi = 0; qi < nb_rxq; qi++) {
                        }
                        /* setup rx queues */
                        for (qi = 0; qi < nb_rxq; qi++) {

-                               if ((numa_support) && 
+                               if ((numa_support) &&

                                        (rxring_numa[pi] != NUMA_NO_CONFIG)) {
                                        (rxring_numa[pi] != NUMA_NO_CONFIG)) {

-                                       struct rte_mempool * mp = 
+                                       struct rte_mempool * mp =

                                                mbuf_pool_find(rxring_numa[pi]);
                                        if (mp == NULL) {
                                                printf("Failed to setup RX queue:"
                                                mbuf_pool_find(rxring_numa[pi]);
                                        if (mp == NULL) {
                                                printf("Failed to setup RX queue:"


@@ -1317,13 +1317,13 @@ start_port(portid_t pid)
                                                        rxring_numa[pi]);
                                                return -1;
                                        }
                                                        rxring_numa[pi]);
                                                return -1;
                                        }

-                                       
+

                                        diag = rte_eth_rx_queue_setup(pi, qi,
                                             nb_rxd,rxring_numa[pi],
                                             &(port->rx_conf),mp);
                                }
                                else
                                        diag = rte_eth_rx_queue_setup(pi, qi,
                                             nb_rxd,rxring_numa[pi],
                                             &(port->rx_conf),mp);
                                }
                                else

-                                       diag = rte_eth_rx_queue_setup(pi, qi, 
+                                       diag = rte_eth_rx_queue_setup(pi, qi,

                                             nb_rxd,port->socket_id,
                                             &(port->rx_conf),
                                             mbuf_pool_find(port->socket_id));
                                             nb_rxd,port->socket_id,
                                             &(port->rx_conf),
                                             mbuf_pool_find(port->socket_id));


@@ -1642,7 +1642,7 @@ init_port_config(void)
                        if( port->dev_conf.rx_adv_conf.rss_conf.rss_hf != 0)
                                port->dev_conf.rxmode.mq_mode = ETH_MQ_RX_RSS;
                        else
                        if( port->dev_conf.rx_adv_conf.rss_conf.rss_hf != 0)
                                port->dev_conf.rxmode.mq_mode = ETH_MQ_RX_RSS;
                        else

-                               port->dev_conf.rxmode.mq_mode = ETH_MQ_RX_NONE;        
+                               port->dev_conf.rxmode.mq_mode = ETH_MQ_RX_NONE;

                }
 
                port->rx_conf.rx_thresh = rx_thresh;
                }
 
                port->rx_conf.rx_thresh = rx_thresh;


@@ -1673,7 +1673,7 @@ static  int
 get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
 {
         uint8_t i;
 get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
 {
         uint8_t i;

- 
+

        /*
         * Builds up the correct configuration for dcb+vt based on the vlan tags array
         * given above, and the number of traffic classes available for use.
        /*
         * Builds up the correct configuration for dcb+vt based on the vlan tags array
         * given above, and the number of traffic classes available for use.


@@ -1681,7 +1681,7 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
        if (dcb_conf->dcb_mode == DCB_VT_ENABLED) {
                struct rte_eth_vmdq_dcb_conf vmdq_rx_conf;
                struct rte_eth_vmdq_dcb_tx_conf vmdq_tx_conf;
        if (dcb_conf->dcb_mode == DCB_VT_ENABLED) {
                struct rte_eth_vmdq_dcb_conf vmdq_rx_conf;
                struct rte_eth_vmdq_dcb_tx_conf vmdq_tx_conf;

- 
+

                /* VMDQ+DCB RX and TX configrations */
                vmdq_rx_conf.enable_default_pool = 0;
                vmdq_rx_conf.default_pool = 0;
                /* VMDQ+DCB RX and TX configrations */
                vmdq_rx_conf.enable_default_pool = 0;
                vmdq_rx_conf.default_pool = 0;


@@ -1689,7 +1689,7 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
                        (dcb_conf->num_tcs ==  ETH_4_TCS ? ETH_32_POOLS : ETH_16_POOLS);
                vmdq_tx_conf.nb_queue_pools =
                        (dcb_conf->num_tcs ==  ETH_4_TCS ? ETH_32_POOLS : ETH_16_POOLS);
                        (dcb_conf->num_tcs ==  ETH_4_TCS ? ETH_32_POOLS : ETH_16_POOLS);
                vmdq_tx_conf.nb_queue_pools =
                        (dcb_conf->num_tcs ==  ETH_4_TCS ? ETH_32_POOLS : ETH_16_POOLS);

- 
+

                vmdq_rx_conf.nb_pool_maps = sizeof( vlan_tags )/sizeof( vlan_tags[ 0 ]);
                for (i = 0; i < vmdq_rx_conf.nb_pool_maps; i++) {
                        vmdq_rx_conf.pool_map[i].vlan_id = vlan_tags[ i ];
                vmdq_rx_conf.nb_pool_maps = sizeof( vlan_tags )/sizeof( vlan_tags[ 0 ]);
                for (i = 0; i < vmdq_rx_conf.nb_pool_maps; i++) {
                        vmdq_rx_conf.pool_map[i].vlan_id = vlan_tags[ i ];


@@ -1699,7 +1699,7 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
                        vmdq_rx_conf.dcb_queue[i] = i;
                        vmdq_tx_conf.dcb_queue[i] = i;
                }
                        vmdq_rx_conf.dcb_queue[i] = i;
                        vmdq_tx_conf.dcb_queue[i] = i;
                }

- 
+

                /*set DCB mode of RX and TX of multiple queues*/
                eth_conf->rxmode.mq_mode = ETH_MQ_RX_VMDQ_DCB;
                eth_conf->txmode.mq_mode = ETH_MQ_TX_VMDQ_DCB;
                /*set DCB mode of RX and TX of multiple queues*/
                eth_conf->rxmode.mq_mode = ETH_MQ_RX_VMDQ_DCB;
                eth_conf->txmode.mq_mode = ETH_MQ_TX_VMDQ_DCB;


@@ -1707,7 +1707,7 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT|ETH_DCB_PFC_SUPPORT;
                else
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT;
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT|ETH_DCB_PFC_SUPPORT;
                else
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT;

- 
+

                (void)(rte_memcpy(&eth_conf->rx_adv_conf.vmdq_dcb_conf, &vmdq_rx_conf,
                                 sizeof(struct rte_eth_vmdq_dcb_conf)));
                (void)(rte_memcpy(&eth_conf->tx_adv_conf.vmdq_dcb_tx_conf, &vmdq_tx_conf,
                (void)(rte_memcpy(&eth_conf->rx_adv_conf.vmdq_dcb_conf, &vmdq_rx_conf,
                                 sizeof(struct rte_eth_vmdq_dcb_conf)));
                (void)(rte_memcpy(&eth_conf->tx_adv_conf.vmdq_dcb_tx_conf, &vmdq_tx_conf,


@@ -1716,16 +1716,16 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
        else {
                struct rte_eth_dcb_rx_conf rx_conf;
                struct rte_eth_dcb_tx_conf tx_conf;
        else {
                struct rte_eth_dcb_rx_conf rx_conf;
                struct rte_eth_dcb_tx_conf tx_conf;

- 
+

                /* queue mapping configuration of DCB RX and TX */
                if (dcb_conf->num_tcs == ETH_4_TCS)
                        dcb_q_mapping = DCB_4_TCS_Q_MAPPING;
                else
                        dcb_q_mapping = DCB_8_TCS_Q_MAPPING;
                /* queue mapping configuration of DCB RX and TX */
                if (dcb_conf->num_tcs == ETH_4_TCS)
                        dcb_q_mapping = DCB_4_TCS_Q_MAPPING;
                else
                        dcb_q_mapping = DCB_8_TCS_Q_MAPPING;

- 
+

                rx_conf.nb_tcs = dcb_conf->num_tcs;
                tx_conf.nb_tcs = dcb_conf->num_tcs;
                rx_conf.nb_tcs = dcb_conf->num_tcs;
                tx_conf.nb_tcs = dcb_conf->num_tcs;

- 
+

                for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++){
                        rx_conf.dcb_queue[i] = i;
                        tx_conf.dcb_queue[i] = i;
                for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++){
                        rx_conf.dcb_queue[i] = i;
                        tx_conf.dcb_queue[i] = i;


@@ -1736,7 +1736,7 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT|ETH_DCB_PFC_SUPPORT;
                else
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT;
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT|ETH_DCB_PFC_SUPPORT;
                else
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT;

-                
+

                (void)(rte_memcpy(&eth_conf->rx_adv_conf.dcb_rx_conf, &rx_conf,
                                 sizeof(struct rte_eth_dcb_rx_conf)));
                (void)(rte_memcpy(&eth_conf->tx_adv_conf.dcb_tx_conf, &tx_conf,
                (void)(rte_memcpy(&eth_conf->rx_adv_conf.dcb_rx_conf, &rx_conf,
                                 sizeof(struct rte_eth_dcb_rx_conf)));
                (void)(rte_memcpy(&eth_conf->tx_adv_conf.dcb_tx_conf, &tx_conf,


@@ -1754,25 +1754,25 @@ init_port_dcb_config(portid_t pid,struct dcb_config *dcb_conf)
        int retval;
        uint16_t nb_vlan;
        uint16_t i;
        int retval;
        uint16_t nb_vlan;
        uint16_t i;

- 
+

        /* rxq and txq configuration in dcb mode */
        nb_rxq = 128;
        nb_txq = 128;
        rx_free_thresh = 64;
        /* rxq and txq configuration in dcb mode */
        nb_rxq = 128;
        nb_txq = 128;
        rx_free_thresh = 64;

- 
+

        memset(&port_conf,0,sizeof(struct rte_eth_conf));
        /* Enter DCB configuration status */
        dcb_config = 1;
        memset(&port_conf,0,sizeof(struct rte_eth_conf));
        /* Enter DCB configuration status */
        dcb_config = 1;

- 
+

        nb_vlan = sizeof( vlan_tags )/sizeof( vlan_tags[ 0 ]);
        /*set configuration of DCB in vt mode and DCB in non-vt mode*/
        retval = get_eth_dcb_conf(&port_conf, dcb_conf);
        if (retval < 0)
                return retval;
        nb_vlan = sizeof( vlan_tags )/sizeof( vlan_tags[ 0 ]);
        /*set configuration of DCB in vt mode and DCB in non-vt mode*/
        retval = get_eth_dcb_conf(&port_conf, dcb_conf);
        if (retval < 0)
                return retval;

- 
+

        rte_port = &ports[pid];
        memcpy(&rte_port->dev_conf, &port_conf,sizeof(struct rte_eth_conf));
        rte_port = &ports[pid];
        memcpy(&rte_port->dev_conf, &port_conf,sizeof(struct rte_eth_conf));

- 
+

        rte_port->rx_conf.rx_thresh = rx_thresh;
        rte_port->rx_conf.rx_free_thresh = rx_free_thresh;
        rte_port->tx_conf.tx_thresh = tx_thresh;
        rte_port->rx_conf.rx_thresh = rx_thresh;
        rte_port->rx_conf.rx_free_thresh = rx_free_thresh;
        rte_port->tx_conf.tx_thresh = tx_thresh;


@@ -1783,12 +1783,12 @@ init_port_dcb_config(portid_t pid,struct dcb_config *dcb_conf)
        for (i = 0; i < nb_vlan; i++){
                rx_vft_set(pid, vlan_tags[i], 1);
        }
        for (i = 0; i < nb_vlan; i++){
                rx_vft_set(pid, vlan_tags[i], 1);
        }

- 
+

        rte_eth_macaddr_get(pid, &rte_port->eth_addr);
        map_port_queue_stats_mapping_registers(pid, rte_port);
 
        rte_port->dcb_flag = 1;
        rte_eth_macaddr_get(pid, &rte_port->eth_addr);
        map_port_queue_stats_mapping_registers(pid, rte_port);
 
        rte_port->dcb_flag = 1;

- 
+

        return 0;
 }
 
        return 0;
 }
 

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 0cf5a92..c664f98 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -241,7 +241,7 @@ struct dcb_config {
        enum rte_eth_nb_tcs num_tcs;
        uint8_t pfc_en;
 };
        enum rte_eth_nb_tcs num_tcs;
        uint8_t pfc_en;
 };

- 
+

 /*
  * In DCB io FWD mode, 128 RX queue to 128 TX queue mapping
  */
 /*
  * In DCB io FWD mode, 128 RX queue to 128 TX queue mapping
  */


@@ -287,20 +287,20 @@ extern uint32_t bypass_timeout; /**< Store the NIC bypass watchdog timeout */
 #define MAX_SOCKET 2 /*MAX SOCKET:currently, it is 2 */
 
 /*
 #define MAX_SOCKET 2 /*MAX SOCKET:currently, it is 2 */
 
 /*

- * Store specified sockets on which memory pool to be used by ports 
- * is allocated. 
+ * Store specified sockets on which memory pool to be used by ports
+ * is allocated.

  */
 uint8_t port_numa[RTE_MAX_ETHPORTS];
 
 /*
  * Store specified sockets on which RX ring to be used by ports
  */
 uint8_t port_numa[RTE_MAX_ETHPORTS];
 
 /*
  * Store specified sockets on which RX ring to be used by ports

- * is allocated. 
+ * is allocated.

  */
 uint8_t rxring_numa[RTE_MAX_ETHPORTS];
 
 /*
  * Store specified sockets on which TX ring to be used by ports
  */
 uint8_t rxring_numa[RTE_MAX_ETHPORTS];
 
 /*
  * Store specified sockets on which TX ring to be used by ports

- * is allocated. 
+ * is allocated.

  */
 uint8_t txring_numa[RTE_MAX_ETHPORTS];
 
  */
 uint8_t txring_numa[RTE_MAX_ETHPORTS];
 


@@ -525,7 +525,7 @@ void fdir_remove_perfect_filter(portid_t port_id, uint16_t soft_id,
 void fdir_set_masks(portid_t port_id, struct rte_fdir_masks *fdir_masks);
 void port_rss_reta_info(portid_t port_id, struct rte_eth_rss_reta *reta_conf);
 void set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on);
 void fdir_set_masks(portid_t port_id, struct rte_fdir_masks *fdir_masks);
 void port_rss_reta_info(portid_t port_id, struct rte_eth_rss_reta *reta_conf);
 void set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on);

-void set_vf_rx_vlan(portid_t port_id, uint16_t vlan_id, 
+void set_vf_rx_vlan(portid_t port_id, uint16_t vlan_id,

                uint64_t vf_mask, uint8_t on);
 
 void port_rss_hash_conf_show(portid_t port_id, int show_rss_key);
                uint64_t vf_mask, uint8_t on);
 
 void port_rss_hash_conf_show(portid_t port_id, int show_rss_key);

diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c
index 5bbd34f..ef93741 100644 (file)
--- a/app/test-pmd/txonly.c
+++ b/app/test-pmd/txonly.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/Makefile b/app/test/Makefile
index b49785e..77c1aa9 100644 (file)
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/app/test/autotest.py b/app/test/autotest.py
index d6bb25d..f7056a3 100644 (file)
--- a/app/test/autotest.py
+++ b/app/test/autotest.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
 #   BSD LICENSE
 #!/usr/bin/python
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py
index af6ed5a..d0c55c8 100644 (file)
--- a/app/test/autotest_data.py
+++ b/app/test/autotest_data.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
 #   BSD LICENSE
 #!/usr/bin/python
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/app/test/autotest_runner.py b/app/test/autotest_runner.py
index 5cb700c..9698ddc 100644 (file)
--- a/app/test/autotest_runner.py
+++ b/app/test/autotest_runner.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
 #   BSD LICENSE
 #!/usr/bin/python
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/app/test/autotest_test_funcs.py b/app/test/autotest_test_funcs.py
index 9b7e4a1..b070644 100644 (file)
--- a/app/test/autotest_test_funcs.py
+++ b/app/test/autotest_test_funcs.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
 #   BSD LICENSE
 #!/usr/bin/python
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/app/test/commands.c b/app/test/commands.c
index efa8566..d605b6d 100644 (file)
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.

- * 
+ *

  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
  *   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
  *     * 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


@@ -18,7 +18,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.
  *     * 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
  *   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

diff --git a/app/test/process.h b/app/test/process.h
index dcfda20..ee9fda6 100644 (file)
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test.c b/app/test/test.c
index 079d5c1..516829d 100644 (file)
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test.h b/app/test/test.h
index 1945d29..7f1c5c5 100644 (file)
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 790cdf3..97cf1fb 100644 (file)
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_acl.h b/app/test/test_acl.h
index 97554a4..4af457d 100644 (file)
--- a/app/test/test_acl.h
+++ b/app/test/test_acl.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_alarm.c b/app/test/test_alarm.c
index a2462ae..d5bea5e 100644 (file)
--- a/app/test/test_alarm.c
+++ b/app/test/test_alarm.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_atomic.c b/app/test/test_atomic.c
index 896a28b..141cc22 100644 (file)
--- a/app/test/test_atomic.c
+++ b/app/test/test_atomic.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_byteorder.c b/app/test/test_byteorder.c
index 598c5c2..38f8d39 100644 (file)
--- a/app/test/test_byteorder.c
+++ b/app/test/test_byteorder.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cmdline.c b/app/test/test_cmdline.c
index 3df2d29..77475c4 100644 (file)
--- a/app/test/test_cmdline.c
+++ b/app/test/test_cmdline.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cmdline.h b/app/test/test_cmdline.h
index 6e8290a..0ee91c1 100644 (file)
--- a/app/test/test_cmdline.h
+++ b/app/test/test_cmdline.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cmdline_cirbuf.c b/app/test/test_cmdline_cirbuf.c
index 0dc8b8d..bf5d68a 100644 (file)
--- a/app/test/test_cmdline_cirbuf.c
+++ b/app/test/test_cmdline_cirbuf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cmdline_etheraddr.c b/app/test/test_cmdline_etheraddr.c
index 443717b..c67a0a5 100644 (file)
--- a/app/test/test_cmdline_etheraddr.c
+++ b/app/test/test_cmdline_etheraddr.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c
index c809411..0fd61e8 100644 (file)
--- a/app/test/test_cmdline_ipaddr.c
+++ b/app/test/test_cmdline_ipaddr.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -630,7 +630,7 @@ test_parse_ipaddr_invalid_data(void)
        int ret;
 
        memset(&result, 0, sizeof(result));
        int ret;
 
        memset(&result, 0, sizeof(result));

-       
+

        /* test invalid strings */
        for (i = 0; i < IPADDR_INVALID_STRS_SIZE; i++) {
 
        /* test invalid strings */
        for (i = 0; i < IPADDR_INVALID_STRS_SIZE; i++) {
 

diff --git a/app/test/test_cmdline_lib.c b/app/test/test_cmdline_lib.c
index e70f22e..65b823a 100644 (file)
--- a/app/test/test_cmdline_lib.c
+++ b/app/test/test_cmdline_lib.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c
index defebb5..35f01a8 100644 (file)
--- a/app/test/test_cmdline_num.c
+++ b/app/test/test_cmdline_num.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cmdline_portlist.c b/app/test/test_cmdline_portlist.c
index 7ce735b..abba008 100644 (file)
--- a/app/test/test_cmdline_portlist.c
+++ b/app/test/test_cmdline_portlist.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cmdline_string.c b/app/test/test_cmdline_string.c
index 542251e..4f3d63e 100644 (file)
--- a/app/test/test_cmdline_string.c
+++ b/app/test/test_cmdline_string.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_common.c b/app/test/test_common.c
index 5481abd..628201b 100644 (file)
--- a/app/test/test_common.c
+++ b/app/test/test_common.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cpuflags.c b/app/test/test_cpuflags.c
index 9cfbec6..cb49384 100644 (file)
--- a/app/test/test_cpuflags.c
+++ b/app/test/test_cpuflags.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_cycles.c b/app/test/test_cycles.c
index db8e58d..b8d66a0 100644 (file)
--- a/app/test/test_cycles.c
+++ b/app/test/test_cycles.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_debug.c b/app/test/test_debug.c
index ae7be52..135b75d 100644 (file)
--- a/app/test/test_debug.c
+++ b/app/test/test_debug.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 195a1f5..298c11a 100644 (file)
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.

- * 
+ *

  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
  *   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
  *     * 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


@@ -18,7 +18,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.
  *     * 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
  *   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


@@ -162,7 +162,7 @@ process_hugefiles(const char * prefix, enum hugepage_action action)
 
                                        rte_snprintf(file_path, sizeof(file_path),
                                                "%s/%s", hugedir, dirent->d_name);
 
                                        rte_snprintf(file_path, sizeof(file_path),
                                                "%s/%s", hugedir, dirent->d_name);

-                                       
+

                                        /* remove file */
                                        if (remove(file_path) < 0) {
                                                printf("Error deleting %s - %s!\n",
                                        /* remove file */
                                        if (remove(file_path) < 0) {
                                                printf("Error deleting %s - %s!\n",


@@ -668,7 +668,7 @@ test_dom0_misc_flags(void)
                printf("Error - process did not run ok with --no-shconf flag\n");
                return -1;
        }
                printf("Error - process did not run ok with --no-shconf flag\n");
                return -1;
        }

-       
+

        return 0;
 }
 #else
        return 0;
 }
 #else

diff --git a/app/test/test_eal_fs.c b/app/test/test_eal_fs.c
index 2c4bdc6..cc0afdf 100644 (file)
--- a/app/test/test_eal_fs.c
+++ b/app/test/test_eal_fs.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_errno.c b/app/test/test_errno.c
index 5ebc8ab..6533e53 100644 (file)
--- a/app/test/test_errno.c
+++ b/app/test/test_errno.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c
index 367050a..501b237 100644 (file)
--- a/app/test/test_func_reentrancy.c
+++ b/app/test/test_func_reentrancy.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -92,7 +92,7 @@ static rte_atomic32_t synchro = RTE_ATOMIC32_INIT(0);
 } while(0)
 
 /*
 } while(0)
 
 /*

- * rte_eal_init only init once 
+ * rte_eal_init only init once

  */
 static int
 test_eal_init_once(__attribute__((unused)) void *arg)
  */
 static int
 test_eal_init_once(__attribute__((unused)) void *arg)


@@ -119,7 +119,7 @@ ring_create_lookup(__attribute__((unused)) void *arg)
        int i;
 
        WAIT_SYNCHRO_FOR_SLAVES();
        int i;
 
        WAIT_SYNCHRO_FOR_SLAVES();

-       
+

        /* create the same ring simultaneously on all threads */
        for (i = 0; i < MAX_ITER_TIMES; i++) {
                rp = rte_ring_create("fr_test_once", 4096, SOCKET_ID_ANY, 0);
        /* create the same ring simultaneously on all threads */
        for (i = 0; i < MAX_ITER_TIMES; i++) {
                rp = rte_ring_create("fr_test_once", 4096, SOCKET_ID_ANY, 0);


@@ -235,7 +235,7 @@ hash_create_free(__attribute__((unused)) void *arg)
        };
 
        WAIT_SYNCHRO_FOR_SLAVES();
        };
 
        WAIT_SYNCHRO_FOR_SLAVES();

-       
+

        /* create the same hash simultaneously on all threads */
        hash_params.name = "fr_test_once";
        for (i = 0; i < MAX_ITER_TIMES; i++) {
        /* create the same hash simultaneously on all threads */
        hash_params.name = "fr_test_once";
        for (i = 0; i < MAX_ITER_TIMES; i++) {


@@ -250,7 +250,7 @@ hash_create_free(__attribute__((unused)) void *arg)
                hash_params.name = hash_name;
 
                handle = rte_hash_create(&hash_params);
                hash_params.name = hash_name;
 
                handle = rte_hash_create(&hash_params);

-               if (NULL == handle) 
+               if (NULL == handle)

                        return -1;
 
                /* verify correct existing and then free all */
                        return -1;
 
                /* verify correct existing and then free all */


@@ -303,7 +303,7 @@ fbk_create_free(__attribute__((unused)) void *arg)
        };
 
        WAIT_SYNCHRO_FOR_SLAVES();
        };
 
        WAIT_SYNCHRO_FOR_SLAVES();

-       
+

        /* create the same fbk hash table simultaneously on all threads */
        fbk_params.name = "fr_test_once";
        for (i = 0; i < MAX_ITER_TIMES; i++) {
        /* create the same fbk hash table simultaneously on all threads */
        fbk_params.name = "fr_test_once";
        for (i = 0; i < MAX_ITER_TIMES; i++) {


@@ -319,7 +319,7 @@ fbk_create_free(__attribute__((unused)) void *arg)
 
                handle = rte_fbk_hash_create(&fbk_params);
                if (NULL == handle)
 
                handle = rte_fbk_hash_create(&fbk_params);
                if (NULL == handle)

-                       return -1;      
+                       return -1;

 
                /* verify correct existing and then free all */
                if (handle != rte_fbk_hash_find_existing(fbk_name))
 
                /* verify correct existing and then free all */
                if (handle != rte_fbk_hash_find_existing(fbk_name))


@@ -365,7 +365,7 @@ lpm_create_free(__attribute__((unused)) void *arg)
        int i;
 
        WAIT_SYNCHRO_FOR_SLAVES();
        int i;
 
        WAIT_SYNCHRO_FOR_SLAVES();

-       
+

        /* create the same lpm simultaneously on all threads */
        for (i = 0; i < MAX_ITER_TIMES; i++) {
                lpm = rte_lpm_create("fr_test_once",  SOCKET_ID_ANY, 4, RTE_LPM_HEAP);
        /* create the same lpm simultaneously on all threads */
        for (i = 0; i < MAX_ITER_TIMES; i++) {
                lpm = rte_lpm_create("fr_test_once",  SOCKET_ID_ANY, 4, RTE_LPM_HEAP);


@@ -378,7 +378,7 @@ lpm_create_free(__attribute__((unused)) void *arg)
                rte_snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_self, i);
                lpm = rte_lpm_create(lpm_name, SOCKET_ID_ANY, 4, RTE_LPM_HEAP);
                if (NULL == lpm)
                rte_snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_self, i);
                lpm = rte_lpm_create(lpm_name, SOCKET_ID_ANY, 4, RTE_LPM_HEAP);
                if (NULL == lpm)

-                       return -1;      
+                       return -1;

 
                /* verify correct existing and then free all */
                if (lpm != rte_lpm_find_existing(lpm_name))
 
                /* verify correct existing and then free all */
                if (lpm != rte_lpm_find_existing(lpm_name))


@@ -419,8 +419,8 @@ struct test_case test_cases[] = {
 #endif /* RTE_LIBRTE_LPM */
 };
 
 #endif /* RTE_LIBRTE_LPM */
 };
 

-/** 
- * launch test case in two separate thread 
+/**
+ * launch test case in two separate thread

  */
 static int
 launch_test(struct test_case *pt_case)
  */
 static int
 launch_test(struct test_case *pt_case)


@@ -454,11 +454,11 @@ launch_test(struct test_case *pt_case)
                cores--;
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        ret = -1;
                cores--;
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        ret = -1;

-               
+

                if (pt_case->clean != NULL)
                        pt_case->clean(lcore_id);
        }
                if (pt_case->clean != NULL)
                        pt_case->clean(lcore_id);
        }

-       
+

        return ret;
 }
 
        return ret;
 }
 


@@ -482,7 +482,7 @@ test_func_reentrancy(void)
                pt_case = &test_cases[case_id];
                if (pt_case->func == NULL)
                        continue;
                pt_case = &test_cases[case_id];
                if (pt_case->func == NULL)
                        continue;

-                      
+

                if (launch_test(pt_case) < 0) {
                        printf("Func-ReEnt CASE %"PRIu32": %s FAIL\n", case_id, pt_case->name);
                        return -1;
                if (launch_test(pt_case) < 0) {
                        printf("Func-ReEnt CASE %"PRIu32": %s FAIL\n", case_id, pt_case->name);
                        return -1;

diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index df0afba..87de3c6 100644 (file)
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c
index a4f144b..17d3795 100644 (file)
--- a/app/test/test_hash_perf.c
+++ b/app/test/test_hash_perf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_ivshmem.c b/app/test/test_ivshmem.c
index 5014cbb..227bba9 100644 (file)
--- a/app/test/test_ivshmem.c
+++ b/app/test/test_ivshmem.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_kni.c b/app/test/test_kni.c
index d37758b..a870dd5 100644 (file)
--- a/app/test/test_kni.c
+++ b/app/test/test_kni.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -144,7 +144,7 @@ static int
 kni_change_mtu(uint8_t port_id, unsigned new_mtu)
 {
        printf("Change MTU of port %d to %u\n", port_id, new_mtu);
 kni_change_mtu(uint8_t port_id, unsigned new_mtu)
 {
        printf("Change MTU of port %d to %u\n", port_id, new_mtu);

-       kni_pkt_mtu = new_mtu;  
+       kni_pkt_mtu = new_mtu;

        printf("Change MTU of port %d to %i successfully.\n",
                                         port_id, kni_pkt_mtu);
        return 0;
        printf("Change MTU of port %d to %i successfully.\n",
                                         port_id, kni_pkt_mtu);
        return 0;


@@ -458,7 +458,7 @@ test_kni_processing(uint8_t port_id, struct rte_mempool *mp)
                return -1;
        }
        test_kni_ctx = NULL;
                return -1;
        }
        test_kni_ctx = NULL;

-       
+

        /* test of releasing a released kni device */
        if (rte_kni_release(kni) == 0) {
                printf("should not release a released kni device\n");
        /* test of releasing a released kni device */
        if (rte_kni_release(kni) == 0) {
                printf("should not release a released kni device\n");


@@ -477,7 +477,7 @@ test_kni_processing(uint8_t port_id, struct rte_mempool *mp)
                printf("fail to release kni\n");
                return -1;
        }
                printf("fail to release kni\n");
                return -1;
        }

-       
+

        return ret;
 fail_kni:
        if (rte_kni_release(kni) < 0) {
        return ret;
 fail_kni:
        if (rte_kni_release(kni) < 0) {

diff --git a/app/test/test_logs.c b/app/test/test_logs.c
index 730581a..67daa5b 100644 (file)
--- a/app/test/test_logs.c
+++ b/app/test/test_logs.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c
index ffed766..0250ed0 100644 (file)
--- a/app/test/test_lpm.c
+++ b/app/test/test_lpm.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_lpm6.c b/app/test/test_lpm6.c
index 151840d..982930b 100644 (file)
--- a/app/test/test_lpm6.c
+++ b/app/test/test_lpm6.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -111,7 +111,7 @@ rte_lpm6_test tests6[] = {
        test14,
        test15,
        test16,
        test14,
        test15,
        test16,

-       test17, 
+       test17,

        test18,
        test19,
        test20,
        test18,
        test19,
        test20,


@@ -167,7 +167,7 @@ test0(void)
 {
        struct rte_lpm6 *lpm = NULL;
        struct rte_lpm6_config config;
 {
        struct rte_lpm6 *lpm = NULL;
        struct rte_lpm6_config config;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -186,12 +186,12 @@ test0(void)
        config.max_rules = MAX_RULES;
        lpm = rte_lpm6_create(__func__, -2, &config);
        TEST_LPM_ASSERT(lpm == NULL);
        config.max_rules = MAX_RULES;
        lpm = rte_lpm6_create(__func__, -2, &config);
        TEST_LPM_ASSERT(lpm == NULL);

-       
+

        /* rte_lpm6_create: number_tbl8s is bigger than the maximum */
        config.number_tbl8s = MAX_NUM_TBL8S + 1;
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm == NULL);
        /* rte_lpm6_create: number_tbl8s is bigger than the maximum */
        config.number_tbl8s = MAX_NUM_TBL8S + 1;
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm == NULL);

-       
+

        /* rte_lpm6_create: config = NULL */
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, NULL);
        TEST_LPM_ASSERT(lpm == NULL);
        /* rte_lpm6_create: config = NULL */
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, NULL);
        TEST_LPM_ASSERT(lpm == NULL);


@@ -209,7 +209,7 @@ test1(void)
 {
        struct rte_lpm6 *lpm1 = NULL, *lpm2 = NULL, *lpm3 = NULL;
        struct rte_lpm6_config config;
 {
        struct rte_lpm6 *lpm1 = NULL, *lpm2 = NULL, *lpm3 = NULL;
        struct rte_lpm6_config config;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -221,11 +221,11 @@ test1(void)
        /* rte_lpm6_create: lpm name == LPM2 */
        lpm2 = rte_lpm6_create("LPM2", SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm2 != NULL);
        /* rte_lpm6_create: lpm name == LPM2 */
        lpm2 = rte_lpm6_create("LPM2", SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm2 != NULL);

-       
+

        /* rte_lpm6_create: lpm name == LPM2 */
        lpm3 = rte_lpm6_create("LPM1", SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm3 == lpm1);
        /* rte_lpm6_create: lpm name == LPM2 */
        lpm3 = rte_lpm6_create("LPM1", SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm3 == lpm1);

-       
+

        rte_lpm6_free(lpm1);
        rte_lpm6_free(lpm2);
 
        rte_lpm6_free(lpm1);
        rte_lpm6_free(lpm2);
 


@@ -242,7 +242,7 @@ test2(void)
        struct rte_lpm6 *lpm = NULL;
        struct rte_lpm6_config config;
        int32_t i;
        struct rte_lpm6 *lpm = NULL;
        struct rte_lpm6_config config;
        int32_t i;

-       
+

        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
 
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
 


@@ -270,11 +270,11 @@ test3(void)
 {
        struct rte_lpm6 *lpm = NULL;
        struct rte_lpm6_config config;
 {
        struct rte_lpm6 *lpm = NULL;
        struct rte_lpm6_config config;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;

-       
+

        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 


@@ -291,11 +291,11 @@ test4(void)
 {
        struct rte_lpm6 *lpm = NULL;
        struct rte_lpm6_config config;
 {
        struct rte_lpm6 *lpm = NULL;
        struct rte_lpm6_config config;

-       
+

        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth = 24, next_hop = 100;
        int32_t status = 0;
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth = 24, next_hop = 100;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -333,7 +333,7 @@ test5(void)
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth = 24;
        int32_t status = 0;
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth = 24;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -371,7 +371,7 @@ test6(void)
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t next_hop_return = 0;
        int32_t status = 0;
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t next_hop_return = 0;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -383,7 +383,7 @@ test6(void)
        /*Create vaild lpm to use in rest of test. */
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
        /*Create vaild lpm to use in rest of test. */
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);

-       
+

        /* rte_lpm6_lookup: ip = NULL */
        status = rte_lpm6_lookup(lpm, NULL, &next_hop_return);
        TEST_LPM_ASSERT(status < 0);
        /* rte_lpm6_lookup: ip = NULL */
        status = rte_lpm6_lookup(lpm, NULL, &next_hop_return);
        TEST_LPM_ASSERT(status < 0);


@@ -409,7 +409,7 @@ test7(void)
        uint8_t ip[10][16];
        int16_t next_hop_return[10];
        int32_t status = 0;
        uint8_t ip[10][16];
        int16_t next_hop_return[10];
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -421,7 +421,7 @@ test7(void)
        /*Create vaild lpm to use in rest of test. */
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
        /*Create vaild lpm to use in rest of test. */
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);

-       
+

        /* rte_lpm6_lookup: ip = NULL */
        status = rte_lpm6_lookup_bulk_func(lpm, NULL, next_hop_return, 10);
        TEST_LPM_ASSERT(status < 0);
        /* rte_lpm6_lookup: ip = NULL */
        status = rte_lpm6_lookup_bulk_func(lpm, NULL, next_hop_return, 10);
        TEST_LPM_ASSERT(status < 0);


@@ -447,7 +447,7 @@ test8(void)
        uint8_t ip[10][16];
        uint8_t depth[10];
        int32_t status = 0;
        uint8_t ip[10][16];
        uint8_t depth[10];
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -459,7 +459,7 @@ test8(void)
        /*Create vaild lpm to use in rest of test. */
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
        /*Create vaild lpm to use in rest of test. */
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);

-       
+

        /* rte_lpm6_delete: ip = NULL */
        status = rte_lpm6_delete_bulk_func(lpm, NULL, depth, 10);
        TEST_LPM_ASSERT(status < 0);
        /* rte_lpm6_delete: ip = NULL */
        status = rte_lpm6_delete_bulk_func(lpm, NULL, depth, 10);
        TEST_LPM_ASSERT(status < 0);


@@ -487,7 +487,7 @@ test9(void)
        uint8_t depth = 16, next_hop_add = 100, next_hop_return = 0;
        int32_t status = 0;
        uint8_t i;
        uint8_t depth = 16, next_hop_add = 100, next_hop_return = 0;
        int32_t status = 0;
        uint8_t i;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -497,16 +497,16 @@ test9(void)
 
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
 
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        for (i = 0; i < UINT8_MAX; i++) {
                ip[2] = i;
                status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
                TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
        }
        for (i = 0; i < UINT8_MAX; i++) {
                ip[2] = i;
                status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
                TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
        }

-       
+

        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);

-       
+

        for (i = 0; i < UINT8_MAX; i++) {
                ip[2] = i;
                status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        for (i = 0; i < UINT8_MAX; i++) {
                ip[2] = i;
                status = rte_lpm6_lookup(lpm, ip, &next_hop_return);


@@ -531,14 +531,14 @@ test10(void)
        uint8_t depth, next_hop_add = 100;
        int32_t status = 0;
        int i;
        uint8_t depth, next_hop_add = 100;
        int32_t status = 0;
        int i;

-       
+

        config.max_rules = 127;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
 
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
        config.max_rules = 127;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
 
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);

-       
+

        for (i = 1; i < 128; i++) {
                depth = (uint8_t)i;
                status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        for (i = 1; i < 128; i++) {
                depth = (uint8_t)i;
                status = rte_lpm6_add(lpm, ip, depth, next_hop_add);


@@ -574,7 +574,7 @@ test11(void)
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth, next_hop_add = 100;
        int32_t status = 0;
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth, next_hop_add = 100;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = 16;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = 16;
        config.flags = 0;


@@ -585,33 +585,33 @@ test11(void)
        depth = 128;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        depth = 128;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        ip[0] = 1;
        depth = 25;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        ip[0] = 1;
        depth = 25;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);

-       
+

        depth = 33;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        depth = 33;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);

-       
+

        depth = 41;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        depth = 41;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);

-       
+

        depth = 49;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == -ENOSPC);
        depth = 49;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == -ENOSPC);

-       
+

        depth = 41;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        depth = 41;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);


@@ -634,7 +634,7 @@ test12(void)
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth, next_hop_add = 100;
        int32_t status = 0;
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth, next_hop_add = 100;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = 16;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = 16;
        config.flags = 0;


@@ -645,12 +645,12 @@ test12(void)
        depth = 128;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        depth = 128;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        ip[0] = 1;
        depth = 41;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        ip[0] = 1;
        depth = 41;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        depth = 49;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == -ENOSPC);
        depth = 49;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == -ENOSPC);


@@ -672,7 +672,7 @@ test13(void)
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth, next_hop_add = 100;
        int32_t status = 0;
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth, next_hop_add = 100;
        int32_t status = 0;

-       
+

        config.max_rules = 2;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = 2;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -683,19 +683,19 @@ test13(void)
        depth = 1;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        depth = 1;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        depth = 2;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        depth = 2;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        depth = 3;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == -ENOSPC);
        depth = 3;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == -ENOSPC);

-       
+

        depth = 2;
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
        depth = 2;
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);

-       
+

        depth = 3;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        depth = 3;
        status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);


@@ -720,14 +720,14 @@ test14(void)
        uint8_t depth = 25, next_hop_add = 100;
        int32_t status = 0;
        int i, j;
        uint8_t depth = 25, next_hop_add = 100;
        int32_t status = 0;
        int i, j;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
 
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
 
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);

-       
+

        for (i = 0; i < 256; i++) {
                ip[0] = (uint8_t)i;
                for (j = 0; j < 256; j++) {
        for (i = 0; i < 256; i++) {
                ip[0] = (uint8_t)i;
                for (j = 0; j < 256; j++) {


@@ -745,7 +745,7 @@ test14(void)
 
        ip[0] = 255;
        ip[1] = 255;
 
        ip[0] = 255;
        ip[1] = 255;

-       ip[2] = 0;      
+       ip[2] = 0;

        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 


@@ -771,7 +771,7 @@ test15(void)
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth = 24, next_hop_add = 100, next_hop_return = 0;
        int32_t status = 0;
        uint8_t ip[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth = 24, next_hop_add = 100, next_hop_return = 0;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -784,7 +784,7 @@ test15(void)
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));

-       
+

        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 


@@ -807,7 +807,7 @@ test16(void)
        uint8_t ip[] = {12,12,1,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth = 128, next_hop_add = 100, next_hop_return = 0;
        int32_t status = 0;
        uint8_t ip[] = {12,12,1,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth = 128, next_hop_add = 100, next_hop_return = 0;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -820,7 +820,7 @@ test16(void)
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));

-       
+

        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 


@@ -851,7 +851,7 @@ test17(void)
        uint8_t ip2[] = {128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth, next_hop_add, next_hop_return;
        int32_t status = 0;
        uint8_t ip2[] = {128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t depth, next_hop_add, next_hop_return;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -875,7 +875,7 @@ test17(void)
                TEST_LPM_ASSERT((status == 0) &&
                        (next_hop_return == next_hop_add));
        }
                TEST_LPM_ASSERT((status == 0) &&
                        (next_hop_return == next_hop_add));
        }

-       
+

        /* Loop with rte_lpm6_delete. */
        for (depth = 128; depth >= 1; depth--) {
                next_hop_add = (uint8_t) (depth - 1);
        /* Loop with rte_lpm6_delete. */
        for (depth = 128; depth >= 1; depth--) {
                next_hop_add = (uint8_t) (depth - 1);


@@ -917,7 +917,7 @@ test18(void)
        uint8_t depth, depth_1, depth_2, next_hop_add, next_hop_add_1,
                next_hop_add_2, next_hop_return;
        int32_t status = 0;
        uint8_t depth, depth_1, depth_2, next_hop_add, next_hop_add_1,
                next_hop_add_2, next_hop_return;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -935,7 +935,7 @@ test18(void)
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));

-       
+

        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 


@@ -963,7 +963,7 @@ test18(void)
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));

-       
+

        depth = 24;
 
        status = rte_lpm6_delete(lpm, ip, depth);
        depth = 24;
 
        status = rte_lpm6_delete(lpm, ip, depth);


@@ -1008,7 +1008,7 @@ test18(void)
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
        status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));

-       
+

        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 
        status = rte_lpm6_delete(lpm, ip, depth);
        TEST_LPM_ASSERT(status == 0);
 


@@ -1078,7 +1078,7 @@ test19(void)
        uint8_t ip[16];
        uint8_t depth, next_hop_add, next_hop_return;
        int32_t status = 0;
        uint8_t ip[16];
        uint8_t depth, next_hop_add, next_hop_return;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -1170,7 +1170,7 @@ test19(void)
 
        rte_lpm6_delete_all(lpm);
 
 
        rte_lpm6_delete_all(lpm);
 

-       /* 
+       /*

         * Add rule that updates the next hop in TBL24 & lookup
         * (& delete & lookup)
         */
         * Add rule that updates the next hop in TBL24 & lookup
         * (& delete & lookup)
         */


@@ -1276,7 +1276,7 @@ test20(void)
        uint8_t ip[16];
        uint8_t depth, next_hop_add, next_hop_return;
        int32_t status = 0;
        uint8_t ip[16];
        uint8_t depth, next_hop_add, next_hop_return;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -1344,7 +1344,7 @@ test21(void)
        uint8_t depth, next_hop_add;
        int16_t next_hop_return[4];
        int32_t status = 0;
        uint8_t depth, next_hop_add;
        int16_t next_hop_return[4];
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -1358,23 +1358,23 @@ test21(void)
 
        status = rte_lpm6_add(lpm, ip_batch[0], depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
 
        status = rte_lpm6_add(lpm, ip_batch[0], depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        IPv6(ip_batch[1], 128, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth = 48;
        next_hop_add = 101;
 
        status = rte_lpm6_add(lpm, ip_batch[1], depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        IPv6(ip_batch[1], 128, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth = 48;
        next_hop_add = 101;
 
        status = rte_lpm6_add(lpm, ip_batch[1], depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        IPv6(ip_batch[2], 128, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth = 48;
        next_hop_add = 102;
 
        status = rte_lpm6_add(lpm, ip_batch[2], depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        IPv6(ip_batch[2], 128, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth = 48;
        next_hop_add = 102;
 
        status = rte_lpm6_add(lpm, ip_batch[2], depth, next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        IPv6(ip_batch[3], 128, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        IPv6(ip_batch[3], 128, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);

-       
+

        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 4);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == 100
        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 4);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == 100


@@ -1402,97 +1402,97 @@ test22(void)
        uint8_t depth[5], next_hop_add;
        int16_t next_hop_return[5];
        int32_t status = 0;
        uint8_t depth[5], next_hop_add;
        int16_t next_hop_return[5];
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
 
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
 
        lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);

-       
+

        /* Adds 5 rules and look them up */
        /* Adds 5 rules and look them up */

-       
+

        IPv6(ip_batch[0], 128, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[0] = 48;
        next_hop_add = 101;
 
        status = rte_lpm6_add(lpm, ip_batch[0], depth[0], next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        IPv6(ip_batch[0], 128, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[0] = 48;
        next_hop_add = 101;
 
        status = rte_lpm6_add(lpm, ip_batch[0], depth[0], next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        IPv6(ip_batch[1], 128, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[1] = 48;
        next_hop_add = 102;
 
        status = rte_lpm6_add(lpm, ip_batch[1], depth[1], next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        IPv6(ip_batch[1], 128, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[1] = 48;
        next_hop_add = 102;
 
        status = rte_lpm6_add(lpm, ip_batch[1], depth[1], next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        IPv6(ip_batch[2], 128, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[2] = 48;
        next_hop_add = 103;
 
        status = rte_lpm6_add(lpm, ip_batch[2], depth[2], next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        IPv6(ip_batch[2], 128, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[2] = 48;
        next_hop_add = 103;
 
        status = rte_lpm6_add(lpm, ip_batch[2], depth[2], next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        IPv6(ip_batch[3], 128, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[3] = 48;
        next_hop_add = 104;
 
        status = rte_lpm6_add(lpm, ip_batch[3], depth[3], next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        IPv6(ip_batch[3], 128, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[3] = 48;
        next_hop_add = 104;
 
        status = rte_lpm6_add(lpm, ip_batch[3], depth[3], next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        IPv6(ip_batch[4], 128, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[4] = 48;
        next_hop_add = 105;
 
        status = rte_lpm6_add(lpm, ip_batch[4], depth[4], next_hop_add);
        TEST_LPM_ASSERT(status == 0);
        IPv6(ip_batch[4], 128, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        depth[4] = 48;
        next_hop_add = 105;
 
        status = rte_lpm6_add(lpm, ip_batch[4], depth[4], next_hop_add);
        TEST_LPM_ASSERT(status == 0);

-       
+

        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == 101
                        && next_hop_return[1] == 102 && next_hop_return[2] == 103
                        && next_hop_return[3] == 104 && next_hop_return[4] == 105);
        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == 101
                        && next_hop_return[1] == 102 && next_hop_return[2] == 103
                        && next_hop_return[3] == 104 && next_hop_return[4] == 105);

-                       
+

        /* Use the delete_bulk function to delete two of them. Lookup again */
        /* Use the delete_bulk function to delete two of them. Lookup again */

-       
+

        status = rte_lpm6_delete_bulk_func(lpm, &ip_batch[0], depth, 2);
        TEST_LPM_ASSERT(status == 0);
        status = rte_lpm6_delete_bulk_func(lpm, &ip_batch[0], depth, 2);
        TEST_LPM_ASSERT(status == 0);

-       
+

        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == -1
                        && next_hop_return[1] == -1 && next_hop_return[2] == 103
                        && next_hop_return[3] == 104 && next_hop_return[4] == 105);
        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == -1
                        && next_hop_return[1] == -1 && next_hop_return[2] == 103
                        && next_hop_return[3] == 104 && next_hop_return[4] == 105);

-                       
+

        /* Use the delete_bulk function to delete one more. Lookup again */
        /* Use the delete_bulk function to delete one more. Lookup again */

-       
+

        status = rte_lpm6_delete_bulk_func(lpm, &ip_batch[2], depth, 1);
        TEST_LPM_ASSERT(status == 0);
        status = rte_lpm6_delete_bulk_func(lpm, &ip_batch[2], depth, 1);
        TEST_LPM_ASSERT(status == 0);

-       
+

        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == -1
                        && next_hop_return[1] == -1 && next_hop_return[2] == -1
                        && next_hop_return[3] == 104 && next_hop_return[4] == 105);
        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == -1
                        && next_hop_return[1] == -1 && next_hop_return[2] == -1
                        && next_hop_return[3] == 104 && next_hop_return[4] == 105);

-                       
+

        /* Use the delete_bulk function to delete two, one invalid. Lookup again */
        /* Use the delete_bulk function to delete two, one invalid. Lookup again */

-       
+

        IPv6(ip_batch[4], 128, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        status = rte_lpm6_delete_bulk_func(lpm, &ip_batch[3], depth, 2);
        TEST_LPM_ASSERT(status == 0);
        IPv6(ip_batch[4], 128, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        status = rte_lpm6_delete_bulk_func(lpm, &ip_batch[3], depth, 2);
        TEST_LPM_ASSERT(status == 0);

-       
+

        IPv6(ip_batch[4], 128, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == -1
                        && next_hop_return[1] == -1 && next_hop_return[2] == -1
                        && next_hop_return[3] == -1 && next_hop_return[4] == 105);
        IPv6(ip_batch[4], 128, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == -1
                        && next_hop_return[1] == -1 && next_hop_return[2] == -1
                        && next_hop_return[3] == -1 && next_hop_return[4] == 105);

-                       
+

        /* Use the delete_bulk function to delete the remaining one. Lookup again */
        /* Use the delete_bulk function to delete the remaining one. Lookup again */

-       
+

        status = rte_lpm6_delete_bulk_func(lpm, &ip_batch[4], depth, 1);
        TEST_LPM_ASSERT(status == 0);
        status = rte_lpm6_delete_bulk_func(lpm, &ip_batch[4], depth, 1);
        TEST_LPM_ASSERT(status == 0);

-       
+

        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == -1
        status = rte_lpm6_lookup_bulk_func(lpm, ip_batch,
                        next_hop_return, 5);
        TEST_LPM_ASSERT(status == 0 && next_hop_return[0] == -1


@@ -1518,7 +1518,7 @@ test23(void)
        uint8_t ip[16];
        uint8_t depth, next_hop_add, next_hop_return;
        int32_t status = 0;
        uint8_t ip[16];
        uint8_t depth, next_hop_add, next_hop_return;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -1562,7 +1562,7 @@ test24(void)
 {
        struct rte_lpm6 *lpm = NULL, *result = NULL;
        struct rte_lpm6_config config;
 {
        struct rte_lpm6 *lpm = NULL, *result = NULL;
        struct rte_lpm6_config config;

-       
+

        config.max_rules = 256 * 32;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = 256 * 32;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -1602,7 +1602,7 @@ test25(void)
        uint32_t i;
        uint8_t depth, next_hop_add, next_hop_return, next_hop_expected;
        int32_t status = 0;
        uint32_t i;
        uint8_t depth, next_hop_add, next_hop_return, next_hop_expected;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -1617,11 +1617,11 @@ test25(void)
                status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
                TEST_LPM_ASSERT(status == 0);
        }
                status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
                TEST_LPM_ASSERT(status == 0);
        }

-       
+

        for (i = 0; i < 100000; i++) {
                memcpy(ip, large_ips_table[i].ip, 16);
                next_hop_expected = large_ips_table[i].next_hop;
        for (i = 0; i < 100000; i++) {
                memcpy(ip, large_ips_table[i].ip, 16);
                next_hop_expected = large_ips_table[i].next_hop;

-               
+

                status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
                TEST_LPM_ASSERT((status == 0) &&
                                (next_hop_return == next_hop_expected));
                status = rte_lpm6_lookup(lpm, ip, &next_hop_return);
                TEST_LPM_ASSERT((status == 0) &&
                                (next_hop_return == next_hop_expected));


@@ -1655,7 +1655,7 @@ test26(void)
        uint8_t next_hop_ip_20_25 = 111;
        uint8_t next_hop_return = 0;
        int32_t status = 0;
        uint8_t next_hop_ip_20_25 = 111;
        uint8_t next_hop_return = 0;
        int32_t status = 0;

-       
+

        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = MAX_RULES;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -1740,7 +1740,7 @@ test27(void)
                next_hop_add = 128;
                status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
                TEST_LPM_ASSERT(status == 0);
                next_hop_add = 128;
                status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
                TEST_LPM_ASSERT(status == 0);

-        
+

                depth = 112;
                next_hop_add = 112;
                status = rte_lpm6_add(lpm, ip, depth, next_hop_add);
                depth = 112;
                next_hop_add = 112;
                status = rte_lpm6_add(lpm, ip, depth, next_hop_add);


@@ -1804,7 +1804,7 @@ perf_test(void)
        uint8_t next_hop_add = 0xAA, next_hop_return = 0;
        int status = 0;
        int64_t count = 0;
        uint8_t next_hop_add = 0xAA, next_hop_return = 0;
        int status = 0;
        int64_t count = 0;

-       
+

        config.max_rules = 1000000;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = 1000000;
        config.number_tbl8s = NUMBER_TBL8S;
        config.flags = 0;


@@ -1852,24 +1852,24 @@ perf_test(void)
        printf("Average LPM Lookup: %.1f cycles (fails = %.1f%%)\n",
                        (double)total_time / ((double)ITERATIONS * BATCH_SIZE),
                        (count * 100.0) / (double)(ITERATIONS * BATCH_SIZE));
        printf("Average LPM Lookup: %.1f cycles (fails = %.1f%%)\n",
                        (double)total_time / ((double)ITERATIONS * BATCH_SIZE),
                        (count * 100.0) / (double)(ITERATIONS * BATCH_SIZE));

-                       
+

        /* Measure bulk Lookup */
        total_time = 0;
        count = 0;
        /* Measure bulk Lookup */
        total_time = 0;
        count = 0;

-       
+

        uint8_t ip_batch[NUM_IPS_ENTRIES][16];
        int16_t next_hops[NUM_IPS_ENTRIES];
        uint8_t ip_batch[NUM_IPS_ENTRIES][16];
        int16_t next_hops[NUM_IPS_ENTRIES];

-       
+

        for (i = 0; i < NUM_IPS_ENTRIES; i++)
                memcpy(ip_batch[i], large_ips_table[i].ip, 16);
        for (i = 0; i < NUM_IPS_ENTRIES; i++)
                memcpy(ip_batch[i], large_ips_table[i].ip, 16);

-       
+

        for (i = 0; i < ITERATIONS; i ++) {
 
                /* Lookup per batch */
                begin = rte_rdtsc();
                rte_lpm6_lookup_bulk_func(lpm, ip_batch, next_hops, NUM_IPS_ENTRIES);
                total_time += rte_rdtsc() - begin;
        for (i = 0; i < ITERATIONS; i ++) {
 
                /* Lookup per batch */
                begin = rte_rdtsc();
                rte_lpm6_lookup_bulk_func(lpm, ip_batch, next_hops, NUM_IPS_ENTRIES);
                total_time += rte_rdtsc() - begin;

-               
+

                for (j = 0; j < NUM_IPS_ENTRIES; j++)
                        if (next_hops[j] < 0)
                                count++;
                for (j = 0; j < NUM_IPS_ENTRIES; j++)
                        if (next_hops[j] < 0)
                                count++;


@@ -1910,7 +1910,7 @@ test_lpm6(void)
 
        for (i = 0; i < NUM_LPM6_TESTS; i++) {
                status = tests6[i]();
 
        for (i = 0; i < NUM_LPM6_TESTS; i++) {
                status = tests6[i]();

-                       
+

                if (status < 0) {
                        printf("ERROR: LPM Test %s: FAIL\n", RTE_STR(tests6[i]));
                        global_status = status;
                if (status < 0) {
                        printf("ERROR: LPM Test %s: FAIL\n", RTE_STR(tests6[i]));
                        global_status = status;

diff --git a/app/test/test_lpm6_routes.h b/app/test/test_lpm6_routes.h
index bc45423..7892732 100644 (file)
--- a/app/test/test_lpm6_routes.h
+++ b/app/test/test_lpm6_routes.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -45,7 +45,7 @@ struct ips_tbl_entry {
 };
 
 static struct rules_tbl_entry large_route_table[] =
 };
 
 static struct rules_tbl_entry large_route_table[] =

-{      
+{

        {{66, 70, 154, 143, 197, 233, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 50, 146},
        {{107, 79, 18, 235, 142, 84, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 54, 141},
        {{247, 132, 113, 1, 215, 247, 183, 239, 128, 0, 0, 0, 0, 0, 0, 0}, 67, 23},
        {{66, 70, 154, 143, 197, 233, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 50, 146},
        {{107, 79, 18, 235, 142, 84, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 54, 141},
        {{247, 132, 113, 1, 215, 247, 183, 239, 128, 0, 0, 0, 0, 0, 0, 0}, 67, 23},

diff --git a/app/test/test_lpm_routes.h b/app/test/test_lpm_routes.h
index 70ff333..023b0f9 100644 (file)
--- a/app/test/test_lpm_routes.h
+++ b/app/test/test_lpm_routes.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 61d5993..3c38383 100644 (file)
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 6ee350d..2b87521 100644 (file)
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -464,7 +464,7 @@ test_pktmbuf_pool_ptr(void)
        unsigned i;
        struct rte_mbuf *m[NB_MBUF];
        int ret = 0;
        unsigned i;
        struct rte_mbuf *m[NB_MBUF];
        int ret = 0;

-               
+

        for (i=0; i<NB_MBUF; i++)
                m[i] = NULL;
 
        for (i=0; i<NB_MBUF; i++)
                m[i] = NULL;
 


@@ -483,10 +483,10 @@ test_pktmbuf_pool_ptr(void)
                if (m[i] != NULL)
                        rte_pktmbuf_free(m[i]);
        }
                if (m[i] != NULL)
                        rte_pktmbuf_free(m[i]);
        }

-       
+

        for (i=0; i<NB_MBUF; i++)
                m[i] = NULL;
        for (i=0; i<NB_MBUF; i++)
                m[i] = NULL;

-               
+

        /* alloc NB_MBUF mbufs */
        for (i=0; i<NB_MBUF; i++) {
                m[i] = rte_pktmbuf_alloc(pktmbuf_pool);
        /* alloc NB_MBUF mbufs */
        for (i=0; i<NB_MBUF; i++) {
                m[i] = rte_pktmbuf_alloc(pktmbuf_pool);


@@ -861,7 +861,7 @@ test_mbuf(void)
                printf("test_mbuf_pool() failed (2)\n");
                return -1;
        }
                printf("test_mbuf_pool() failed (2)\n");
                return -1;
        }

-       
+

        /* test that the pointer to the data on a packet mbuf is set properly */
        if (test_pktmbuf_pool_ptr() < 0) {
                printf("test_pktmbuf_pool_ptr() failed\n");
        /* test that the pointer to the data on a packet mbuf is set properly */
        if (test_pktmbuf_pool_ptr() < 0) {
                printf("test_pktmbuf_pool_ptr() failed\n");

diff --git a/app/test/test_memcpy.c b/app/test/test_memcpy.c
index 50b9478..ee0b0da 100644 (file)
--- a/app/test/test_memcpy.c
+++ b/app/test/test_memcpy.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_memcpy_perf.c b/app/test/test_memcpy_perf.c
index f665387..f6b95c9 100644 (file)
--- a/app/test/test_memcpy_perf.c
+++ b/app/test/test_memcpy_perf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_memory.c b/app/test/test_memory.c
index b734417..6c62de8 100644 (file)
--- a/app/test/test_memory.c
+++ b/app/test/test_memory.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c
index a658a08..a83b2ee 100644 (file)
--- a/app/test/test_mempool.c
+++ b/app/test/test_mempool.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_mempool_perf.c b/app/test/test_mempool_perf.c
index 2f6c660..d3141fe 100644 (file)
--- a/app/test/test_mempool_perf.c
+++ b/app/test/test_mempool_perf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 221acad..42c7601 100644 (file)
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -569,7 +569,7 @@ check_memzone_bounded(const char *name, uint32_t len,  uint32_t align,
 
        bmask = ~((phys_addr_t)bound - 1);
 
 
        bmask = ~((phys_addr_t)bound - 1);
 

-       if ((mz = rte_memzone_reserve_bounded(name, len, SOCKET_ID_ANY, 0, 
+       if ((mz = rte_memzone_reserve_bounded(name, len, SOCKET_ID_ANY, 0,

                        align, bound)) == NULL) {
                printf("%s(%s): memzone creation failed\n",
                        __func__, name);
                        align, bound)) == NULL) {
                printf("%s(%s): memzone creation failed\n",
                        __func__, name);


@@ -620,7 +620,7 @@ test_memzone_bounded(void)
                        "conditions\n", __func__, memzone_err->name);
                return (-1);
        }
                        "conditions\n", __func__, memzone_err->name);
                return (-1);
        }

-                               
+

        /* should fail as len is greater then boundary */
        name = "bounded_error_32";
        if ((memzone_err = rte_memzone_reserve_bounded(name,
        /* should fail as len is greater then boundary */
        name = "bounded_error_32";
        if ((memzone_err = rte_memzone_reserve_bounded(name,

diff --git a/app/test/test_meter.c b/app/test/test_meter.c
index d52faa3..226b231 100644 (file)
--- a/app/test/test_meter.c
+++ b/app/test/test_meter.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -66,21 +66,21 @@
 #define TM_TEST_TRTCM_CBS_DF 2048
 #define TM_TEST_TRTCM_PBS_DF 4096
 
 #define TM_TEST_TRTCM_CBS_DF 2048
 #define TM_TEST_TRTCM_PBS_DF 4096
 

-static struct rte_meter_srtcm_params sparams = 
-                               {.cir = TM_TEST_SRTCM_CIR_DF,  
-                                .cbs = TM_TEST_SRTCM_CBS_DF, 
+static struct rte_meter_srtcm_params sparams =
+                               {.cir = TM_TEST_SRTCM_CIR_DF,
+                                .cbs = TM_TEST_SRTCM_CBS_DF,

                                 .ebs = TM_TEST_SRTCM_EBS_DF,};
 
                                 .ebs = TM_TEST_SRTCM_EBS_DF,};
 

-static struct  rte_meter_trtcm_params tparams= 
-                               {.cir = TM_TEST_TRTCM_CIR_DF,  
-                                .pir = TM_TEST_TRTCM_PIR_DF,  
-                                .cbs = TM_TEST_TRTCM_CBS_DF, 
+static struct  rte_meter_trtcm_params tparams=
+                               {.cir = TM_TEST_TRTCM_CIR_DF,
+                                .pir = TM_TEST_TRTCM_PIR_DF,
+                                .cbs = TM_TEST_TRTCM_CBS_DF,

                                 .pbs = TM_TEST_TRTCM_PBS_DF,};
 
 /**
  * functional test for rte_meter_srtcm_config
  */
                                 .pbs = TM_TEST_TRTCM_PBS_DF,};
 
 /**
  * functional test for rte_meter_srtcm_config
  */

-static inline int 
+static inline int

 tm_test_srtcm_config(void)
 {
 #define SRTCM_CFG_MSG "srtcm_config"
 tm_test_srtcm_config(void)
 {
 #define SRTCM_CFG_MSG "srtcm_config"


@@ -112,16 +112,16 @@ tm_test_srtcm_config(void)
        sparams1 = sparams;
        sparams1.ebs = 0;
        if(rte_meter_srtcm_config(&sm, &sparams1) != 0)
        sparams1 = sparams;
        sparams1.ebs = 0;
        if(rte_meter_srtcm_config(&sm, &sparams1) != 0)

-               melog(SRTCM_CFG_MSG);   
+               melog(SRTCM_CFG_MSG);

 
        sparams1 = sparams;
        sparams1.cbs = 0;
        if(rte_meter_srtcm_config(&sm, &sparams1) != 0)
 
        sparams1 = sparams;
        sparams1.cbs = 0;
        if(rte_meter_srtcm_config(&sm, &sparams1) != 0)

-               melog(SRTCM_CFG_MSG);   
+               melog(SRTCM_CFG_MSG);

 
        /* usual parameter, should be successful */
        if(rte_meter_srtcm_config(&sm, &sparams) != 0)
 
        /* usual parameter, should be successful */
        if(rte_meter_srtcm_config(&sm, &sparams) != 0)

-               melog(SRTCM_CFG_MSG);   
+               melog(SRTCM_CFG_MSG);

 
        return 0;
 
 
        return 0;
 


@@ -130,7 +130,7 @@ tm_test_srtcm_config(void)
 /**
  * functional test for rte_meter_trtcm_config
  */
 /**
  * functional test for rte_meter_trtcm_config
  */

-static inline int 
+static inline int

 tm_test_trtcm_config(void)
 {
        struct rte_meter_trtcm tm;
 tm_test_trtcm_config(void)
 {
        struct rte_meter_trtcm tm;


@@ -159,12 +159,12 @@ tm_test_trtcm_config(void)
        tparams1 = tparams;
        tparams1.pbs = 0;
        if(rte_meter_trtcm_config(&tm, &tparams1) == 0)
        tparams1 = tparams;
        tparams1.pbs = 0;
        if(rte_meter_trtcm_config(&tm, &tparams1) == 0)

-               melog(TRTCM_CFG_MSG);                   
+               melog(TRTCM_CFG_MSG);

 
        tparams1 = tparams;
        tparams1.pir = 0;
        if(rte_meter_trtcm_config(&tm, &tparams1) == 0)
 
        tparams1 = tparams;
        tparams1.pir = 0;
        if(rte_meter_trtcm_config(&tm, &tparams1) == 0)

-               melog(TRTCM_CFG_MSG);   
+               melog(TRTCM_CFG_MSG);

 
        /* pir should be greater or equal to cir */
        tparams1 = tparams;
 
        /* pir should be greater or equal to cir */
        tparams1 = tparams;


@@ -174,7 +174,7 @@ tm_test_trtcm_config(void)
 
        /* usual parameter, should be successful */
        if(rte_meter_trtcm_config(&tm, &tparams) != 0)
 
        /* usual parameter, should be successful */
        if(rte_meter_trtcm_config(&tm, &tparams) != 0)

-               melog(TRTCM_CFG_MSG);   
+               melog(TRTCM_CFG_MSG);

 
        return 0;
 }
 
        return 0;
 }


@@ -182,29 +182,29 @@ tm_test_trtcm_config(void)
 /**
  * functional test for rte_meter_srtcm_color_blind_check
  */
 /**
  * functional test for rte_meter_srtcm_color_blind_check
  */

-static inline int 
+static inline int

 tm_test_srtcm_color_blind_check(void)
 {
 #define SRTCM_BLIND_CHECK_MSG "srtcm_blind_check"
        struct rte_meter_srtcm sm;
        uint64_t time;
        uint64_t hz = rte_get_tsc_hz();
 tm_test_srtcm_color_blind_check(void)
 {
 #define SRTCM_BLIND_CHECK_MSG "srtcm_blind_check"
        struct rte_meter_srtcm sm;
        uint64_t time;
        uint64_t hz = rte_get_tsc_hz();

-       
+

        /* Test green */
        if(rte_meter_srtcm_config(&sm, &sparams) != 0)
                melog(SRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_srtcm_color_blind_check(
        /* Test green */
        if(rte_meter_srtcm_config(&sm, &sparams) != 0)
                melog(SRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_srtcm_color_blind_check(

-               &sm, time, TM_TEST_SRTCM_CBS_DF - 1) 
+               &sm, time, TM_TEST_SRTCM_CBS_DF - 1)

                != e_RTE_METER_GREEN)
                melog(SRTCM_BLIND_CHECK_MSG" GREEN");
                != e_RTE_METER_GREEN)
                melog(SRTCM_BLIND_CHECK_MSG" GREEN");

-       
+

        /* Test yellow */
        if(rte_meter_srtcm_config(&sm, &sparams) != 0)
                melog(SRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_srtcm_color_blind_check(
        /* Test yellow */
        if(rte_meter_srtcm_config(&sm, &sparams) != 0)
                melog(SRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_srtcm_color_blind_check(

-               &sm, time, TM_TEST_SRTCM_CBS_DF + 1) 
+               &sm, time, TM_TEST_SRTCM_CBS_DF + 1)

                != e_RTE_METER_YELLOW)
                melog(SRTCM_BLIND_CHECK_MSG" YELLOW");
 
                != e_RTE_METER_YELLOW)
                melog(SRTCM_BLIND_CHECK_MSG" YELLOW");
 


@@ -220,10 +220,10 @@ tm_test_srtcm_color_blind_check(void)
                melog(SRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_srtcm_color_blind_check(
                melog(SRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_srtcm_color_blind_check(

-               &sm, time, TM_TEST_SRTCM_EBS_DF + 1) 
+               &sm, time, TM_TEST_SRTCM_EBS_DF + 1)

                != e_RTE_METER_RED)
                melog(SRTCM_BLIND_CHECK_MSG" RED");
                != e_RTE_METER_RED)
                melog(SRTCM_BLIND_CHECK_MSG" RED");

-       
+

        return 0;
 
 }
        return 0;
 
 }


@@ -231,7 +231,7 @@ tm_test_srtcm_color_blind_check(void)
 /**
  * functional test for rte_meter_trtcm_color_blind_check
  */
 /**
  * functional test for rte_meter_trtcm_color_blind_check
  */

-static inline int 
+static inline int

 tm_test_trtcm_color_blind_check(void)
 {
 #define TRTCM_BLIND_CHECK_MSG "trtcm_blind_check"
 tm_test_trtcm_color_blind_check(void)
 {
 #define TRTCM_BLIND_CHECK_MSG "trtcm_blind_check"


@@ -239,22 +239,22 @@ tm_test_trtcm_color_blind_check(void)
        uint64_t time;
        struct rte_meter_trtcm tm;
        uint64_t hz = rte_get_tsc_hz();
        uint64_t time;
        struct rte_meter_trtcm tm;
        uint64_t hz = rte_get_tsc_hz();

-       
+

        /* Test green */
        if(rte_meter_trtcm_config(&tm, &tparams) != 0)
                melog(TRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_blind_check(
        /* Test green */
        if(rte_meter_trtcm_config(&tm, &tparams) != 0)
                melog(TRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_blind_check(

-               &tm, time, TM_TEST_TRTCM_CBS_DF - 1) 
+               &tm, time, TM_TEST_TRTCM_CBS_DF - 1)

                != e_RTE_METER_GREEN)
                melog(TRTCM_BLIND_CHECK_MSG" GREEN");
                != e_RTE_METER_GREEN)
                melog(TRTCM_BLIND_CHECK_MSG" GREEN");

-       
+

        /* Test yellow */
        if(rte_meter_trtcm_config(&tm, &tparams) != 0)
                melog(TRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_blind_check(
        /* Test yellow */
        if(rte_meter_trtcm_config(&tm, &tparams) != 0)
                melog(TRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_blind_check(

-               &tm, time, TM_TEST_TRTCM_CBS_DF + 1) 
+               &tm, time, TM_TEST_TRTCM_CBS_DF + 1)

                != e_RTE_METER_YELLOW)
                melog(TRTCM_BLIND_CHECK_MSG" YELLOW");
 
                != e_RTE_METER_YELLOW)
                melog(TRTCM_BLIND_CHECK_MSG" YELLOW");
 


@@ -262,7 +262,7 @@ tm_test_trtcm_color_blind_check(void)
                melog(TRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_blind_check(
                melog(TRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_blind_check(

-               &tm, time, TM_TEST_TRTCM_PBS_DF - 1) 
+               &tm, time, TM_TEST_TRTCM_PBS_DF - 1)

                != e_RTE_METER_YELLOW)
                melog(TRTCM_BLIND_CHECK_MSG" YELLOW");
 
                != e_RTE_METER_YELLOW)
                melog(TRTCM_BLIND_CHECK_MSG" YELLOW");
 


@@ -271,7 +271,7 @@ tm_test_trtcm_color_blind_check(void)
                melog(TRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_blind_check(
                melog(TRTCM_BLIND_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_blind_check(

-               &tm, time, TM_TEST_TRTCM_PBS_DF + 1) 
+               &tm, time, TM_TEST_TRTCM_PBS_DF + 1)

                != e_RTE_METER_RED)
                melog(TRTCM_BLIND_CHECK_MSG" RED");
 
                != e_RTE_METER_RED)
                melog(TRTCM_BLIND_CHECK_MSG" RED");
 


@@ -282,13 +282,13 @@ tm_test_trtcm_color_blind_check(void)
 /**
  * @in[4] : the flags packets carries.
  * @in[4] : the flags function expect to return.
 /**
  * @in[4] : the flags packets carries.
  * @in[4] : the flags function expect to return.

- * It will do blind check at the time of 1 second from beginning. 
- * At the time, it will use packets length of cbs -1, cbs + 1, 
+ * It will do blind check at the time of 1 second from beginning.
+ * At the time, it will use packets length of cbs -1, cbs + 1,

  * ebs -1 and ebs +1 with flag in[0], in[1], in[2] and in[3] to do
  * aware check, expect flag out[0], out[1], out[2] and out[3]
  */
 
  * ebs -1 and ebs +1 with flag in[0], in[1], in[2] and in[3] to do
  * aware check, expect flag out[0], out[1], out[2] and out[3]
  */
 

-static inline int 
+static inline int

 tm_test_srtcm_aware_check
 (enum rte_meter_color in[4], enum rte_meter_color out[4])
 {
 tm_test_srtcm_aware_check
 (enum rte_meter_color in[4], enum rte_meter_color out[4])
 {


@@ -296,14 +296,14 @@ tm_test_srtcm_aware_check
        struct rte_meter_srtcm sm;
        uint64_t time;
        uint64_t hz = rte_get_tsc_hz();
        struct rte_meter_srtcm sm;
        uint64_t time;
        uint64_t hz = rte_get_tsc_hz();

-       
+

        if(rte_meter_srtcm_config(&sm, &sparams) != 0)
                melog(SRTCM_AWARE_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_srtcm_color_aware_check(
                &sm, time, TM_TEST_SRTCM_CBS_DF - 1, in[0]) != out[0])
                melog(SRTCM_AWARE_CHECK_MSG" %u:%u", in[0], out[0]);
        if(rte_meter_srtcm_config(&sm, &sparams) != 0)
                melog(SRTCM_AWARE_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_srtcm_color_aware_check(
                &sm, time, TM_TEST_SRTCM_CBS_DF - 1, in[0]) != out[0])
                melog(SRTCM_AWARE_CHECK_MSG" %u:%u", in[0], out[0]);

-       
+

        if(rte_meter_srtcm_config(&sm, &sparams) != 0)
                melog(SRTCM_AWARE_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_srtcm_config(&sm, &sparams) != 0)
                melog(SRTCM_AWARE_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;


@@ -324,7 +324,7 @@ tm_test_srtcm_aware_check
        if(rte_meter_srtcm_color_aware_check(
                &sm, time, TM_TEST_SRTCM_EBS_DF + 1, in[3]) != out[3])
                melog(SRTCM_AWARE_CHECK_MSG" %u:%u", in[3], out[3]);
        if(rte_meter_srtcm_color_aware_check(
                &sm, time, TM_TEST_SRTCM_EBS_DF + 1, in[3]) != out[3])
                melog(SRTCM_AWARE_CHECK_MSG" %u:%u", in[3], out[3]);

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -332,14 +332,14 @@ tm_test_srtcm_aware_check
 /**
  * functional test for rte_meter_srtcm_color_aware_check
  */
 /**
  * functional test for rte_meter_srtcm_color_aware_check
  */

-static inline int 
+static inline int

 tm_test_srtcm_color_aware_check(void)
 {
        enum rte_meter_color in[4], out[4];
 
        /**
 tm_test_srtcm_color_aware_check(void)
 {
        enum rte_meter_color in[4], out[4];
 
        /**

-         * test 4 points that will produce green, yellow, yellow, red flag 
-         * if using blind check 
+         * test 4 points that will produce green, yellow, yellow, red flag
+         * if using blind check

          */
 
        /* previouly have a green, test points should keep unchanged */
          */
 
        /* previouly have a green, test points should keep unchanged */


@@ -352,7 +352,7 @@ tm_test_srtcm_color_aware_check(void)
                return -1;
 
        /**
                return -1;
 
        /**

-         * previously have a yellow, green & yellow = yellow 
+         * previously have a yellow, green & yellow = yellow

          * yellow & red = red
          */
        in[0] = in[1] = in[2] = in[3] = e_RTE_METER_YELLOW;
          * yellow & red = red
          */
        in[0] = in[1] = in[2] = in[3] = e_RTE_METER_YELLOW;


@@ -362,9 +362,9 @@ tm_test_srtcm_color_aware_check(void)
        out[3] = e_RTE_METER_RED;
        if(tm_test_srtcm_aware_check(in, out) != 0)
                return -1;
        out[3] = e_RTE_METER_RED;
        if(tm_test_srtcm_aware_check(in, out) != 0)
                return -1;

-       
+

        /**
        /**

-         * previously have a red, red & green = red 
+         * previously have a red, red & green = red

          * red & yellow = red
          */
        in[0] = in[1] = in[2] = in[3] = e_RTE_METER_RED;
          * red & yellow = red
          */
        in[0] = in[1] = in[2] = in[3] = e_RTE_METER_RED;


@@ -381,12 +381,12 @@ tm_test_srtcm_color_aware_check(void)
 /**
  * @in[4] : the flags packets carries.
  * @in[4] : the flags function expect to return.
 /**
  * @in[4] : the flags packets carries.
  * @in[4] : the flags function expect to return.

- * It will do blind check at the time of 1 second from beginning. 
- * At the time, it will use packets length of cbs -1, cbs + 1, 
+ * It will do blind check at the time of 1 second from beginning.
+ * At the time, it will use packets length of cbs -1, cbs + 1,

  * ebs -1 and ebs +1 with flag in[0], in[1], in[2] and in[3] to do
  * aware check, expect flag out[0], out[1], out[2] and out[3]
  */
  * ebs -1 and ebs +1 with flag in[0], in[1], in[2] and in[3] to do
  * aware check, expect flag out[0], out[1], out[2] and out[3]
  */

-static inline int 
+static inline int

 tm_test_trtcm_aware_check
 (enum rte_meter_color in[4], enum rte_meter_color out[4])
 {
 tm_test_trtcm_aware_check
 (enum rte_meter_color in[4], enum rte_meter_color out[4])
 {


@@ -394,14 +394,14 @@ tm_test_trtcm_aware_check
        struct rte_meter_trtcm tm;
        uint64_t time;
        uint64_t hz = rte_get_tsc_hz();
        struct rte_meter_trtcm tm;
        uint64_t time;
        uint64_t hz = rte_get_tsc_hz();

-       
+

        if(rte_meter_trtcm_config(&tm, &tparams) != 0)
                melog(TRTCM_AWARE_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_aware_check(
                &tm, time, TM_TEST_TRTCM_CBS_DF - 1, in[0]) != out[0])
                melog(TRTCM_AWARE_CHECK_MSG" %u:%u", in[0], out[0]);
        if(rte_meter_trtcm_config(&tm, &tparams) != 0)
                melog(TRTCM_AWARE_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_color_aware_check(
                &tm, time, TM_TEST_TRTCM_CBS_DF - 1, in[0]) != out[0])
                melog(TRTCM_AWARE_CHECK_MSG" %u:%u", in[0], out[0]);

-       
+

        if(rte_meter_trtcm_config(&tm, &tparams) != 0)
                melog(TRTCM_AWARE_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;
        if(rte_meter_trtcm_config(&tm, &tparams) != 0)
                melog(TRTCM_AWARE_CHECK_MSG);
        time = rte_get_tsc_cycles() + hz;


@@ -422,7 +422,7 @@ tm_test_trtcm_aware_check
        if(rte_meter_trtcm_color_aware_check(
                &tm, time, TM_TEST_TRTCM_PBS_DF + 1, in[3]) != out[3])
                melog(TRTCM_AWARE_CHECK_MSG" %u:%u", in[3], out[3]);
        if(rte_meter_trtcm_color_aware_check(
                &tm, time, TM_TEST_TRTCM_PBS_DF + 1, in[3]) != out[3])
                melog(TRTCM_AWARE_CHECK_MSG" %u:%u", in[3], out[3]);

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -431,13 +431,13 @@ tm_test_trtcm_aware_check
  * functional test for rte_meter_trtcm_color_aware_check
  */
 
  * functional test for rte_meter_trtcm_color_aware_check
  */
 

-static inline int 
+static inline int

 tm_test_trtcm_color_aware_check(void)
 {
        enum rte_meter_color in[4], out[4];
        /**
 tm_test_trtcm_color_aware_check(void)
 {
        enum rte_meter_color in[4], out[4];
        /**

-         * test 4 points that will produce green, yellow, yellow, red flag 
-         * if using blind check 
+         * test 4 points that will produce green, yellow, yellow, red flag
+         * if using blind check

          */
 
        /* previouly have a green, test points should keep unchanged */
          */
 
        /* previouly have a green, test points should keep unchanged */


@@ -448,7 +448,7 @@ tm_test_trtcm_color_aware_check(void)
        out[3] = e_RTE_METER_RED;
        if(tm_test_trtcm_aware_check(in, out) != 0)
                return -1;
        out[3] = e_RTE_METER_RED;
        if(tm_test_trtcm_aware_check(in, out) != 0)
                return -1;

-       
+

        in[0] = in[1] = in[2] = in[3] = e_RTE_METER_YELLOW;
        out[0] = e_RTE_METER_YELLOW;
        out[1] = e_RTE_METER_YELLOW;
        in[0] = in[1] = in[2] = in[3] = e_RTE_METER_YELLOW;
        out[0] = e_RTE_METER_YELLOW;
        out[1] = e_RTE_METER_YELLOW;


@@ -456,7 +456,7 @@ tm_test_trtcm_color_aware_check(void)
        out[3] = e_RTE_METER_RED;
        if(tm_test_trtcm_aware_check(in, out) != 0)
                return -1;
        out[3] = e_RTE_METER_RED;
        if(tm_test_trtcm_aware_check(in, out) != 0)
                return -1;

-       
+

        in[0] = in[1] = in[2] = in[3] = e_RTE_METER_RED;
        out[0] = e_RTE_METER_RED;
        out[1] = e_RTE_METER_RED;
        in[0] = in[1] = in[2] = in[3] = e_RTE_METER_RED;
        out[0] = e_RTE_METER_RED;
        out[1] = e_RTE_METER_RED;


@@ -471,14 +471,14 @@ tm_test_trtcm_color_aware_check(void)
 /**
  * test main entrance for library meter
  */
 /**
  * test main entrance for library meter
  */

-int 
+int

 test_meter(void)
 {
        if(tm_test_srtcm_config() != 0 )
                return -1;
 
        if(tm_test_trtcm_config() != 0 )
 test_meter(void)
 {
        if(tm_test_srtcm_config() != 0 )
                return -1;
 
        if(tm_test_trtcm_config() != 0 )

-               return -1;      
+               return -1;

 
        if(tm_test_srtcm_color_blind_check() != 0)
                return -1;
 
        if(tm_test_srtcm_color_blind_check() != 0)
                return -1;


@@ -488,10 +488,10 @@ test_meter(void)
 
        if(tm_test_srtcm_color_aware_check()!= 0)
                return -1;
 
        if(tm_test_srtcm_color_aware_check()!= 0)
                return -1;

-       
+

        if(tm_test_trtcm_color_aware_check()!= 0)
                return -1;
        if(tm_test_trtcm_color_aware_check()!= 0)
                return -1;

-       
+

        return 0;
 
 }
        return 0;
 
 }

diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c
index 2c916f6..9d7d28e 100644 (file)
--- a/app/test/test_mp_secondary.c
+++ b/app/test/test_mp_secondary.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -174,7 +174,7 @@ run_object_creation_tests(void)
        printf("### Testing object creation - expect lots of mz reserve errors!\n");
 
        rte_errno = 0;
        printf("### Testing object creation - expect lots of mz reserve errors!\n");
 
        rte_errno = 0;

-       if ((rte_memzone_reserve("test_mz", size, rte_socket_id(), 
+       if ((rte_memzone_reserve("test_mz", size, rte_socket_id(),

                                 flags) == NULL) &&
            (rte_memzone_lookup("test_mz") == NULL)) {
                printf("Error: unexpected return value from rte_memzone_reserve\n");
                                 flags) == NULL) &&
            (rte_memzone_lookup("test_mz") == NULL)) {
                printf("Error: unexpected return value from rte_memzone_reserve\n");


@@ -213,7 +213,7 @@ run_object_creation_tests(void)
 
        const struct rte_fbk_hash_params fbk_params = { .name = "test_fbk_mp_hash" };
        rte_errno=0;
 
        const struct rte_fbk_hash_params fbk_params = { .name = "test_fbk_mp_hash" };
        rte_errno=0;

-       if ((rte_fbk_hash_create(&fbk_params) != NULL) && 
+       if ((rte_fbk_hash_create(&fbk_params) != NULL) &&

            (rte_fbk_hash_find_existing(fbk_params.name) == NULL)){
                printf("Error: unexpected return value from rte_fbk_hash_create()\n");
                return -1;
            (rte_fbk_hash_find_existing(fbk_params.name) == NULL)){
                printf("Error: unexpected return value from rte_fbk_hash_create()\n");
                return -1;

diff --git a/app/test/test_pci.c b/app/test/test_pci.c
index 6908d04..21428a9 100644 (file)
--- a/app/test/test_pci.c
+++ b/app/test/test_pci.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.

- * 
+ *

  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
  *   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
  *     * 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


@@ -18,7 +18,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.
  *     * 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
  *   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

diff --git a/app/test/test_per_lcore.c b/app/test/test_per_lcore.c
index bd7b526..2241ed5 100644 (file)
--- a/app/test/test_per_lcore.c
+++ b/app/test/test_per_lcore.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c
index 1fe38fa..0d3d95c 100644 (file)
--- a/app/test/test_pmd_ring.c
+++ b/app/test/test_pmd_ring.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -65,7 +65,7 @@ test_ethdev_configure(void)
        struct rte_eth_link link;
 
        memset(&null_conf, 0, sizeof(struct rte_eth_conf));
        struct rte_eth_link link;
 
        memset(&null_conf, 0, sizeof(struct rte_eth_conf));

-       
+

        if ((TX_PORT >= RTE_MAX_ETHPORTS) || (RX_PORT >= RTE_MAX_ETHPORTS)\
                || (RXTX_PORT >= RTE_MAX_ETHPORTS)) {
                printf(" TX/RX port exceed max eth ports\n");
        if ((TX_PORT >= RTE_MAX_ETHPORTS) || (RX_PORT >= RTE_MAX_ETHPORTS)\
                || (RXTX_PORT >= RTE_MAX_ETHPORTS)) {
                printf(" TX/RX port exceed max eth ports\n");


@@ -206,7 +206,7 @@ test_stats_reset(void)
        printf("Testing ring PMD stats reset\n");
 
        rte_eth_stats_reset(RXTX_PORT);
        printf("Testing ring PMD stats reset\n");
 
        rte_eth_stats_reset(RXTX_PORT);

-       
+

        /* check stats of RXTX port, should all be zero */
        rte_eth_stats_get(RXTX_PORT, &stats);
        if (stats.ipackets != 0 || stats.opackets != 0 ||
        /* check stats of RXTX port, should all be zero */
        rte_eth_stats_get(RXTX_PORT, &stats);
        if (stats.ipackets != 0 || stats.opackets != 0 ||


@@ -236,7 +236,7 @@ test_stats_reset(void)
        }
 
        rte_eth_stats_reset(RXTX_PORT);
        }
 
        rte_eth_stats_reset(RXTX_PORT);

-       
+

        /* check stats of RXTX port, should all be zero */
        rte_eth_stats_get(RXTX_PORT, &stats);
        if (stats.ipackets != 0 || stats.opackets != 0 ||
        /* check stats of RXTX port, should all be zero */
        rte_eth_stats_get(RXTX_PORT, &stats);
        if (stats.ipackets != 0 || stats.opackets != 0 ||


@@ -249,7 +249,7 @@ test_stats_reset(void)
        return 0;
 }
 
        return 0;
 }
 

-static int 
+static int

 test_pmd_ring_init(void)
 {
        struct rte_eth_stats stats;
 test_pmd_ring_init(void)
 {
        struct rte_eth_stats stats;


@@ -330,13 +330,13 @@ test_pmd_ring_pair_create(void)
                return -1;
        }
 
                return -1;
        }
 

-       if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) 
+       if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)

                || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {
                printf("RX queue setup failed\n");
                return -1;
        }
 
                || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {
                printf("RX queue setup failed\n");
                return -1;
        }
 

-       if ((rte_eth_dev_start(RXTX_PORT4) < 0) 
+       if ((rte_eth_dev_start(RXTX_PORT4) < 0)

                || (rte_eth_dev_start(RXTX_PORT5) < 0)) {
                printf("Error starting RXTX port\n");
                return -1;
                || (rte_eth_dev_start(RXTX_PORT5) < 0)) {
                printf("Error starting RXTX port\n");
                return -1;


@@ -398,18 +398,18 @@ test_pmd_ring_pair_attach(void)
                return -1;
        }
 
                return -1;
        }
 

-       if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) 
+       if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)

                || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {
                printf("RX queue setup failed\n");
                return -1;
        }
 
                || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {
                printf("RX queue setup failed\n");
                return -1;
        }
 

-       if ((rte_eth_dev_start(RXTX_PORT4) < 0) 
+       if ((rte_eth_dev_start(RXTX_PORT4) < 0)

                || (rte_eth_dev_start(RXTX_PORT5) < 0)) {
                printf("Error starting RXTX port\n");
                return -1;
        }
                || (rte_eth_dev_start(RXTX_PORT5) < 0)) {
                printf("Error starting RXTX port\n");
                return -1;
        }

-       
+

        rte_eth_stats_reset(RXTX_PORT4);
        rte_eth_stats_reset(RXTX_PORT5);
 
        rte_eth_stats_reset(RXTX_PORT4);
        rte_eth_stats_reset(RXTX_PORT5);
 


@@ -441,7 +441,7 @@ test_pmd_ring_pair_attach(void)
 
        rte_eth_dev_stop(RXTX_PORT4);
        rte_eth_dev_stop(RXTX_PORT5);
 
        rte_eth_dev_stop(RXTX_PORT4);
        rte_eth_dev_stop(RXTX_PORT5);

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -499,7 +499,7 @@ test_pmd_ring(void)
                return -1;
 
        if (test_pmd_ring_pair_attach() < 0)
                return -1;
 
        if (test_pmd_ring_pair_attach() < 0)

-               return -1;      
+               return -1;

        return 0;
 }
 
        return 0;
 }
 

diff --git a/app/test/test_power.c b/app/test/test_power.c
index 0b08fce..ee9011f 100644 (file)
--- a/app/test/test_power.c
+++ b/app/test/test_power.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_prefetch.c b/app/test/test_prefetch.c
index f130f6e..10039b7 100644 (file)
--- a/app/test/test_prefetch.c
+++ b/app/test/test_prefetch.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_red.c b/app/test/test_red.c
index bee490e..bb62aba 100644 (file)
--- a/app/test/test_red.c
+++ b/app/test/test_red.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -76,7 +76,7 @@ struct test_queue {                 /**< Test structure for RTE_RED Queues */
        uint32_t *qconfig;              /**< Configuration of RTE_RED queues for test */
        uint32_t *q;                    /**< Queue size */
        uint32_t q_ramp_up;             /**< Num of enqueues to ramp up the queue */
        uint32_t *qconfig;              /**< Configuration of RTE_RED queues for test */
        uint32_t *q;                    /**< Queue size */
        uint32_t q_ramp_up;             /**< Num of enqueues to ramp up the queue */

-       uint32_t avg_ramp_up;           /**< Average num of enqueues to ramp up the queue */ 
+       uint32_t avg_ramp_up;           /**< Average num of enqueues to ramp up the queue */

        uint32_t avg_tolerance;         /**< Tolerance in queue average */
        double drop_tolerance;          /**< Drop tolerance of packets not enqueued */
 };
        uint32_t avg_tolerance;         /**< Tolerance in queue average */
        double drop_tolerance;          /**< Drop tolerance of packets not enqueued */
 };


@@ -310,7 +310,7 @@ static uint64_t get_machclk_freq(void)
        end = rte_rdtsc();
 
        diff = (uint64_t)(tv_end.tv_sec - tv_start.tv_sec) * USEC_PER_SEC
        end = rte_rdtsc();
 
        diff = (uint64_t)(tv_end.tv_sec - tv_start.tv_sec) * USEC_PER_SEC

-               + ((tv_end.tv_nsec - tv_start.tv_nsec + TEST_NSEC_MARGIN) / 
+               + ((tv_end.tv_nsec - tv_start.tv_nsec + TEST_NSEC_MARGIN) /

                   USEC_PER_MSEC); /**< diff is in micro secs */
 
        if (diff == 0)
                   USEC_PER_MSEC); /**< diff is in micro secs */
 
        if (diff == 0)


@@ -419,7 +419,7 @@ increase_average_qsize(struct rte_red_config *red_cfg,
 static struct rte_red_config ft_wrconfig[1];
 static struct rte_red ft_rtdata[1];
 static uint8_t ft_wq_log2[] = {9};
 static struct rte_red_config ft_wrconfig[1];
 static struct rte_red ft_rtdata[1];
 static uint8_t ft_wq_log2[] = {9};

-static uint8_t ft_maxp_inv[] = {10}; 
+static uint8_t ft_maxp_inv[] = {10};

 static uint32_t  ft_qconfig[] = {0, 0, 1, 1};
 static uint32_t  ft_q[] ={0};
 static uint32_t  ft_dropped[] ={0};
 static uint32_t  ft_qconfig[] = {0, 0, 1, 1};
 static uint32_t  ft_q[] ={0};
 static uint32_t  ft_dropped[] ={0};


@@ -518,7 +518,7 @@ static enum test_result func_test1(struct test_config *tcfg)
                goto out;
        }
 
                goto out;
        }
 

-       printf("%s", tcfg->htxt); 
+       printf("%s", tcfg->htxt);

 
        for (i = 0; i < RTE_DIM(ft1_tlevels); i++) {
                const char *label = NULL;
 
        for (i = 0; i < RTE_DIM(ft1_tlevels); i++) {
                const char *label = NULL;


@@ -793,10 +793,10 @@ static enum test_result func_test3(struct test_config *tcfg)
                        result = FAIL;
                }
 
                        result = FAIL;
                }
 

-               exp_avg = calc_exp_avg_on_empty(avg_before, 
+               exp_avg = calc_exp_avg_on_empty(avg_before,

                                              (1 << *tcfg->tconfig->wq_log2),
                                              tcfg->tvar->wait_usec);
                                              (1 << *tcfg->tconfig->wq_log2),
                                              tcfg->tvar->wait_usec);

-               avg_after = rte_red_get_avg_float(tcfg->tconfig->rconfig, 
+               avg_after = rte_red_get_avg_float(tcfg->tconfig->rconfig,

                                                  tcfg->tqueue->rdata);
                if (!check_avg(&diff, avg_after, exp_avg, (double)tcfg->tqueue->avg_tolerance))
                        result = FAIL;
                                                  tcfg->tqueue->rdata);
                if (!check_avg(&diff, avg_after, exp_avg, (double)tcfg->tqueue->avg_tolerance))
                        result = FAIL;


@@ -905,7 +905,7 @@ static enum test_result func_test4(struct test_config *tcfg)
        rte_red_mark_queue_empty(tcfg->tqueue->rdata, get_port_ts());
 
        /**
        rte_red_mark_queue_empty(tcfg->tqueue->rdata, get_port_ts());
 
        /**

-        * record empty time locally 
+        * record empty time locally

         */
        start = rte_rdtsc();
 
         */
        start = rte_rdtsc();
 


@@ -914,8 +914,8 @@ static enum test_result func_test4(struct test_config *tcfg)
        /**
         * enqueue one packet to recalculate average queue size
         */
        /**
         * enqueue one packet to recalculate average queue size
         */

-       if (rte_red_enqueue(tcfg->tconfig->rconfig,  
-                           tcfg->tqueue->rdata, 
+       if (rte_red_enqueue(tcfg->tconfig->rconfig,
+                           tcfg->tqueue->rdata,

                            *tcfg->tqueue->q,
                            get_port_ts()) != 0) {
                result = FAIL;
                            *tcfg->tqueue->q,
                            get_port_ts()) != 0) {
                result = FAIL;


@@ -1077,7 +1077,7 @@ static enum test_result func_test5(struct test_config *tcfg)
 
                drop_rate = calc_drop_rate(tcfg->tvar->enqueued[j],tcfg->tvar->dropped[j]);
                drop_prob = calc_drop_prob(tcfg->tconfig->min_th, tcfg->tconfig->max_th,
 
                drop_rate = calc_drop_rate(tcfg->tvar->enqueued[j],tcfg->tvar->dropped[j]);
                drop_prob = calc_drop_prob(tcfg->tconfig->min_th, tcfg->tconfig->max_th,

-                                          tcfg->tconfig->maxp_inv[tcfg->tqueue->qconfig[j]], 
+                                          tcfg->tconfig->maxp_inv[tcfg->tqueue->qconfig[j]],

                                           *tcfg->tlevel);
                if (!check_drop_rate(&diff, drop_rate, drop_prob, (double)tcfg->tqueue->drop_tolerance))
                        result = FAIL;
                                           *tcfg->tlevel);
                if (!check_drop_rate(&diff, drop_rate, drop_prob, (double)tcfg->tqueue->drop_tolerance))
                        result = FAIL;


@@ -1183,7 +1183,7 @@ static enum test_result func_test6(struct test_config *tcfg)
                double exp_avg = 0;
                double diff = 0.0;
 
                double exp_avg = 0;
                double diff = 0.0;
 

-               avg_before = rte_red_get_avg_float(&tcfg->tconfig->rconfig[tcfg->tqueue->qconfig[j]], 
+               avg_before = rte_red_get_avg_float(&tcfg->tconfig->rconfig[tcfg->tqueue->qconfig[j]],

                                                   &tcfg->tqueue->rdata[j]);
 
                /**
                                                   &tcfg->tqueue->rdata[j]);
 
                /**


@@ -1196,7 +1196,7 @@ static enum test_result func_test6(struct test_config *tcfg)
                /**
                 * enqueue one packet to recalculate average queue size
                 */
                /**
                 * enqueue one packet to recalculate average queue size
                 */

-               if (rte_red_enqueue(&tcfg->tconfig->rconfig[tcfg->tqueue->qconfig[j]], 
+               if (rte_red_enqueue(&tcfg->tconfig->rconfig[tcfg->tqueue->qconfig[j]],

                                    &tcfg->tqueue->rdata[j],
                                    tcfg->tqueue->q[j],
                                    get_port_ts()) == 0) {
                                    &tcfg->tqueue->rdata[j],
                                    tcfg->tqueue->q[j],
                                    get_port_ts()) == 0) {


@@ -1206,7 +1206,7 @@ static enum test_result func_test6(struct test_config *tcfg)
                        result = FAIL;
                }
 
                        result = FAIL;
                }
 

-               exp_avg = calc_exp_avg_on_empty(avg_before, 
+               exp_avg = calc_exp_avg_on_empty(avg_before,

                                (1 << tcfg->tconfig->wq_log2[tcfg->tqueue->qconfig[j]]),
                                tcfg->tvar->wait_usec);
                avg_after = rte_red_get_avg_float(&tcfg->tconfig->rconfig[tcfg->tqueue->qconfig[j]],
                                (1 << tcfg->tconfig->wq_log2[tcfg->tqueue->qconfig[j]]),
                                tcfg->tvar->wait_usec);
                avg_after = rte_red_get_avg_float(&tcfg->tconfig->rconfig[tcfg->tqueue->qconfig[j]],


@@ -1229,7 +1229,7 @@ out:
 static struct rte_red_config pt_wrconfig[1];
 static struct rte_red pt_rtdata[1];
 static uint8_t pt_wq_log2[] = {9};
 static struct rte_red_config pt_wrconfig[1];
 static struct rte_red pt_rtdata[1];
 static uint8_t pt_wq_log2[] = {9};

-static uint8_t pt_maxp_inv[] = {10}; 
+static uint8_t pt_maxp_inv[] = {10};

 static uint32_t pt_qconfig[] = {0};
 static uint32_t pt_q[] = {0};
 static uint32_t pt_dropped[] = {0};
 static uint32_t pt_qconfig[] = {0};
 static uint32_t pt_q[] = {0};
 static uint32_t pt_dropped[] = {0};


@@ -1286,7 +1286,7 @@ static void enqueue_dequeue_perf(struct rte_red_config *red_cfg,
 }
 
 /**
 }
 
 /**

- * Setup test structures for tests P1, P2, P3 
+ * Setup test structures for tests P1, P2, P3

  * performance tests 1, 2 and 3
  */
 static uint32_t pt1_tlevel[] = {16};
  * performance tests 1, 2 and 3
  */
 static uint32_t pt1_tlevel[] = {16};


@@ -1337,8 +1337,8 @@ static struct test_config perf1_test3_config = {
 };
 
 /**
 };
 
 /**

- * Performance test function to measure enqueue performance. 
- * This runs performance tests 1, 2 and 3 
+ * Performance test function to measure enqueue performance.
+ * This runs performance tests 1, 2 and 3

  */
 static enum test_result perf1_test(struct test_config *tcfg)
 {
  */
 static enum test_result perf1_test(struct test_config *tcfg)
 {


@@ -1369,7 +1369,7 @@ static enum test_result perf1_test(struct test_config *tcfg)
         *  set the queue average
         */
        rte_red_set_avg_int(tcfg->tconfig->rconfig, tcfg->tqueue->rdata, *tcfg->tlevel);
         *  set the queue average
         */
        rte_red_set_avg_int(tcfg->tconfig->rconfig, tcfg->tqueue->rdata, *tcfg->tlevel);

-       if (rte_red_get_avg_int(tcfg->tconfig->rconfig, tcfg->tqueue->rdata) 
+       if (rte_red_get_avg_int(tcfg->tconfig->rconfig, tcfg->tqueue->rdata)

            != *tcfg->tlevel) {
                result = FAIL;
                goto out;
            != *tcfg->tlevel) {
                result = FAIL;
                goto out;


@@ -1395,7 +1395,7 @@ out:
 }
 
 /**
 }
 
 /**

- * Setup test structures for tests P4, P5, P6 
+ * Setup test structures for tests P4, P5, P6

  * performance tests 4, 5 and 6
  */
 static uint32_t pt4_tlevel[] = {16};
  * performance tests 4, 5 and 6
  */
 static uint32_t pt4_tlevel[] = {16};


@@ -1469,8 +1469,8 @@ static struct test_config perf2_test6_config = {
 };
 
 /**
 };
 
 /**

- * Performance test function to measure enqueue performance when the 
- * queue is empty. This runs performance tests 4, 5 and 6 
+ * Performance test function to measure enqueue performance when the
+ * queue is empty. This runs performance tests 4, 5 and 6

  */
 static enum test_result perf2_test(struct test_config *tcfg)
 {
  */
 static enum test_result perf2_test(struct test_config *tcfg)
 {


@@ -1488,7 +1488,7 @@ static enum test_result perf2_test(struct test_config *tcfg)
                goto out;
        }
 
                goto out;
        }
 

-       printf("%s", tcfg->htxt); 
+       printf("%s", tcfg->htxt);

 
        for (i = 0; i < tcfg->tvar->num_iterations; i++) {
                uint32_t count = 0;
 
        for (i = 0; i < tcfg->tvar->num_iterations; i++) {
                uint32_t count = 0;


@@ -1534,7 +1534,7 @@ static enum test_result perf2_test(struct test_config *tcfg)
                 */
                ts = get_port_ts();
                rdtsc_prof_start(&prof);
                 */
                ts = get_port_ts();
                rdtsc_prof_start(&prof);

-               ret = rte_red_enqueue(tcfg->tconfig->rconfig, tcfg->tqueue->rdata, 
+               ret = rte_red_enqueue(tcfg->tconfig->rconfig, tcfg->tqueue->rdata,

                                      *tcfg->tqueue->q, ts );
                rdtsc_prof_end(&prof);
 
                                      *tcfg->tqueue->q, ts );
                rdtsc_prof_end(&prof);
 


@@ -1557,7 +1557,7 @@ static enum test_result perf2_test(struct test_config *tcfg)
                        int ok = 0;
 
                        avg_after = rte_red_get_avg_float(tcfg->tconfig->rconfig, tcfg->tqueue->rdata);
                        int ok = 0;
 
                        avg_after = rte_red_get_avg_float(tcfg->tconfig->rconfig, tcfg->tqueue->rdata);

-                       exp_avg = calc_exp_avg_on_empty(avg_before, 
+                       exp_avg = calc_exp_avg_on_empty(avg_before,

                                                  (1 << *tcfg->tconfig->wq_log2),
                                                  tcfg->tvar->wait_usec);
                        if (check_avg(&diff, avg_after, exp_avg, (double)tcfg->tqueue->avg_tolerance))
                                                  (1 << *tcfg->tconfig->wq_log2),
                                                  tcfg->tvar->wait_usec);
                        if (check_avg(&diff, avg_after, exp_avg, (double)tcfg->tqueue->avg_tolerance))


@@ -1589,7 +1589,7 @@ static uint32_t avg_max_bits = 0;
 
 static struct rte_red_config ovfl_wrconfig[1];
 static struct rte_red ovfl_rtdata[1];
 
 static struct rte_red_config ovfl_wrconfig[1];
 static struct rte_red ovfl_rtdata[1];

-static uint8_t ovfl_maxp_inv[] = {10}; 
+static uint8_t ovfl_maxp_inv[] = {10};

 static uint32_t ovfl_qconfig[] = {0, 0, 1, 1};
 static uint32_t ovfl_q[] ={0};
 static uint32_t ovfl_dropped[] ={0};
 static uint32_t ovfl_qconfig[] = {0, 0, 1, 1};
 static uint32_t ovfl_q[] ={0};
 static uint32_t ovfl_dropped[] ={0};


@@ -1735,7 +1735,7 @@ static enum test_result ovfl_test1(struct test_config *tcfg)
                result = FAIL;
 
        printf("%s", tcfg->htxt);
                result = FAIL;
 
        printf("%s", tcfg->htxt);

-       
+

        printf("%-16u%-9u%-15u0x%08x     %-10u%-10u%-10u%-13.2lf%-13.2lf\n",
               avg, *tcfg->tconfig->wq_log2, RTE_RED_SCALING,
               avg_max, avg_max_bits,
        printf("%-16u%-9u%-15u0x%08x     %-10u%-10u%-10u%-13.2lf%-13.2lf\n",
               avg, *tcfg->tconfig->wq_log2, RTE_RED_SCALING,
               avg_max, avg_max_bits,


@@ -1748,17 +1748,17 @@ out:
 /**
  * define the functional and performance tests to be executed
  */
 /**
  * define the functional and performance tests to be executed
  */

-struct tests func_tests[] = { 
+struct tests func_tests[] = {

        { &func_test1_config, func_test1 },
        { &func_test1_config, func_test1 },

-       { &func_test2_config, func_test2 },             
+       { &func_test2_config, func_test2 },

        { &func_test3_config, func_test3 },
        { &func_test4_config, func_test4 },
        { &func_test5_config, func_test5 },
        { &func_test6_config, func_test6 },
        { &func_test3_config, func_test3 },
        { &func_test4_config, func_test4 },
        { &func_test5_config, func_test5 },
        { &func_test6_config, func_test6 },

-       { &ovfl_test1_config, ovfl_test1 }, 
+       { &ovfl_test1_config, ovfl_test1 },

 };
 
 };
 

-struct tests perf_tests[] = { 
+struct tests perf_tests[] = {

        { &perf1_test1_config, perf1_test },
        { &perf1_test2_config, perf1_test },
        { &perf1_test3_config, perf1_test },
        { &perf1_test1_config, perf1_test },
        { &perf1_test2_config, perf1_test },
        { &perf1_test3_config, perf1_test },

diff --git a/app/test/test_ring.c b/app/test/test_ring.c
index cfd907f..be588f2 100644 (file)
--- a/app/test/test_ring.c
+++ b/app/test/test_ring.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_ring_perf.c b/app/test/test_ring_perf.c
index 0e238c1..9ec6932 100644 (file)
--- a/app/test/test_ring_perf.c
+++ b/app/test/test_ring_perf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -54,7 +54,7 @@
 #define RING_SIZE 4096
 #define MAX_BURST 32
 
 #define RING_SIZE 4096
 #define MAX_BURST 32
 

-/* 
+/*

  * the sizes to enqueue and dequeue in testing
  * (marked volatile so they won't be seen as compile-time constants)
  */
  * the sizes to enqueue and dequeue in testing
  * (marked volatile so they won't be seen as compile-time constants)
  */


@@ -166,7 +166,7 @@ test_empty_dequeue(void)
                        (double)(mc_end-mc_start) / iterations);
 }
 
                        (double)(mc_end-mc_start) / iterations);
 }
 

-/* 
+/*

  * for the separate enqueue and dequeue threads they take in one param
  * and return two. Input = burst size, output = cycle average for sp/sc & mp/mc
  */
  * for the separate enqueue and dequeue threads they take in one param
  * and return two. Input = burst size, output = cycle average for sp/sc & mp/mc
  */


@@ -175,9 +175,9 @@ struct thread_params {
        double spsc, mpmc;    /* output value, the single or multi timings */
 };
 
        double spsc, mpmc;    /* output value, the single or multi timings */
 };
 

-/* 
+/*

  * Function that uses rdtsc to measure timing for ring enqueue. Needs pair
  * Function that uses rdtsc to measure timing for ring enqueue. Needs pair

- * thread running dequeue_bulk function 
+ * thread running dequeue_bulk function

  */
 static int
 enqueue_bulk(void *p)
  */
 static int
 enqueue_bulk(void *p)


@@ -210,9 +210,9 @@ enqueue_bulk(void *p)
        return 0;
 }
 
        return 0;
 }
 

-/* 
+/*

  * Function that uses rdtsc to measure timing for ring dequeue. Needs pair
  * Function that uses rdtsc to measure timing for ring dequeue. Needs pair

- * thread running enqueue_bulk function 
+ * thread running enqueue_bulk function

  */
 static int
 dequeue_bulk(void *p)
  */
 static int
 dequeue_bulk(void *p)


@@ -245,7 +245,7 @@ dequeue_bulk(void *p)
        return 0;
 }
 
        return 0;
 }
 

-/* 
+/*

  * Function that calls the enqueue and dequeue bulk functions on pairs of cores.
  * used to measure ring perf between hyperthreads, cores and sockets.
  */
  * Function that calls the enqueue and dequeue bulk functions on pairs of cores.
  * used to measure ring perf between hyperthreads, cores and sockets.
  */


@@ -275,7 +275,7 @@ run_on_core_pair(struct lcore_pair *cores,
        }
 }
 
        }
 }
 

-/* 
+/*

  * Test function that determines how long an enqueue + dequeue of a single item
  * takes on a single lcore. Result is for comparison with the bulk enq+deq.
  */
  * Test function that determines how long an enqueue + dequeue of a single item
  * takes on a single lcore. Result is for comparison with the bulk enq+deq.
  */


@@ -307,7 +307,7 @@ test_single_enqueue_dequeue(void)
                        (mc_end-mc_start) >> iter_shift);
 }
 
                        (mc_end-mc_start) >> iter_shift);
 }
 

-/* 
+/*

  * Test that does both enqueue and dequeue on a core using the burst() API calls
  * instead of the bulk() calls used in other tests. Results should be the same
  * as for the bulk function called on a single lcore.
  * Test that does both enqueue and dequeue on a core using the burst() API calls
  * instead of the bulk() calls used in other tests. Results should be the same
  * as for the bulk function called on a single lcore.

diff --git a/app/test/test_rwlock.c b/app/test/test_rwlock.c
index a76ae56..89fc594 100644 (file)
--- a/app/test/test_rwlock.c
+++ b/app/test/test_rwlock.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_sched.c b/app/test/test_sched.c
index 206eb5b..d9abb51 100644 (file)
--- a/app/test/test_sched.c
+++ b/app/test/test_sched.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -155,7 +155,7 @@ prepare_pkt(struct rte_mbuf *mbuf)
 /**
  * test main entrance for library sched
  */
 /**
  * test main entrance for library sched
  */

-int 
+int

 test_sched(void)
 {
        struct rte_mempool *mp = NULL;
 test_sched(void)
 {
        struct rte_mempool *mp = NULL;


@@ -175,7 +175,7 @@ test_sched(void)
        port = rte_sched_port_config(&port_param);
        VERIFY(port != NULL, "Error config sched port\n");
 
        port = rte_sched_port_config(&port_param);
        VERIFY(port != NULL, "Error config sched port\n");
 

-       
+

        err = rte_sched_subport_config(port, SUBPORT, subport_param);
        VERIFY(err == 0, "Error config sched, err=%d\n", err);
 
        err = rte_sched_subport_config(port, SUBPORT, subport_param);
        VERIFY(err == 0, "Error config sched, err=%d\n", err);
 

diff --git a/app/test/test_spinlock.c b/app/test/test_spinlock.c
index ffeebf7..9b45d8e 100644 (file)
--- a/app/test/test_spinlock.c
+++ b/app/test/test_spinlock.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_string_fns.c b/app/test/test_string_fns.c
index 1a7b024..223797c 100644 (file)
--- a/app/test/test_string_fns.c
+++ b/app/test/test_string_fns.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_tailq.c b/app/test/test_tailq.c
index 663d9fb..67da009 100644 (file)
--- a/app/test/test_tailq.c
+++ b/app/test/test_tailq.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_timer.c b/app/test/test_timer.c
index 0eba5f7..57b722c 100644 (file)
--- a/app/test/test_timer.c
+++ b/app/test/test_timer.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_timer_perf.c b/app/test/test_timer_perf.c
index 632cc6c..83bd45d 100644 (file)
--- a/app/test/test_timer_perf.c
+++ b/app/test/test_timer_perf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/app/test/test_version.c b/app/test/test_version.c
index 83474ec..ac6ffa0 100644 (file)
--- a/app/test/test_version.c
+++ b/app/test/test_version.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/config/common_bsdapp b/config/common_bsdapp
index 2cc7b80..2a14db3 100644 (file)
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -122,7 +122,7 @@ CONFIG_RTE_LIBRTE_EAL_BAREMETAL=n
 
 #
 # Compile Environment Abstraction Layer to support Vmware TSC map
 
 #
 # Compile Environment Abstraction Layer to support Vmware TSC map

-# 
+#

 CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y
 
 #
 CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y
 
 #

diff --git a/config/common_linuxapp b/config/common_linuxapp
index 62619c6..01604e4 100644 (file)
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -136,7 +136,7 @@ CONFIG_RTE_LIBRTE_EAL_BAREMETAL=n
 
 #
 # Compile Environment Abstraction Layer to support Vmware TSC map
 
 #
 # Compile Environment Abstraction Layer to support Vmware TSC map

-# 
+#

 CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y
 
 #
 CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y
 
 #

diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc
index 8bb5c5a..8cad745 100644 (file)
--- a/config/defconfig_i686-native-linuxapp-gcc
+++ b/config/defconfig_i686-native-linuxapp-gcc
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc
index e030246..7cb9beb 100644 (file)
--- a/config/defconfig_i686-native-linuxapp-icc
+++ b/config/defconfig_i686-native-linuxapp-icc
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/config/defconfig_x86_64-ivshmem-linuxapp-gcc b/config/defconfig_x86_64-ivshmem-linuxapp-gcc
index d53b8a4..41ac5c3 100644 (file)
--- a/config/defconfig_x86_64-ivshmem-linuxapp-gcc
+++ b/config/defconfig_x86_64-ivshmem-linuxapp-gcc
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/config/defconfig_x86_64-ivshmem-linuxapp-icc b/config/defconfig_x86_64-ivshmem-linuxapp-icc
index 3845313..77fec93 100644 (file)
--- a/config/defconfig_x86_64-ivshmem-linuxapp-icc
+++ b/config/defconfig_x86_64-ivshmem-linuxapp-icc
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc
index b131dea..e91738b 100644 (file)
--- a/config/defconfig_x86_64-native-bsdapp-gcc
+++ b/config/defconfig_x86_64-native-bsdapp-gcc
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc
index 2a4ce89..54d71f9 100644 (file)
--- a/config/defconfig_x86_64-native-linuxapp-gcc
+++ b/config/defconfig_x86_64-native-linuxapp-gcc
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc
index b2774e1..cbefcf0 100644 (file)
--- a/config/defconfig_x86_64-native-linuxapp-icc
+++ b/config/defconfig_x86_64-native-linuxapp-icc
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile
index 1033967..9ebe435 100644 (file)
--- a/examples/cmdline/Makefile
+++ b/examples/cmdline/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c
index afce715..fe82be5 100644 (file)
--- a/examples/cmdline/commands.c
+++ b/examples/cmdline/commands.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/cmdline/commands.h b/examples/cmdline/commands.h
index 11da660..712894b 100644 (file)
--- a/examples/cmdline/commands.h
+++ b/examples/cmdline/commands.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/cmdline/main.c b/examples/cmdline/main.c
index 4487754..668f152 100644 (file)
--- a/examples/cmdline/main.c
+++ b/examples/cmdline/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/cmdline/main.h b/examples/cmdline/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/cmdline/main.h
+++ b/examples/cmdline/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/cmdline/parse_obj_list.c b/examples/cmdline/parse_obj_list.c
index 6dcc3e8..45a26ef 100644 (file)
--- a/examples/cmdline/parse_obj_list.c
+++ b/examples/cmdline/parse_obj_list.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/cmdline/parse_obj_list.h b/examples/cmdline/parse_obj_list.h
index 0f5b309..297fec4 100644 (file)
--- a/examples/cmdline/parse_obj_list.h
+++ b/examples/cmdline/parse_obj_list.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/dpdk_qat/Makefile b/examples/dpdk_qat/Makefile
index 4dd12b5..f1e06a1 100644 (file)
--- a/examples/dpdk_qat/Makefile
+++ b/examples/dpdk_qat/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
 #   All rights reserved.
 #   Copyright(c) 2010-2013 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:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -70,7 +70,7 @@ CFLAGS += -I$(ICP_ROOT)/quickassist/include \
                -I$(ICP_ROOT)/quickassist/include/lac \
                -I$(ICP_ROOT)/quickassist/lookaside/access_layer/include
 
                -I$(ICP_ROOT)/quickassist/include/lac \
                -I$(ICP_ROOT)/quickassist/lookaside/access_layer/include
 

-# From CRF 1.2 driver, library was renamed to libicp_qa_al.a 
+# From CRF 1.2 driver, library was renamed to libicp_qa_al.a

 ifneq ($(wildcard $(ICP_ROOT)/build/icp_qa_al.a),)
 ICP_LIBRARY_PATH = $(ICP_ROOT)/build/icp_qa_al.a
 else
 ifneq ($(wildcard $(ICP_ROOT)/build/icp_qa_al.a),)
 ICP_LIBRARY_PATH = $(ICP_ROOT)/build/icp_qa_al.a
 else

diff --git a/examples/dpdk_qat/config_files/shumway/dh89xxcc_qa_dev0.conf b/examples/dpdk_qat/config_files/shumway/dh89xxcc_qa_dev0.conf
index 172d2ee..864a36e 100644 (file)
--- a/examples/dpdk_qat/config_files/shumway/dh89xxcc_qa_dev0.conf
+++ b/examples/dpdk_qat/config_files/shumway/dh89xxcc_qa_dev0.conf
@@ -2,14 +2,14 @@
 #
 # @par
 #   BSD LICENSE
 #
 # @par
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -19,7 +19,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.
 #     * 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
 #   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

diff --git a/examples/dpdk_qat/config_files/shumway/dh89xxcc_qa_dev1.conf b/examples/dpdk_qat/config_files/shumway/dh89xxcc_qa_dev1.conf
index f43ceb3..1783cc8 100644 (file)
--- a/examples/dpdk_qat/config_files/shumway/dh89xxcc_qa_dev1.conf
+++ b/examples/dpdk_qat/config_files/shumway/dh89xxcc_qa_dev1.conf
@@ -2,14 +2,14 @@
 #
 # @par
 #   BSD LICENSE
 #
 # @par
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -19,7 +19,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.
 #     * 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
 #   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

diff --git a/examples/dpdk_qat/config_files/stargo/dh89xxcc_qa_dev0.conf b/examples/dpdk_qat/config_files/stargo/dh89xxcc_qa_dev0.conf
index 63d82d3..4b09070 100644 (file)
--- a/examples/dpdk_qat/config_files/stargo/dh89xxcc_qa_dev0.conf
+++ b/examples/dpdk_qat/config_files/stargo/dh89xxcc_qa_dev0.conf
@@ -2,14 +2,14 @@
 #
 # @par
 #   BSD LICENSE
 #
 # @par
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -19,7 +19,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.
 #     * 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
 #   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

diff --git a/examples/dpdk_qat/crypto.c b/examples/dpdk_qat/crypto.c
index 7606d3d..2f8ba3d 100644 (file)
--- a/examples/dpdk_qat/crypto.c
+++ b/examples/dpdk_qat/crypto.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/dpdk_qat/crypto.h b/examples/dpdk_qat/crypto.h
index 327b904..f68b0b6 100644 (file)
--- a/examples/dpdk_qat/crypto.h
+++ b/examples/dpdk_qat/crypto.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/dpdk_qat/main.c b/examples/dpdk_qat/main.c
index 741d3f3..a117d66 100644 (file)
--- a/examples/dpdk_qat/main.c
+++ b/examples/dpdk_qat/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/dpdk_qat/main.h b/examples/dpdk_qat/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/dpdk_qat/main.h
+++ b/examples/dpdk_qat/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/exception_path/Makefile b/examples/exception_path/Makefile
index 3959130..76f71d9 100644 (file)
--- a/examples/exception_path/Makefile
+++ b/examples/exception_path/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/exception_path/main.c b/examples/exception_path/main.c
index d73b413..78ed91d 100644 (file)
--- a/examples/exception_path/main.c
+++ b/examples/exception_path/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile
index b215a00..d2cca7a 100644 (file)
--- a/examples/helloworld/Makefile
+++ b/examples/helloworld/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/helloworld/main.c b/examples/helloworld/main.c
index 6c44212..0c0f833 100644 (file)
--- a/examples/helloworld/main.c
+++ b/examples/helloworld/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/helloworld/main.h b/examples/helloworld/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/helloworld/main.h
+++ b/examples/helloworld/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile
index 3115b95..9324e86 100644 (file)
--- a/examples/ip_reassembly/Makefile
+++ b/examples/ip_reassembly/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/ip_reassembly/ipv4_frag_tbl.h b/examples/ip_reassembly/ipv4_frag_tbl.h
index 5487230..c9eb502 100644 (file)
--- a/examples/ip_reassembly/ipv4_frag_tbl.h
+++ b/examples/ip_reassembly/ipv4_frag_tbl.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -52,7 +52,7 @@
  * return a faiure.
  * Another thing timing: entries that resides in the table longer then
  * <max_cycles> are considered as invalid, and could be removed/replaced
  * return a faiure.
  * Another thing timing: entries that resides in the table longer then
  * <max_cycles> are considered as invalid, and could be removed/replaced

- * byt the new ones. 
+ * byt the new ones.

  * <key, data> pair is stored together, all add/update/lookup opearions are not
  * MT safe.
  */
  * <key, data> pair is stored together, all add/update/lookup opearions are not
  * MT safe.
  */


@@ -266,7 +266,7 @@ ipv4_frag_find(struct ipv4_frag_tbl *tbl, struct ipv4_frag_death_row *dr,
                /*
                 * we found a free entry, check if we can use it.
                 * If we run out of free entries in the table, then
                /*
                 * we found a free entry, check if we can use it.
                 * If we run out of free entries in the table, then

-                * check if we have a timed out entry to delete. 
+                * check if we have a timed out entry to delete.

                 */
                } else if (free != NULL &&
                                tbl->max_entries <= tbl->use_entries) {
                 */
                } else if (free != NULL &&
                                tbl->max_entries <= tbl->use_entries) {


@@ -349,7 +349,7 @@ ipv4_frag_tbl_create(uint32_t bucket_num, uint32_t bucket_entries,
        }
 
        RTE_LOG(INFO, USER1, "%s: allocated of %zu bytes at socket %d\n",
        }
 
        RTE_LOG(INFO, USER1, "%s: allocated of %zu bytes at socket %d\n",

-               __func__, sz, socket_id); 
+               __func__, sz, socket_id);

 
        tbl->max_cycles = max_cycles;
        tbl->max_entries = max_entries;
 
        tbl->max_cycles = max_cycles;
        tbl->max_entries = max_entries;

diff --git a/examples/ip_reassembly/ipv4_rsmbl.h b/examples/ip_reassembly/ipv4_rsmbl.h
index 58ec1ee..61a70ad 100644 (file)
--- a/examples/ip_reassembly/ipv4_rsmbl.h
+++ b/examples/ip_reassembly/ipv4_rsmbl.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -143,7 +143,7 @@ ipv4_frag_free_death_row(struct ipv4_frag_death_row *dr, uint32_t prefetch)
        k = RTE_MIN(prefetch, dr->cnt);
        n = dr->cnt;
 
        k = RTE_MIN(prefetch, dr->cnt);
        n = dr->cnt;
 

-       for (i = 0; i != k; i++) 
+       for (i = 0; i != k; i++)

                rte_prefetch0(dr->row[i]);
 
        for (i = 0; i != n - k; i++) {
                rte_prefetch0(dr->row[i]);
 
        for (i = 0; i != n - k; i++) {


@@ -170,7 +170,7 @@ ipv4_frag_chain(struct rte_mbuf *mn, struct rte_mbuf *mp)
        /* adjust start of the last fragment data. */
        rte_pktmbuf_adj(mp, (uint16_t)(mp->pkt.vlan_macip.f.l2_len +
                mp->pkt.vlan_macip.f.l3_len));
        /* adjust start of the last fragment data. */
        rte_pktmbuf_adj(mp, (uint16_t)(mp->pkt.vlan_macip.f.l2_len +
                mp->pkt.vlan_macip.f.l3_len));

-                               
+

        /* chain two fragments. */
        ms = rte_pktmbuf_lastseg(mn);
        ms->pkt.next = mp;
        /* chain two fragments. */
        ms = rte_pktmbuf_lastseg(mn);
        ms->pkt.next = mp;


@@ -178,7 +178,7 @@ ipv4_frag_chain(struct rte_mbuf *mn, struct rte_mbuf *mp)
        /* accumulate number of segments and total length. */
        mn->pkt.nb_segs = (uint8_t)(mn->pkt.nb_segs + mp->pkt.nb_segs);
        mn->pkt.pkt_len += mp->pkt.pkt_len;
        /* accumulate number of segments and total length. */
        mn->pkt.nb_segs = (uint8_t)(mn->pkt.nb_segs + mp->pkt.nb_segs);
        mn->pkt.pkt_len += mp->pkt.pkt_len;

-                                       
+

        /* reset pkt_len and nb_segs for chained fragment. */
        mp->pkt.pkt_len = mp->pkt.data_len;
        mp->pkt.nb_segs = 1;
        /* reset pkt_len and nb_segs for chained fragment. */
        mp->pkt.pkt_len = mp->pkt.data_len;
        mp->pkt.nb_segs = 1;


@@ -356,7 +356,7 @@ ipv4_frag_process(struct ipv4_frag_pkt *fp, struct ipv4_frag_death_row *dr,
  *   Fragment's offset (as extracted from the header).
  * @param ip_flag
  *   Fragment's MF flag.
  *   Fragment's offset (as extracted from the header).
  * @param ip_flag
  *   Fragment's MF flag.

- * @return  
+ * @return

  *   Pointer to mbuf for reassebled packet, or NULL if:
  *   - an error occured.
  *   - not all fragments of the packet are collected yet.
  *   Pointer to mbuf for reassebled packet, or NULL if:
  *   - an error occured.
  *   - not all fragments of the packet are collected yet.


@@ -403,7 +403,7 @@ ipv4_frag_mbuf(struct ipv4_frag_tbl *tbl, struct ipv4_frag_death_row *dr,
                tbl, tbl->max_entries, tbl->use_entries,
                fp, fp->key.src_dst, fp->key.id, fp->start,
                fp->total_size, fp->frag_size, fp->last_idx);
                tbl, tbl->max_entries, tbl->use_entries,
                fp, fp->key.src_dst, fp->key.id, fp->start,
                fp->total_size, fp->frag_size, fp->last_idx);

-               
+

 
        /* process the fragmented packet. */
        mb = ipv4_frag_process(fp, dr, mb, ip_ofs, ip_len, ip_flag);
 
        /* process the fragmented packet. */
        mb = ipv4_frag_process(fp, dr, mb, ip_ofs, ip_len, ip_flag);

diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index bafa8d9..c4427b3 100644 (file)
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -434,7 +434,7 @@ send_burst(struct lcore_conf *qconf, uint32_t thresh, uint8_t port)
 
        if (fill >= thresh) {
                n = RTE_MIN(len - txmb->tail, fill);
 
        if (fill >= thresh) {
                n = RTE_MIN(len - txmb->tail, fill);

-                       
+

                k = rte_eth_tx_burst(port, qconf->tx_queue_id[port],
                        txmb->m_table + txmb->tail, (uint16_t)n);
 
                k = rte_eth_tx_burst(port, qconf->tx_queue_id[port],
                        txmb->m_table + txmb->tail, (uint16_t)n);
 


@@ -471,7 +471,7 @@ send_single_packet(struct rte_mbuf *m, uint8_t port)
                if (++txmb->tail == len)
                        txmb->tail = 0;
        }
                if (++txmb->tail == len)
                        txmb->tail = 0;
        }

-               
+

        TX_LCORE_STAT_UPDATE(&qconf->tx_stat, queue, 1);
        txmb->m_table[txmb->head] = m;
        if(++txmb->head == len)
        TX_LCORE_STAT_UPDATE(&qconf->tx_stat, queue, 1);
        txmb->m_table[txmb->head] = m;
        if(++txmb->head == len)


@@ -685,7 +685,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, uint32_t queue,
 
                        /* process this fragment. */
                        if ((mo = ipv4_frag_mbuf(tbl, dr, m, tms, ipv4_hdr,
 
                        /* process this fragment. */
                        if ((mo = ipv4_frag_mbuf(tbl, dr, m, tms, ipv4_hdr,

-                                       ip_ofs, ip_flag)) == NULL) 
+                                       ip_ofs, ip_flag)) == NULL)

                                /* no packet to send out. */
                                return;
 
                                /* no packet to send out. */
                                return;
 


@@ -958,8 +958,8 @@ parse_flow_ttl(const char *str, uint32_t min, uint32_t max, uint32_t *val)
        char *end;
        uint64_t v;
 
        char *end;
        uint64_t v;
 

-       static const char frmt_sec[] = "s"; 
-       static const char frmt_msec[] = "ms"; 
+       static const char frmt_sec[] = "s";
+       static const char frmt_msec[] = "ms";

 
        /* parse decimal string */
        errno = 0;
 
        /* parse decimal string */
        errno = 0;


@@ -1118,7 +1118,7 @@ parse_args(int argc, char **argv)
                                printf("numa is disabled \n");
                                numa_on = 0;
                        }
                                printf("numa is disabled \n");
                                numa_on = 0;
                        }

-                       
+

                        if (!strncmp(lgopts[option_index].name,
                                        "maxflows", 8)) {
                                if ((ret = parse_flow_num(optarg, MIN_FLOW_NUM,
                        if (!strncmp(lgopts[option_index].name,
                                        "maxflows", 8)) {
                                if ((ret = parse_flow_num(optarg, MIN_FLOW_NUM,


@@ -1132,7 +1132,7 @@ parse_args(int argc, char **argv)
                                        return (ret);
                                }
                        }
                                        return (ret);
                                }
                        }

-                       
+

                        if (!strncmp(lgopts[option_index].name, "flowttl", 7)) {
                                if ((ret = parse_flow_ttl(optarg, MIN_FLOW_TTL,
                                                MAX_FLOW_TTL,
                        if (!strncmp(lgopts[option_index].name, "flowttl", 7)) {
                                if ((ret = parse_flow_ttl(optarg, MIN_FLOW_TTL,
                                                MAX_FLOW_TTL,


@@ -1151,8 +1151,8 @@ parse_args(int argc, char **argv)
 
                                printf("jumbo frame is enabled \n");
                                port_conf.rxmode.jumbo_frame = 1;
 
                                printf("jumbo frame is enabled \n");
                                port_conf.rxmode.jumbo_frame = 1;

-       
-                               /* if no max-pkt-len set, use the default value ETHER_MAX_LEN */        
+
+                               /* if no max-pkt-len set, use the default value ETHER_MAX_LEN */

                                if (0 == getopt_long(argc, argvopt, "", &lenopts, &option_index)) {
                                        ret = parse_max_pkt_len(optarg);
                                        if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN)){
                                if (0 == getopt_long(argc, argvopt, "", &lenopts, &option_index)) {
                                        ret = parse_max_pkt_len(optarg);
                                        if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN)){


@@ -1162,10 +1162,10 @@ parse_args(int argc, char **argv)
                                        }
                                        port_conf.rxmode.max_rx_pkt_len = ret;
                                }
                                        }
                                        port_conf.rxmode.max_rx_pkt_len = ret;
                                }

-                               printf("set jumbo frame max packet length to %u\n", 
+                               printf("set jumbo frame max packet length to %u\n",

                                                (unsigned int)port_conf.rxmode.max_rx_pkt_len);
                        }
                                                (unsigned int)port_conf.rxmode.max_rx_pkt_len);
                        }

-                       
+

                        break;
 
                default:
                        break;
 
                default:


@@ -1302,10 +1302,10 @@ setup_lpm(int socketid)
                        ipv4_l3fwd_route_array[i].depth,
                        ipv4_l3fwd_route_array[i].if_out);
        }
                        ipv4_l3fwd_route_array[i].depth,
                        ipv4_l3fwd_route_array[i].if_out);
        }

-       
+

        /* create the LPM6 table */
        rte_snprintf(s, sizeof(s), "IPV6_L3FWD_LPM_%d", socketid);
        /* create the LPM6 table */
        rte_snprintf(s, sizeof(s), "IPV6_L3FWD_LPM_%d", socketid);

-       
+

        config.max_rules = IPV6_L3FWD_LPM_MAX_RULES;
        config.number_tbl8s = IPV6_L3FWD_LPM_NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = IPV6_L3FWD_LPM_MAX_RULES;
        config.number_tbl8s = IPV6_L3FWD_LPM_NUMBER_TBL8S;
        config.flags = 0;


@@ -1467,14 +1467,14 @@ setup_queue_tbl(struct lcore_conf *qconf, uint32_t lcore, int socket,
         * At any given moment up to <max_flow_num * (MAX_FRAG_NUM - 1)>
         * mbufs could be stored int the fragment table.
         * Plus, each TX queue can hold up to <max_flow_num> packets.
         * At any given moment up to <max_flow_num * (MAX_FRAG_NUM - 1)>
         * mbufs could be stored int the fragment table.
         * Plus, each TX queue can hold up to <max_flow_num> packets.

-        */ 
+        */

 
        nb_mbuf = 2 * RTE_MAX(max_flow_num, 2UL * MAX_PKT_BURST) * MAX_FRAG_NUM;
        nb_mbuf *= (port_conf.rxmode.max_rx_pkt_len + BUF_SIZE - 1) / BUF_SIZE;
        nb_mbuf += RTE_TEST_RX_DESC_DEFAULT + RTE_TEST_TX_DESC_DEFAULT;
 
        nb_mbuf = RTE_MAX(nb_mbuf, (uint32_t)DEF_MBUF_NUM);
 
        nb_mbuf = 2 * RTE_MAX(max_flow_num, 2UL * MAX_PKT_BURST) * MAX_FRAG_NUM;
        nb_mbuf *= (port_conf.rxmode.max_rx_pkt_len + BUF_SIZE - 1) / BUF_SIZE;
        nb_mbuf += RTE_TEST_RX_DESC_DEFAULT + RTE_TEST_TX_DESC_DEFAULT;
 
        nb_mbuf = RTE_MAX(nb_mbuf, (uint32_t)DEF_MBUF_NUM);

-               
+

        rte_snprintf(buf, sizeof(buf), "mbuf_pool_%u_%u", lcore, queue);
 
        if ((qconf->pool[queue] = rte_mempool_create(buf, nb_mbuf, MBUF_SIZE, 0,
        rte_snprintf(buf, sizeof(buf), "mbuf_pool_%u_%u", lcore, queue);
 
        if ((qconf->pool[queue] = rte_mempool_create(buf, nb_mbuf, MBUF_SIZE, 0,

diff --git a/examples/ip_reassembly/main.h b/examples/ip_reassembly/main.h
index f790d79..f8c8415 100644 (file)
--- a/examples/ip_reassembly/main.h
+++ b/examples/ip_reassembly/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/ipv4_frag/Makefile b/examples/ipv4_frag/Makefile
index 5fc4d9e..475c5ea 100644 (file)
--- a/examples/ipv4_frag/Makefile
+++ b/examples/ipv4_frag/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/ipv4_frag/main.c b/examples/ipv4_frag/main.c
index 329f2ce..3250540 100644 (file)
--- a/examples/ipv4_frag/main.c
+++ b/examples/ipv4_frag/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/ipv4_frag/main.h b/examples/ipv4_frag/main.h
index f790d79..f8c8415 100644 (file)
--- a/examples/ipv4_frag/main.h
+++ b/examples/ipv4_frag/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/ipv4_frag/rte_ipv4_frag.h b/examples/ipv4_frag/rte_ipv4_frag.h
index 84fa9c9..a96a439 100644 (file)
--- a/examples/ipv4_frag/rte_ipv4_frag.h
+++ b/examples/ipv4_frag/rte_ipv4_frag.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile
index f2ec731..191574b 100644 (file)
--- a/examples/ipv4_multicast/Makefile
+++ b/examples/ipv4_multicast/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index da4e09d..dfa0075 100644 (file)
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/ipv4_multicast/main.h b/examples/ipv4_multicast/main.h
index f790d79..f8c8415 100644 (file)
--- a/examples/ipv4_multicast/main.h
+++ b/examples/ipv4_multicast/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/kni/Makefile b/examples/kni/Makefile
index de10088..6800dd5 100644 (file)
--- a/examples/kni/Makefile
+++ b/examples/kni/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/kni/main.c b/examples/kni/main.c
index fe823b3..bc1f961 100644 (file)
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -491,7 +491,7 @@ parse_config(const char *arg)
                        printf("Port %d has been configured\n", port_id);
                        goto fail;
                }
                        printf("Port %d has been configured\n", port_id);
                        goto fail;
                }

-               kni_port_params_array[port_id] = 
+               kni_port_params_array[port_id] =

                        (struct kni_port_params*)rte_zmalloc("KNI_port_params",
                        sizeof(struct kni_port_params), CACHE_LINE_SIZE);
                kni_port_params_array[port_id]->port_id = port_id;
                        (struct kni_port_params*)rte_zmalloc("KNI_port_params",
                        sizeof(struct kni_port_params), CACHE_LINE_SIZE);
                kni_port_params_array[port_id]->port_id = port_id;


@@ -557,7 +557,7 @@ validate_parameters(uint32_t portmask)
                                        "port %d transmitting not enabled\n",
                                        kni_port_params_array[i]->lcore_tx,
                                        kni_port_params_array[i]->port_id);
                                        "port %d transmitting not enabled\n",
                                        kni_port_params_array[i]->lcore_tx,
                                        kni_port_params_array[i]->port_id);

-                       
+

        }
 
        return 0;
        }
 
        return 0;


@@ -727,7 +727,7 @@ kni_change_mtu(uint8_t port_id, unsigned new_mtu)
        /* Set new MTU */
        if (new_mtu > ETHER_MAX_LEN)
                conf.rxmode.jumbo_frame = 1;
        /* Set new MTU */
        if (new_mtu > ETHER_MAX_LEN)
                conf.rxmode.jumbo_frame = 1;

-       else 
+       else

                conf.rxmode.jumbo_frame = 0;
 
        /* mtu + length of header + length of FCS = max pkt length */
                conf.rxmode.jumbo_frame = 0;
 
        /* mtu + length of header + length of FCS = max pkt length */

diff --git a/examples/l2fwd-ivshmem/Makefile b/examples/l2fwd-ivshmem/Makefile
index df59ed8..5f1d172 100644 (file)
--- a/examples/l2fwd-ivshmem/Makefile
+++ b/examples/l2fwd-ivshmem/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/l2fwd-ivshmem/guest/Makefile b/examples/l2fwd-ivshmem/guest/Makefile
index 04e13d7..3ca73b4 100644 (file)
--- a/examples/l2fwd-ivshmem/guest/Makefile
+++ b/examples/l2fwd-ivshmem/guest/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/l2fwd-ivshmem/guest/guest.c b/examples/l2fwd-ivshmem/guest/guest.c
index adcbe79..6e0db36 100644 (file)
--- a/examples/l2fwd-ivshmem/guest/guest.c
+++ b/examples/l2fwd-ivshmem/guest/guest.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/l2fwd-ivshmem/host/Makefile b/examples/l2fwd-ivshmem/host/Makefile
index a7e7525..f91419e 100644 (file)
--- a/examples/l2fwd-ivshmem/host/Makefile
+++ b/examples/l2fwd-ivshmem/host/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/l2fwd-ivshmem/host/host.c b/examples/l2fwd-ivshmem/host/host.c
index 75eae0e..712f1ea 100644 (file)
--- a/examples/l2fwd-ivshmem/host/host.c
+++ b/examples/l2fwd-ivshmem/host/host.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/l2fwd-ivshmem/include/common.h b/examples/l2fwd-ivshmem/include/common.h
index 49ac26d..8564d32 100644 (file)
--- a/examples/l2fwd-ivshmem/include/common.h
+++ b/examples/l2fwd-ivshmem/include/common.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile
index 06dff0d..78feeeb 100644 (file)
--- a/examples/l2fwd/Makefile
+++ b/examples/l2fwd/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index d04e27a..4069d7c 100644 (file)
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/l2fwd/main.h b/examples/l2fwd/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/l2fwd/main.h
+++ b/examples/l2fwd/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile
index cd00cba..d0f8e6d 100644 (file)
--- a/examples/l3fwd-power/Makefile
+++ b/examples/l3fwd-power/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 598b7a2..046949f 100644 (file)
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -396,7 +396,7 @@ struct lcore_stats {
        uint64_t nb_rx_processed;
        /* total iterations looped recently */
        uint64_t nb_iteration_looped;
        uint64_t nb_rx_processed;
        /* total iterations looped recently */
        uint64_t nb_iteration_looped;

-       uint32_t padding[9]; 
+       uint32_t padding[9];

 } __rte_cache_aligned;
 
 static struct lcore_conf lcore_conf[RTE_MAX_LCORE] __rte_cache_aligned;
 } __rte_cache_aligned;
 
 static struct lcore_conf lcore_conf[RTE_MAX_LCORE] __rte_cache_aligned;


@@ -443,7 +443,7 @@ power_timer_cb(__attribute__((unused)) struct rte_timer *tim,
        /* accumulate total execution time in us when callback is invoked */
        sleep_time_ratio = (float)(stats[lcore_id].sleep_time) /
                                        (float)SCALING_PERIOD;
        /* accumulate total execution time in us when callback is invoked */
        sleep_time_ratio = (float)(stats[lcore_id].sleep_time) /
                                        (float)SCALING_PERIOD;

-               
+

        /**
         * check whether need to scale down frequency a step if it sleep a lot.
         */
        /**
         * check whether need to scale down frequency a step if it sleep a lot.
         */


@@ -816,7 +816,7 @@ main_loop(__attribute__((unused)) void *dummy)
        struct lcore_conf *qconf;
        struct lcore_rx_queue *rx_queue;
        enum freq_scale_hint_t lcore_scaleup_hint;
        struct lcore_conf *qconf;
        struct lcore_rx_queue *rx_queue;
        enum freq_scale_hint_t lcore_scaleup_hint;

-       
+

        uint32_t lcore_rx_idle_count = 0;
        uint32_t lcore_idle_hint = 0;
 
        uint32_t lcore_rx_idle_count = 0;
        uint32_t lcore_idle_hint = 0;
 


@@ -949,8 +949,8 @@ main_loop(__attribute__((unused)) void *dummy)
                                                lcore_scaleup_hint)
                                        lcore_scaleup_hint =
                                                rx_queue->freq_up_hint;
                                                lcore_scaleup_hint)
                                        lcore_scaleup_hint =
                                                rx_queue->freq_up_hint;

-                       }       
-               
+                       }
+

                        if (lcore_scaleup_hint == FREQ_HIGHEST)
                                rte_power_freq_max(lcore_id);
                        else if (lcore_scaleup_hint == FREQ_HIGHER)
                        if (lcore_scaleup_hint == FREQ_HIGHEST)
                                rte_power_freq_max(lcore_id);
                        else if (lcore_scaleup_hint == FREQ_HIGHER)


@@ -1229,7 +1229,7 @@ parse_args(int argc, char **argv)
                                printf("numa is disabled \n");
                                numa_on = 0;
                        }
                                printf("numa is disabled \n");
                                numa_on = 0;
                        }

-                       
+

                        if (!strncmp(lgopts[option_index].name,
                                        "enable-jumbo", 12)) {
                                struct option lenopts =
                        if (!strncmp(lgopts[option_index].name,
                                        "enable-jumbo", 12)) {
                                struct option lenopts =


@@ -1238,7 +1238,7 @@ parse_args(int argc, char **argv)
 
                                printf("jumbo frame is enabled \n");
                                port_conf.rxmode.jumbo_frame = 1;
 
                                printf("jumbo frame is enabled \n");
                                port_conf.rxmode.jumbo_frame = 1;

-       
+

                                /**
                                 * if no max-pkt-len set, use the default value
                                 * ETHER_MAX_LEN
                                /**
                                 * if no max-pkt-len set, use the default value
                                 * ETHER_MAX_LEN


@@ -1259,7 +1259,7 @@ parse_args(int argc, char **argv)
                                        "max packet length to %u\n",
                                (unsigned int)port_conf.rxmode.max_rx_pkt_len);
                        }
                                        "max packet length to %u\n",
                                (unsigned int)port_conf.rxmode.max_rx_pkt_len);
                        }

-                       
+

                        break;
 
                default:
                        break;
 
                default:

diff --git a/examples/l3fwd-power/main.h b/examples/l3fwd-power/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/l3fwd-power/main.h
+++ b/examples/l3fwd-power/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/l3fwd-vf/Makefile b/examples/l3fwd-vf/Makefile
index 974d6b7..d97611c 100644 (file)
--- a/examples/l3fwd-vf/Makefile
+++ b/examples/l3fwd-vf/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c
index 793cacc..896ceb3 100644 (file)
--- a/examples/l3fwd-vf/main.c
+++ b/examples/l3fwd-vf/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -711,9 +711,9 @@ signal_handler(int signum)
        if (signum == SIGINT) {
                for (portid = 0; portid < nb_ports; portid++) {
                        /* skip ports that are not enabled */
        if (signum == SIGINT) {
                for (portid = 0; portid < nb_ports; portid++) {
                        /* skip ports that are not enabled */

-                       if ((enabled_port_mask & (1 << portid)) == 0) 
+                       if ((enabled_port_mask & (1 << portid)) == 0)

                                continue;
                                continue;

-                       rte_eth_dev_close(portid); 
+                       rte_eth_dev_close(portid);

                }
        }
        rte_exit(EXIT_SUCCESS, "\n User forced exit\n");
                }
        }
        rte_exit(EXIT_SUCCESS, "\n User forced exit\n");


@@ -952,7 +952,7 @@ init_mem(unsigned nb_mbuf)
                if (pktmbuf_pool[socketid] == NULL) {
                        rte_snprintf(s, sizeof(s), "mbuf_pool_%d", socketid);
                        pktmbuf_pool[socketid] =
                if (pktmbuf_pool[socketid] == NULL) {
                        rte_snprintf(s, sizeof(s), "mbuf_pool_%d", socketid);
                        pktmbuf_pool[socketid] =

-                               rte_mempool_create(s, nb_mbuf, MBUF_SIZE, 
+                               rte_mempool_create(s, nb_mbuf, MBUF_SIZE,

                                                   MEMPOOL_CACHE_SIZE,
                                        sizeof(struct rte_pktmbuf_pool_private),
                                        rte_pktmbuf_pool_init, NULL,
                                                   MEMPOOL_CACHE_SIZE,
                                        sizeof(struct rte_pktmbuf_pool_private),
                                        rte_pktmbuf_pool_init, NULL,

diff --git a/examples/l3fwd-vf/main.h b/examples/l3fwd-vf/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/l3fwd-vf/main.h
+++ b/examples/l3fwd-vf/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile
index 3824a89..68de8fc 100644 (file)
--- a/examples/l3fwd/Makefile
+++ b/examples/l3fwd/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 8ee1af9..06e6e6f 100755 (executable)
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -171,7 +171,7 @@ static uint32_t enabled_port_mask = 0;
 static int promiscuous_on = 0; /**< Ports set in promiscuous mode off by default. */
 static int numa_on = 1; /**< NUMA is enabled by default. */
 
 static int promiscuous_on = 0; /**< Ports set in promiscuous mode off by default. */
 static int numa_on = 1; /**< NUMA is enabled by default. */
 

-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)      
+#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)

 static int ipv6 = 0; /**< ipv6 is false by default. */
 #endif
 
 static int ipv6 = 0; /**< ipv6 is false by default. */
 #endif
 


@@ -344,7 +344,7 @@ static struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
        {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
        {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05},
        102, 12, IPPROTO_TCP}, 1},
        {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
        {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05},
        102, 12, IPPROTO_TCP}, 1},

-       
+

        {{
        {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
        {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05},
        {{
        {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
        {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05},


@@ -368,7 +368,7 @@ static lookup_struct_t *ipv6_l3fwd_lookup_struct[NB_SOCKETS];
 #define L3FWD_HASH_ENTRIES             1024*1024*1
 #endif
 #define HASH_ENTRY_NUMBER_DEFAULT      4
 #define L3FWD_HASH_ENTRIES             1024*1024*1
 #endif
 #define HASH_ENTRY_NUMBER_DEFAULT      4

- 
+

 static uint32_t hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
 
 static inline uint32_t
 static uint32_t hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
 
 static inline uint32_t


@@ -407,11 +407,11 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len, uint32_t init_va
        const uint32_t  *ip_src0, *ip_src1, *ip_src2, *ip_src3;
        const uint32_t  *ip_dst0, *ip_dst1, *ip_dst2, *ip_dst3;
 #endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
        const uint32_t  *ip_src0, *ip_src1, *ip_src2, *ip_src3;
        const uint32_t  *ip_dst0, *ip_dst1, *ip_dst2, *ip_dst3;
 #endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */

- 
+

        k = data;
        t = k->proto;
        p = (const uint32_t *)&k->port_src;
        k = data;
        t = k->proto;
        p = (const uint32_t *)&k->port_src;

- 
+

 #ifdef RTE_MACHINE_CPUFLAG_SSE4_2
        ip_src0 = (const uint32_t *) k->ip_src;
        ip_src1 = (const uint32_t *)(k->ip_src+4);
 #ifdef RTE_MACHINE_CPUFLAG_SSE4_2
        ip_src0 = (const uint32_t *) k->ip_src;
        ip_src1 = (const uint32_t *)(k->ip_src+4);


@@ -613,7 +613,7 @@ get_ipv4_dst_port(void *ipv4_hdr, uint8_t portid, lookup_struct_t * ipv4_l3fwd_l
 {
        int ret = 0;
        union ipv4_5tuple_host key;
 {
        int ret = 0;
        union ipv4_5tuple_host key;

-       
+

        ipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct ipv4_hdr, time_to_live);
        __m128i data = _mm_loadu_si128((__m128i*)(ipv4_hdr));
        /* Get 5 tuple: dst port, src port, dst IP address, src IP address and protocol */
        ipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct ipv4_hdr, time_to_live);
        __m128i data = _mm_loadu_si128((__m128i*)(ipv4_hdr));
        /* Get 5 tuple: dst port, src port, dst IP address, src IP address and protocol */


@@ -676,7 +676,7 @@ static inline void l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, stru
 #define EXECLUDE_3RD_PKT 0xb
 #define EXECLUDE_4TH_PKT 0x7
 
 #define EXECLUDE_3RD_PKT 0xb
 #define EXECLUDE_4TH_PKT 0x7
 

-static inline void 
+static inline void

 simple_ipv4_fwd_4pkts(struct rte_mbuf* m[4], uint8_t portid, struct lcore_conf *qconf)
 {
        struct ether_hdr *eth_hdr[4];
 simple_ipv4_fwd_4pkts(struct rte_mbuf* m[4], uint8_t portid, struct lcore_conf *qconf)
 {
        struct ether_hdr *eth_hdr[4];


@@ -756,7 +756,7 @@ simple_ipv4_fwd_4pkts(struct rte_mbuf* m[4], uint8_t portid, struct lcore_conf *
        dst_port[1] = (uint8_t) ((ret[1] < 0) ? portid : ipv4_l3fwd_out_if[ret[1]]);
        dst_port[2] = (uint8_t) ((ret[2] < 0) ? portid : ipv4_l3fwd_out_if[ret[2]]);
        dst_port[3] = (uint8_t) ((ret[3] < 0) ? portid : ipv4_l3fwd_out_if[ret[3]]);
        dst_port[1] = (uint8_t) ((ret[1] < 0) ? portid : ipv4_l3fwd_out_if[ret[1]]);
        dst_port[2] = (uint8_t) ((ret[2] < 0) ? portid : ipv4_l3fwd_out_if[ret[2]]);
        dst_port[3] = (uint8_t) ((ret[3] < 0) ? portid : ipv4_l3fwd_out_if[ret[3]]);

-       
+

        if (dst_port[0] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[0]) == 0)
                dst_port[0] = portid;
        if (dst_port[1] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[1]) == 0)
        if (dst_port[0] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[0]) == 0)
                dst_port[0] = portid;
        if (dst_port[1] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[1]) == 0)


@@ -804,13 +804,13 @@ simple_ipv4_fwd_4pkts(struct rte_mbuf* m[4], uint8_t portid, struct lcore_conf *
 static inline void get_ipv6_5tuple(struct rte_mbuf* m0, __m128i mask0, __m128i mask1,
                                 union ipv6_5tuple_host * key)
 {
 static inline void get_ipv6_5tuple(struct rte_mbuf* m0, __m128i mask0, __m128i mask1,
                                 union ipv6_5tuple_host * key)
 {

-        __m128i tmpdata0 = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m0, unsigned char *) 
+        __m128i tmpdata0 = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m0, unsigned char *)

                        + sizeof(struct ether_hdr) + offsetof(struct ipv6_hdr, payload_len)));
                        + sizeof(struct ether_hdr) + offsetof(struct ipv6_hdr, payload_len)));

-        __m128i tmpdata1 = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m0, unsigned char *) 
-                       + sizeof(struct ether_hdr) + offsetof(struct ipv6_hdr, payload_len) 
+        __m128i tmpdata1 = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m0, unsigned char *)
+                       + sizeof(struct ether_hdr) + offsetof(struct ipv6_hdr, payload_len)

                        +  sizeof(__m128i)));
                        +  sizeof(__m128i)));

-        __m128i tmpdata2 = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m0, unsigned char *) 
-                       + sizeof(struct ether_hdr) + offsetof(struct ipv6_hdr, payload_len) 
+        __m128i tmpdata2 = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m0, unsigned char *)
+                       + sizeof(struct ether_hdr) + offsetof(struct ipv6_hdr, payload_len)

                        + sizeof(__m128i) + sizeof(__m128i)));
         key->xmm[0] = _mm_and_si128(tmpdata0, mask0);
         key->xmm[1] = tmpdata1;
                        + sizeof(__m128i) + sizeof(__m128i)));
         key->xmm[0] = _mm_and_si128(tmpdata0, mask0);
         key->xmm[1] = tmpdata1;


@@ -818,7 +818,7 @@ static inline void get_ipv6_5tuple(struct rte_mbuf* m0, __m128i mask0, __m128i m
        return;
 }
 
        return;
 }
 

-static inline void 
+static inline void

 simple_ipv6_fwd_4pkts(struct rte_mbuf* m[4], uint8_t portid, struct lcore_conf *qconf)
 {
        struct ether_hdr *eth_hdr[4];
 simple_ipv6_fwd_4pkts(struct rte_mbuf* m[4], uint8_t portid, struct lcore_conf *qconf)
 {
        struct ether_hdr *eth_hdr[4];


@@ -847,7 +847,7 @@ simple_ipv6_fwd_4pkts(struct rte_mbuf* m[4], uint8_t portid, struct lcore_conf *
        get_ipv6_5tuple(m[1], mask1, mask2, &key[1]);
        get_ipv6_5tuple(m[2], mask1, mask2, &key[2]);
        get_ipv6_5tuple(m[3], mask1, mask2, &key[3]);
        get_ipv6_5tuple(m[1], mask1, mask2, &key[1]);
        get_ipv6_5tuple(m[2], mask1, mask2, &key[2]);
        get_ipv6_5tuple(m[3], mask1, mask2, &key[3]);

-       
+

        const void *key_array[4] = {&key[0], &key[1], &key[2],&key[3]};
        rte_hash_lookup_multi(qconf->ipv6_lookup_struct, &key_array[0], 4, ret);
        dst_port[0] = (uint8_t) ((ret[0] < 0)? portid:ipv6_l3fwd_out_if[ret[0]]);
        const void *key_array[4] = {&key[0], &key[1], &key[2],&key[3]};
        rte_hash_lookup_multi(qconf->ipv6_lookup_struct, &key_array[0], 4, ret);
        dst_port[0] = (uint8_t) ((ret[0] < 0)? portid:ipv6_l3fwd_out_if[ret[0]]);


@@ -1024,33 +1024,33 @@ main_loop(__attribute__((unused)) void *dummy)
                                /* Send nb_rx - nb_rx%4 packets in groups of 4.*/
                                int32_t n = RTE_ALIGN_FLOOR(nb_rx, 4);
                                for (j = 0; j < n ; j+=4) {
                                /* Send nb_rx - nb_rx%4 packets in groups of 4.*/
                                int32_t n = RTE_ALIGN_FLOOR(nb_rx, 4);
                                for (j = 0; j < n ; j+=4) {

-                                       uint32_t ol_flag = pkts_burst[j]->ol_flags 
+                                       uint32_t ol_flag = pkts_burst[j]->ol_flags

                                                        & pkts_burst[j+1]->ol_flags
                                                        & pkts_burst[j+1]->ol_flags

-                                                       & pkts_burst[j+2]->ol_flags 
+                                                       & pkts_burst[j+2]->ol_flags

                                                        & pkts_burst[j+3]->ol_flags;
                                        if (ol_flag & PKT_RX_IPV4_HDR ) {
                                                        & pkts_burst[j+3]->ol_flags;
                                        if (ol_flag & PKT_RX_IPV4_HDR ) {

-                                               simple_ipv4_fwd_4pkts(&pkts_burst[j], 
+                                               simple_ipv4_fwd_4pkts(&pkts_burst[j],

                                                                        portid, qconf);
                                        } else if (ol_flag & PKT_RX_IPV6_HDR) {
                                                                        portid, qconf);
                                        } else if (ol_flag & PKT_RX_IPV6_HDR) {

-                                               simple_ipv6_fwd_4pkts(&pkts_burst[j], 
+                                               simple_ipv6_fwd_4pkts(&pkts_burst[j],

                                                                        portid, qconf);
                                        } else {
                                                                        portid, qconf);
                                        } else {

-                                               l3fwd_simple_forward(pkts_burst[j], 
+                                               l3fwd_simple_forward(pkts_burst[j],

                                                                        portid, qconf);
                                                                        portid, qconf);

-                                               l3fwd_simple_forward(pkts_burst[j+1], 
+                                               l3fwd_simple_forward(pkts_burst[j+1],

                                                                        portid, qconf);
                                                                        portid, qconf);

-                                               l3fwd_simple_forward(pkts_burst[j+2], 
+                                               l3fwd_simple_forward(pkts_burst[j+2],

                                                                        portid, qconf);
                                                                        portid, qconf);

-                                               l3fwd_simple_forward(pkts_burst[j+3], 
+                                               l3fwd_simple_forward(pkts_burst[j+3],

                                                                        portid, qconf);
                                                                        portid, qconf);

-                                       } 
-                               } 
+                                       }
+                               }

                                for (; j < nb_rx ; j++) {
                                for (; j < nb_rx ; j++) {

-                                       l3fwd_simple_forward(pkts_burst[j], 
+                                       l3fwd_simple_forward(pkts_burst[j],

                                                                portid, qconf);
                                }
                        }
                                                                portid, qconf);
                                }
                        }

-#else                   
+#else

                        /* Prefetch first packets */
                        for (j = 0; j < PREFETCH_OFFSET && j < nb_rx; j++) {
                                rte_prefetch0(rte_pktmbuf_mtod(
                        /* Prefetch first packets */
                        for (j = 0; j < PREFETCH_OFFSET && j < nb_rx; j++) {
                                rte_prefetch0(rte_pktmbuf_mtod(


@@ -1322,7 +1322,7 @@ parse_args(int argc, char **argv)
 
                /* long options */
                case 0:
 
                /* long options */
                case 0:

-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_CONFIG, 
+                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_CONFIG,

                                sizeof (CMD_LINE_OPT_CONFIG))) {
                                ret = parse_config(optarg);
                                if (ret) {
                                sizeof (CMD_LINE_OPT_CONFIG))) {
                                ret = parse_config(optarg);
                                if (ret) {


@@ -1332,29 +1332,29 @@ parse_args(int argc, char **argv)
                                }
                        }
 
                                }
                        }
 

-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_NO_NUMA, 
+                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_NO_NUMA,

                                sizeof(CMD_LINE_OPT_NO_NUMA))) {
                                printf("numa is disabled \n");
                                numa_on = 0;
                        }
                                sizeof(CMD_LINE_OPT_NO_NUMA))) {
                                printf("numa is disabled \n");
                                numa_on = 0;
                        }

-                       
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)      
-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_IPV6, 
+
+#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
+                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_IPV6,

                                sizeof(CMD_LINE_OPT_IPV6))) {
                                printf("ipv6 is specified \n");
                                ipv6 = 1;
                        }
 #endif
 
                                sizeof(CMD_LINE_OPT_IPV6))) {
                                printf("ipv6 is specified \n");
                                ipv6 = 1;
                        }
 #endif
 

-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ENABLE_JUMBO, 
+                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ENABLE_JUMBO,

                                sizeof (CMD_LINE_OPT_ENABLE_JUMBO))) {
                                struct option lenopts = {"max-pkt-len", required_argument, 0, 0};
 
                                printf("jumbo frame is enabled - disabling simple TX path\n");
                                port_conf.rxmode.jumbo_frame = 1;
                                tx_conf.txq_flags = 0;
                                sizeof (CMD_LINE_OPT_ENABLE_JUMBO))) {
                                struct option lenopts = {"max-pkt-len", required_argument, 0, 0};
 
                                printf("jumbo frame is enabled - disabling simple TX path\n");
                                port_conf.rxmode.jumbo_frame = 1;
                                tx_conf.txq_flags = 0;

-       
-                               /* if no max-pkt-len set, use the default value ETHER_MAX_LEN */        
+
+                               /* if no max-pkt-len set, use the default value ETHER_MAX_LEN */

                                if (0 == getopt_long(argc, argvopt, "", &lenopts, &option_index)) {
                                        ret = parse_max_pkt_len(optarg);
                                        if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN)){
                                if (0 == getopt_long(argc, argvopt, "", &lenopts, &option_index)) {
                                        ret = parse_max_pkt_len(optarg);
                                        if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN)){


@@ -1364,11 +1364,11 @@ parse_args(int argc, char **argv)
                                        }
                                        port_conf.rxmode.max_rx_pkt_len = ret;
                                }
                                        }
                                        port_conf.rxmode.max_rx_pkt_len = ret;
                                }

-                               printf("set jumbo frame max packet length to %u\n", 
+                               printf("set jumbo frame max packet length to %u\n",

                                                (unsigned int)port_conf.rxmode.max_rx_pkt_len);
                        }
 #if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
                                                (unsigned int)port_conf.rxmode.max_rx_pkt_len);
                        }
 #if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)

-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_HASH_ENTRY_NUM, 
+                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_HASH_ENTRY_NUM,

                                sizeof(CMD_LINE_OPT_HASH_ENTRY_NUM))) {
                                ret = parse_hash_entry_number(optarg);
                                if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) {
                                sizeof(CMD_LINE_OPT_HASH_ENTRY_NUM))) {
                                ret = parse_hash_entry_number(optarg);
                                if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) {


@@ -1449,7 +1449,7 @@ populate_ipv4_few_flow_into_table(const struct rte_hash* h)
 {
        uint32_t i;
        int32_t ret;
 {
        uint32_t i;
        int32_t ret;

-       uint32_t array_len = sizeof(ipv4_l3fwd_route_array)/sizeof(ipv4_l3fwd_route_array[0]); 
+       uint32_t array_len = sizeof(ipv4_l3fwd_route_array)/sizeof(ipv4_l3fwd_route_array[0]);

 
        mask0 = _mm_set_epi32(ALL_32_BITS, ALL_32_BITS, ALL_32_BITS, BIT_8_TO_15);
        for (i = 0; i < array_len; i++) {
 
        mask0 = _mm_set_epi32(ALL_32_BITS, ALL_32_BITS, ALL_32_BITS, BIT_8_TO_15);
        for (i = 0; i < array_len; i++) {


@@ -1473,7 +1473,7 @@ populate_ipv6_few_flow_into_table(const struct rte_hash* h)
 {
        uint32_t i;
        int32_t ret;
 {
        uint32_t i;
        int32_t ret;

-       uint32_t array_len = sizeof(ipv6_l3fwd_route_array)/sizeof(ipv6_l3fwd_route_array[0]); 
+       uint32_t array_len = sizeof(ipv6_l3fwd_route_array)/sizeof(ipv6_l3fwd_route_array[0]);

 
        mask1 = _mm_set_epi32(ALL_32_BITS, ALL_32_BITS, ALL_32_BITS, BIT_16_TO_23);
        mask2 = _mm_set_epi32(0, 0, ALL_32_BITS, ALL_32_BITS);
 
        mask1 = _mm_set_epi32(ALL_32_BITS, ALL_32_BITS, ALL_32_BITS, BIT_16_TO_23);
        mask2 = _mm_set_epi32(0, 0, ALL_32_BITS, ALL_32_BITS);


@@ -1673,10 +1673,10 @@ setup_lpm(int socketid)
                        ipv4_l3fwd_route_array[i].depth,
                        ipv4_l3fwd_route_array[i].if_out);
        }
                        ipv4_l3fwd_route_array[i].depth,
                        ipv4_l3fwd_route_array[i].if_out);
        }

-       
+

        /* create the LPM6 table */
        rte_snprintf(s, sizeof(s), "IPV6_L3FWD_LPM_%d", socketid);
        /* create the LPM6 table */
        rte_snprintf(s, sizeof(s), "IPV6_L3FWD_LPM_%d", socketid);

-       
+

        config.max_rules = IPV6_L3FWD_LPM_MAX_RULES;
        config.number_tbl8s = IPV6_L3FWD_LPM_NUMBER_TBL8S;
        config.flags = 0;
        config.max_rules = IPV6_L3FWD_LPM_MAX_RULES;
        config.number_tbl8s = IPV6_L3FWD_LPM_NUMBER_TBL8S;
        config.flags = 0;

diff --git a/examples/l3fwd/main.h b/examples/l3fwd/main.h
index 1840da6..eb13b29 100644 (file)
--- a/examples/l3fwd/main.h
+++ b/examples/l3fwd/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile
index d3b8c17..9ecc7fc 100644 (file)
--- a/examples/link_status_interrupt/Makefile
+++ b/examples/link_status_interrupt/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c
index 8d17b01..1a87551 100644 (file)
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/link_status_interrupt/main.h b/examples/link_status_interrupt/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/link_status_interrupt/main.h
+++ b/examples/link_status_interrupt/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/load_balancer/Makefile b/examples/load_balancer/Makefile
index c532e8b..2c5fd9b 100644 (file)
--- a/examples/load_balancer/Makefile
+++ b/examples/load_balancer/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/load_balancer/config.c b/examples/load_balancer/config.c
index f5fee6d..62990e4 100644 (file)
--- a/examples/load_balancer/config.c
+++ b/examples/load_balancer/config.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/load_balancer/init.c b/examples/load_balancer/init.c
index e997238..5bc232e 100644 (file)
--- a/examples/load_balancer/init.c
+++ b/examples/load_balancer/init.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/load_balancer/main.c b/examples/load_balancer/main.c
index e59fbb3..47b0ba7 100644 (file)
--- a/examples/load_balancer/main.c
+++ b/examples/load_balancer/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/load_balancer/main.h b/examples/load_balancer/main.h
index 46d4bf5..82cdf95 100644 (file)
--- a/examples/load_balancer/main.h
+++ b/examples/load_balancer/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/load_balancer/runtime.c b/examples/load_balancer/runtime.c
index e85abdb..438224a 100644 (file)
--- a/examples/load_balancer/runtime.c
+++ b/examples/load_balancer/runtime.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile
index ea47fb6..6b315cc 100644 (file)
--- a/examples/multi_process/Makefile
+++ b/examples/multi_process/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile
index 1ee510f..89cc6bf 100644 (file)
--- a/examples/multi_process/client_server_mp/Makefile
+++ b/examples/multi_process/client_server_mp/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile b/examples/multi_process/client_server_mp/mp_client/Makefile
index 212af69..2688fed 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_client/Makefile
+++ b/examples/multi_process/client_server_mp/mp_client/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/multi_process/client_server_mp/mp_client/client.c b/examples/multi_process/client_server_mp/mp_client/client.c
index 7543db4..91f70eb 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_client/client.c
+++ b/examples/multi_process/client_server_mp/mp_client/client.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile
index 31b03d5..c29e478 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/Makefile
+++ b/examples/multi_process/client_server_mp/mp_server/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/multi_process/client_server_mp/mp_server/args.c b/examples/multi_process/client_server_mp/mp_server/args.c
index 741d190..b86ee32 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/args.c
+++ b/examples/multi_process/client_server_mp/mp_server/args.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/client_server_mp/mp_server/args.h b/examples/multi_process/client_server_mp/mp_server/args.h
index 926d972..23af1bd 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/args.h
+++ b/examples/multi_process/client_server_mp/mp_server/args.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index 0ed8d18..a84d1ee 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/client_server_mp/mp_server/init.h b/examples/multi_process/client_server_mp/mp_server/init.h
index 17207bf..7333614 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/init.h
+++ b/examples/multi_process/client_server_mp/mp_server/init.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c
index ba646e5..1eaf761 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/main.c
+++ b/examples/multi_process/client_server_mp/mp_server/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/client_server_mp/mp_server/main.h b/examples/multi_process/client_server_mp/mp_server/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/main.h
+++ b/examples/multi_process/client_server_mp/mp_server/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/client_server_mp/shared/common.h b/examples/multi_process/client_server_mp/shared/common.h
index 307cd2f..16efd2e 100644 (file)
--- a/examples/multi_process/client_server_mp/shared/common.h
+++ b/examples/multi_process/client_server_mp/shared/common.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/client_server_mp/shared/init_drivers.h b/examples/multi_process/client_server_mp/shared/init_drivers.h
index 5d9a90f..3c9881f 100644 (file)
--- a/examples/multi_process/client_server_mp/shared/init_drivers.h
+++ b/examples/multi_process/client_server_mp/shared/init_drivers.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/l2fwd_fork/Makefile b/examples/multi_process/l2fwd_fork/Makefile
index 18e56dd..ff257a3 100644 (file)
--- a/examples/multi_process/l2fwd_fork/Makefile
+++ b/examples/multi_process/l2fwd_fork/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/multi_process/l2fwd_fork/flib.c b/examples/multi_process/l2fwd_fork/flib.c
index 6bc60b7..aace308 100644 (file)
--- a/examples/multi_process/l2fwd_fork/flib.c
+++ b/examples/multi_process/l2fwd_fork/flib.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -136,9 +136,9 @@ slave_proc_func(void)
        exit(cfg->f(cfg->arg));
 }
 
        exit(cfg->f(cfg->arg));
 }
 

-/** 
+/**

  * function entrance ran in master thread, which will spawn slave process and wait until
  * function entrance ran in master thread, which will spawn slave process and wait until

- * specific slave exited. 
+ * specific slave exited.

  **/
 static int
 lcore_func(void *arg __attribute__((unused)))
  **/
 static int
 lcore_func(void *arg __attribute__((unused)))


@@ -173,7 +173,7 @@ lcore_func(void *arg __attribute__((unused)))
        }
 }
 
        }
 }
 

-static int 
+static int

 lcore_id_init(void)
 {
        int i;
 lcore_id_init(void)
 {
        int i;


@@ -199,9 +199,9 @@ flib_assign_lcore_id(void)
        int ret;
 
        /**
        int ret;
 
        /**

-        * thread assigned a lcore id previously, or a  slave thread. But still have 
+        * thread assigned a lcore id previously, or a  slave thread. But still have

         * a bug here: If the core mask includes core 0, and that core call this
         * a bug here: If the core mask includes core 0, and that core call this

-        * function, it still can get a new lcore id. 
+        * function, it still can get a new lcore id.

         **/
        if (rte_lcore_id() != 0)
                return -1;
         **/
        if (rte_lcore_id() != 0)
                return -1;


@@ -228,7 +228,7 @@ void
 flib_free_lcore_id(unsigned lcore_id)
 {
        /* id is not valid or belongs to pinned core id */
 flib_free_lcore_id(unsigned lcore_id)
 {
        /* id is not valid or belongs to pinned core id */

-       if (lcore_id >= RTE_MAX_LCORE || lcore_id == 0 || 
+       if (lcore_id >= RTE_MAX_LCORE || lcore_id == 0 ||

                rte_lcore_is_enabled(lcore_id))
                return;
 
                rte_lcore_is_enabled(lcore_id))
                return;
 


@@ -236,7 +236,7 @@ flib_free_lcore_id(unsigned lcore_id)
 }
 
 int
 }
 
 int

-flib_register_slave_exit_notify(unsigned slave_id, 
+flib_register_slave_exit_notify(unsigned slave_id,

        slave_exit_notify *cb)
 {
        if (cb == NULL)
        slave_exit_notify *cb)
 {
        if (cb == NULL)


@@ -250,7 +250,7 @@ flib_register_slave_exit_notify(unsigned slave_id,
        return 0;
 }
 
        return 0;
 }
 

-enum slave_stat 
+enum slave_stat

 flib_query_slave_status(unsigned slave_id)
 {
        if (!rte_lcore_is_enabled(slave_id))
 flib_query_slave_status(unsigned slave_id)
 {
        if (!rte_lcore_is_enabled(slave_id))


@@ -295,7 +295,7 @@ flib_mp_remote_launch(lcore_function_t *f, void *arg,
        return rte_eal_mp_remote_launch(lcore_func, NULL, call_master);
 }
 
        return rte_eal_mp_remote_launch(lcore_func, NULL, call_master);
 }
 

-int 
+int

 flib_init(void)
 {
        if ((core_cfg = rte_zmalloc("core_cfg",
 flib_init(void)
 {
        if ((core_cfg = rte_zmalloc("core_cfg",

diff --git a/examples/multi_process/l2fwd_fork/flib.h b/examples/multi_process/l2fwd_fork/flib.h
index 4674f24..711e3b6 100644 (file)
--- a/examples/multi_process/l2fwd_fork/flib.h
+++ b/examples/multi_process/l2fwd_fork/flib.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -57,7 +57,7 @@ int flib_init(void);
  * Check that every SLAVE lcores are in WAIT state, then call
  * flib_remote_launch() for all of them. If call_master is true
  * (set to CALL_MASTER), also call the function on the master lcore.
  * Check that every SLAVE lcores are in WAIT state, then call
  * flib_remote_launch() for all of them. If call_master is true
  * (set to CALL_MASTER), also call the function on the master lcore.

- * 
+ *

  * @param f:
  *     function pointer need to run
  * @param arg:
  * @param f:
  *     function pointer need to run
  * @param arg:


@@ -69,13 +69,13 @@ int flib_init(void);
  *    - 0 : function  execute successfully
  *    - -1 :  function  execute  failed
  */
  *    - 0 : function  execute successfully
  *    - -1 :  function  execute  failed
  */

-int flib_mp_remote_launch(lcore_function_t *f, 
+int flib_mp_remote_launch(lcore_function_t *f,

                void *arg, enum rte_rmt_call_master_t call_master);
 
 /**
  * Send a message to a slave lcore identified by slave_id to call a
  * function f with argument arg.
                void *arg, enum rte_rmt_call_master_t call_master);
 
 /**
  * Send a message to a slave lcore identified by slave_id to call a
  * function f with argument arg.

- * 
+ *

  * @param f:
  *     function pointer need to run
  * @param arg:
  * @param f:
  *     function pointer need to run
  * @param arg:


@@ -86,12 +86,12 @@ int flib_mp_remote_launch(lcore_function_t *f,
  *    - 0 : function  execute successfully
  *    - -1 :  function  execute  failed
  */
  *    - 0 : function  execute successfully
  *    - -1 :  function  execute  failed
  */

-int flib_remote_launch(lcore_function_t *f, 
+int flib_remote_launch(lcore_function_t *f,

                                        void *arg, unsigned slave_id);
 
 /**
                                        void *arg, unsigned slave_id);
 
 /**

- * Query the running stat for specific slave, wont' work in with master id 
- * 
+ * Query the running stat for specific slave, wont' work in with master id
+ *

  * @param slave_id:
  *     lcore id which should not be master id
  * @return
  * @param slave_id:
  *     lcore id which should not be master id
  * @return


@@ -99,12 +99,12 @@ int flib_remote_launch(lcore_function_t *f,
  *      - ST_IDLE     : lcore is idle
  *    -  ST_RUN     : lcore is running something
  */
  *      - ST_IDLE     : lcore is idle
  *    -  ST_RUN     : lcore is running something
  */

-enum slave_stat 
+enum slave_stat

 flib_query_slave_status(unsigned slave_id);
 
 /**
 flib_query_slave_status(unsigned slave_id);
 
 /**

- * Register a callback function to be notified in case specific slave exit.  
- * 
+ * Register a callback function to be notified in case specific slave exit.
+ *

  * @param slave_id:
  *     lcore id which should not be master id
  * @param cb:
  * @param slave_id:
  *     lcore id which should not be master id
  * @param cb:


@@ -114,7 +114,7 @@ flib_query_slave_status(unsigned slave_id);
  *    - -EFAULT  :  argument error
  *    - -ENOENT :  slave_id not correct
  */
  *    - -EFAULT  :  argument error
  *    - -ENOENT :  slave_id not correct
  */

-int flib_register_slave_exit_notify(unsigned slave_id, 
+int flib_register_slave_exit_notify(unsigned slave_id,

        slave_exit_notify *cb);
 
 /**
        slave_exit_notify *cb);
 
 /**

diff --git a/examples/multi_process/l2fwd_fork/main.c b/examples/multi_process/l2fwd_fork/main.c
index a34f420..03fba55 100644 (file)
--- a/examples/multi_process/l2fwd_fork/main.c
+++ b/examples/multi_process/l2fwd_fork/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -157,15 +157,15 @@ struct lcore_resource_struct {
        int flags;          /* Set only slave need to restart or recreate */
        unsigned lcore_id;  /*  lcore ID */
        unsigned pair_id;       /* dependency lcore ID on port */
        int flags;          /* Set only slave need to restart or recreate */
        unsigned lcore_id;  /*  lcore ID */
        unsigned pair_id;       /* dependency lcore ID on port */

-       char ring_name[2][MAX_NAME_LEN];        
+       char ring_name[2][MAX_NAME_LEN];

        /* ring[0] for master send cmd, slave read */
        /* ring[1] for slave send ack, master read */
        /* ring[0] for master send cmd, slave read */
        /* ring[1] for slave send ack, master read */

-       struct rte_ring *ring[2]; 
+       struct rte_ring *ring[2];

        int port_num;                                   /* Total port numbers */
        int port_num;                                   /* Total port numbers */

-       uint8_t port[RTE_MAX_ETHPORTS]; /* Port id for that lcore to receive packets */         
+       uint8_t port[RTE_MAX_ETHPORTS]; /* Port id for that lcore to receive packets */

 }__attribute__((packed)) __rte_cache_aligned;
 
 }__attribute__((packed)) __rte_cache_aligned;
 

-static struct lcore_resource_struct lcore_resource[RTE_MAX_LCORE]; 
+static struct lcore_resource_struct lcore_resource[RTE_MAX_LCORE];

 static struct rte_mempool *message_pool;
 static rte_spinlock_t res_lock = RTE_SPINLOCK_INITIALIZER;
 /* use floating processes */
 static struct rte_mempool *message_pool;
 static rte_spinlock_t res_lock = RTE_SPINLOCK_INITIALIZER;
 /* use floating processes */


@@ -309,8 +309,8 @@ get_cpu_affinity(void)
 }
 
 /**
 }
 
 /**

- * This fnciton demonstrates the approach to create ring in first instance 
- * or re-attach an existed ring in later instance. 
+ * This fnciton demonstrates the approach to create ring in first instance
+ * or re-attach an existed ring in later instance.

  **/
 static struct rte_ring *
 create_ring(const char *name, unsigned count,
  **/
 static struct rte_ring *
 create_ring(const char *name, unsigned count,


@@ -320,7 +320,7 @@ create_ring(const char *name, unsigned count,
 
        if (name == NULL)
                return NULL;
 
        if (name == NULL)
                return NULL;

-       
+

        /* If already create, just attached it */
        if (likely((ring = rte_ring_lookup(name)) != NULL))
                return ring;
        /* If already create, just attached it */
        if (likely((ring = rte_ring_lookup(name)) != NULL))
                return ring;


@@ -330,7 +330,7 @@ create_ring(const char *name, unsigned count,
 }
 
 /* Malloc with rte_malloc on structures that shared by master and slave */
 }
 
 /* Malloc with rte_malloc on structures that shared by master and slave */

-static int 
+static int

 l2fwd_malloc_shared_struct(void)
 {
        port_statistics = rte_zmalloc("port_stat",
 l2fwd_malloc_shared_struct(void)
 {
        port_statistics = rte_zmalloc("port_stat",


@@ -355,36 +355,36 @@ l2fwd_malloc_shared_struct(void)
 }
 
 /* Create ring which used for communicate among master and slave */
 }
 
 /* Create ring which used for communicate among master and slave */

-static int 
+static int

 create_ms_ring(unsigned slaveid)
 {
        unsigned flag = RING_F_SP_ENQ | RING_F_SC_DEQ;
        struct lcore_resource_struct *res = &lcore_resource[slaveid];
        unsigned socketid = rte_socket_id();
 create_ms_ring(unsigned slaveid)
 {
        unsigned flag = RING_F_SP_ENQ | RING_F_SC_DEQ;
        struct lcore_resource_struct *res = &lcore_resource[slaveid];
        unsigned socketid = rte_socket_id();

-       
+

        /* Always assume create ring on master socket_id */
        /* Default only create a ring size 32 */
        snprintf(res->ring_name[0], MAX_NAME_LEN, "%s%u",
                        RING_MASTER_NAME, slaveid);
        /* Always assume create ring on master socket_id */
        /* Default only create a ring size 32 */
        snprintf(res->ring_name[0], MAX_NAME_LEN, "%s%u",
                        RING_MASTER_NAME, slaveid);

-       if ((res->ring[0] = create_ring(res->ring_name[0], NB_CORE_MSGBUF, 
+       if ((res->ring[0] = create_ring(res->ring_name[0], NB_CORE_MSGBUF,

                                socketid, flag)) == NULL) {
                printf("Create m2s ring %s failed\n", res->ring_name[0]);
                return -1;
        }
                                socketid, flag)) == NULL) {
                printf("Create m2s ring %s failed\n", res->ring_name[0]);
                return -1;
        }

-       
+

        snprintf(res->ring_name[1], MAX_NAME_LEN, "%s%u",
                        RING_SLAVE_NAME, slaveid);
        snprintf(res->ring_name[1], MAX_NAME_LEN, "%s%u",
                        RING_SLAVE_NAME, slaveid);

-       if ((res->ring[1] = create_ring(res->ring_name[1], NB_CORE_MSGBUF, 
+       if ((res->ring[1] = create_ring(res->ring_name[1], NB_CORE_MSGBUF,

                socketid, flag)) == NULL) {
                printf("Create s2m ring %s failed\n", res->ring_name[1]);
                return -1;
                socketid, flag)) == NULL) {
                printf("Create s2m ring %s failed\n", res->ring_name[1]);
                return -1;

-       }       
+       }

 
        return 0;
 }
 
 /* send command to pair in paired master and slave ring */
 
        return 0;
 }
 
 /* send command to pair in paired master and slave ring */

-static inline int 
+static inline int

 sendcmd(unsigned slaveid, enum l2fwd_cmd cmd, int is_master)
 {
        struct lcore_resource_struct *res = &lcore_resource[slaveid];
 sendcmd(unsigned slaveid, enum l2fwd_cmd cmd, int is_master)
 {
        struct lcore_resource_struct *res = &lcore_resource[slaveid];


@@ -394,10 +394,10 @@ sendcmd(unsigned slaveid, enum l2fwd_cmd cmd, int is_master)
        /* Only check master, it must be enabled and running if it is slave */
        if (is_master && !res->enabled)
                return -1;
        /* Only check master, it must be enabled and running if it is slave */
        if (is_master && !res->enabled)
                return -1;

-       
+

        if (res->ring[fd] == NULL)
        if (res->ring[fd] == NULL)

-               return -1;      
-       
+               return -1;
+

        if (rte_mempool_get(message_pool, &msg) < 0) {
                printf("Error to get message buffer\n");
                return -1;
        if (rte_mempool_get(message_pool, &msg) < 0) {
                printf("Error to get message buffer\n");
                return -1;


@@ -410,7 +410,7 @@ sendcmd(unsigned slaveid, enum l2fwd_cmd cmd, int is_master)
                rte_mempool_put(message_pool, msg);
                return -1;
        }
                rte_mempool_put(message_pool, msg);
                return -1;
        }

-               
+

        return 0;
 }
 
        return 0;
 }
 


@@ -439,7 +439,7 @@ getcmd(unsigned slaveid, enum l2fwd_cmd *cmd, int is_master)
 }
 
 /* Master send command to slave and wait until ack received or error met */
 }
 
 /* Master send command to slave and wait until ack received or error met */

-static int 
+static int

 master_sendcmd_with_ack(unsigned slaveid, enum l2fwd_cmd cmd)
 {
        enum l2fwd_cmd ack_cmd;
 master_sendcmd_with_ack(unsigned slaveid, enum l2fwd_cmd cmd)
 {
        enum l2fwd_cmd ack_cmd;


@@ -465,7 +465,7 @@ master_sendcmd_with_ack(unsigned slaveid, enum l2fwd_cmd cmd)
 }
 
 /* restart all port that assigned to that slave lcore */
 }
 
 /* restart all port that assigned to that slave lcore */

-static int 
+static int

 reset_slave_all_ports(unsigned slaveid)
 {
        struct lcore_resource_struct *slave = &lcore_resource[slaveid];
 reset_slave_all_ports(unsigned slaveid)
 {
        struct lcore_resource_struct *slave = &lcore_resource[slaveid];


@@ -479,12 +479,12 @@ reset_slave_all_ports(unsigned slaveid)
                rte_eth_dev_stop(slave->port[i]);
                snprintf(buf_name, RTE_MEMPOOL_NAMESIZE, MBUF_NAME, slave->port[i]);
                pool = rte_mempool_lookup(buf_name);
                rte_eth_dev_stop(slave->port[i]);
                snprintf(buf_name, RTE_MEMPOOL_NAMESIZE, MBUF_NAME, slave->port[i]);
                pool = rte_mempool_lookup(buf_name);

-               if (pool) 
-                       printf("Port %d mempool free object is %u(%u)\n", slave->port[i], 
+               if (pool)
+                       printf("Port %d mempool free object is %u(%u)\n", slave->port[i],

                                rte_mempool_count(pool), (unsigned)NB_MBUF);
                else
                        printf("Can't find mempool %s\n", buf_name);
                                rte_mempool_count(pool), (unsigned)NB_MBUF);
                else
                        printf("Can't find mempool %s\n", buf_name);

-               
+

                printf("Start port :%d\n", slave->port[i]);
                ret = rte_eth_dev_start(slave->port[i]);
                if (ret != 0)
                printf("Start port :%d\n", slave->port[i]);
                ret = rte_eth_dev_start(slave->port[i]);
                if (ret != 0)


@@ -493,7 +493,7 @@ reset_slave_all_ports(unsigned slaveid)
        return ret;
 }
 
        return ret;
 }
 

-static int 
+static int

 reset_shared_structures(unsigned slaveid)
 {
        int ret;
 reset_shared_structures(unsigned slaveid)
 {
        int ret;


@@ -503,18 +503,18 @@ reset_shared_structures(unsigned slaveid)
        return ret;
 }
 
        return ret;
 }
 

-/** 
- * Call this function to re-create resource that needed for slave process that 
+/**
+ * Call this function to re-create resource that needed for slave process that

  * exited in last instance
  **/
  * exited in last instance
  **/

-static int 
+static int

 init_slave_res(unsigned slaveid)
 {
        struct lcore_resource_struct *slave = &lcore_resource[slaveid];
        enum l2fwd_cmd cmd;
 init_slave_res(unsigned slaveid)
 {
        struct lcore_resource_struct *slave = &lcore_resource[slaveid];
        enum l2fwd_cmd cmd;

-       
+

        if (!slave->enabled) {
        if (!slave->enabled) {

-               printf("Something wrong with lcore=%u enabled=%d\n",slaveid, 
+               printf("Something wrong with lcore=%u enabled=%d\n",slaveid,

                        slave->enabled);
                return -1;
        }
                        slave->enabled);
                return -1;
        }


@@ -531,7 +531,7 @@ init_slave_res(unsigned slaveid)
        return 0;
 }
 
        return 0;
 }
 

-static int 
+static int

 recreate_one_slave(unsigned slaveid)
 {
        int ret = 0;
 recreate_one_slave(unsigned slaveid)
 {
        int ret = 0;


@@ -539,12 +539,12 @@ recreate_one_slave(unsigned slaveid)
        if ((ret = init_slave_res(slaveid)) != 0) {
                printf("Init slave=%u failed\n", slaveid);
                return ret;
        if ((ret = init_slave_res(slaveid)) != 0) {
                printf("Init slave=%u failed\n", slaveid);
                return ret;

-       }       
-       
+       }
+

        if ((ret = flib_remote_launch(l2fwd_launch_one_lcore, NULL, slaveid))
                != 0)
                printf("Launch slave %u failed\n", slaveid);
        if ((ret = flib_remote_launch(l2fwd_launch_one_lcore, NULL, slaveid))
                != 0)
                printf("Launch slave %u failed\n", slaveid);

-       
+

        return ret;
 }
 
        return ret;
 }
 


@@ -604,7 +604,7 @@ back:
        return ret;
 }
 
        return ret;
 }
 

-static void 
+static void

 slave_exit_cb(unsigned slaveid, __attribute__((unused))int stat)
 {
        struct lcore_resource_struct *slave = &lcore_resource[slaveid];
 slave_exit_cb(unsigned slaveid, __attribute__((unused))int stat)
 {
        struct lcore_resource_struct *slave = &lcore_resource[slaveid];


@@ -699,7 +699,7 @@ l2fwd_main_loop(void)
        unsigned i, j, portid, nb_rx;
        struct lcore_queue_conf *qconf;
        const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) / US_PER_S * BURST_TX_DRAIN_US;
        unsigned i, j, portid, nb_rx;
        struct lcore_queue_conf *qconf;
        const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) / US_PER_S * BURST_TX_DRAIN_US;

-       
+

        prev_tsc = 0;
 
        lcore_id = rte_lcore_id();
        prev_tsc = 0;
 
        lcore_id = rte_lcore_id();


@@ -729,9 +729,9 @@ l2fwd_main_loop(void)
                        /* If get stop command, stop forwarding and exit */
                        if (cmd == CMD_STOP) {
                                return;
                        /* If get stop command, stop forwarding and exit */
                        if (cmd == CMD_STOP) {
                                return;

-                       } 
+                       }

                }
                }

-               
+

                /*
                 * TX burst queue drain
                 */
                /*
                 * TX burst queue drain
                 */


@@ -877,7 +877,7 @@ l2fwd_parse_args(int argc, char **argv)
                {NULL, 0, 0, 0}
        };
        int has_pmask = 0;
                {NULL, 0, 0, 0}
        };
        int has_pmask = 0;

-       
+

        argvopt = argv;
 
        while ((opt = getopt_long(argc, argvopt, "p:q:T:f",
        argvopt = argv;
 
        while ((opt = getopt_long(argc, argvopt, "p:q:T:f",


@@ -919,7 +919,7 @@ l2fwd_parse_args(int argc, char **argv)
                case 'f':
                        float_proc = 1;
                        break;
                case 'f':
                        float_proc = 1;
                        break;

-                       
+

                /* long options */
                case 0:
                        l2fwd_usage(prgname);
                /* long options */
                case 0:
                        l2fwd_usage(prgname);


@@ -1038,7 +1038,7 @@ MAIN(int argc, char **argv)
                rte_exit(EXIT_FAILURE, "flib init error");
 
        /**
                rte_exit(EXIT_FAILURE, "flib init error");
 
        /**

-         * Allocated structures that slave lcore would change. For those that slaves are 
+         * Allocated structures that slave lcore would change. For those that slaves are

          * read only, needn't use malloc to share and global or static variables is ok since
          * slave inherit all the knowledge that master initialized.
          **/
          * read only, needn't use malloc to share and global or static variables is ok since
          * slave inherit all the knowledge that master initialized.
          **/


@@ -1049,7 +1049,7 @@ MAIN(int argc, char **argv)
        memset(lcore_resource, 0, sizeof(lcore_resource));
        for (i = 0; i < RTE_MAX_LCORE; i++)
                lcore_resource[i].lcore_id = i;
        memset(lcore_resource, 0, sizeof(lcore_resource));
        for (i = 0; i < RTE_MAX_LCORE; i++)
                lcore_resource[i].lcore_id = i;

-       
+

        if (rte_eal_pci_probe() < 0)
                rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");
 
        if (rte_eal_pci_probe() < 0)
                rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");
 


@@ -1064,7 +1064,7 @@ MAIN(int argc, char **argv)
        for (portid = 0; portid < nb_ports; portid++) {
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0)
        for (portid = 0; portid < nb_ports; portid++) {
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0)

-                       continue;         
+                       continue;

                char buf_name[RTE_MEMPOOL_NAMESIZE];
                flags = MEMPOOL_F_SP_PUT | MEMPOOL_F_SC_GET;
                snprintf(buf_name, RTE_MEMPOOL_NAMESIZE, MBUF_NAME, portid);
                char buf_name[RTE_MEMPOOL_NAMESIZE];
                flags = MEMPOOL_F_SP_PUT | MEMPOOL_F_SC_GET;
                snprintf(buf_name, RTE_MEMPOOL_NAMESIZE, MBUF_NAME, portid);


@@ -1123,7 +1123,7 @@ MAIN(int argc, char **argv)
                /* get the lcore_id for this port */
                /* skip master lcore */
                while (rte_lcore_is_enabled(rx_lcore_id) == 0 ||
                /* get the lcore_id for this port */
                /* skip master lcore */
                while (rte_lcore_is_enabled(rx_lcore_id) == 0 ||

-                          rte_get_master_lcore() == rx_lcore_id || 
+                          rte_get_master_lcore() == rx_lcore_id ||

                       lcore_queue_conf[rx_lcore_id].n_rx_port ==
                       l2fwd_rx_queue_per_lcore) {
 
                       lcore_queue_conf[rx_lcore_id].n_rx_port ==
                       l2fwd_rx_queue_per_lcore) {
 


@@ -1143,7 +1143,7 @@ MAIN(int argc, char **argv)
                res = &lcore_resource[rx_lcore_id];
                res->enabled = 1;
                res->port[res->port_num++] = portid;
                res = &lcore_resource[rx_lcore_id];
                res->enabled = 1;
                res->port[res->port_num++] = portid;

-               
+

                printf("Lcore %u: RX port %u\n", rx_lcore_id, (unsigned) portid);
        }
 
                printf("Lcore %u: RX port %u\n", rx_lcore_id, (unsigned) portid);
        }
 


@@ -1216,12 +1216,12 @@ MAIN(int argc, char **argv)
 
        /* Record pair lcore */
        /**
 
        /* Record pair lcore */
        /**

-        * Since l2fwd example would create pair between different neighbour port, that's 
+        * Since l2fwd example would create pair between different neighbour port, that's

         * port 0 receive and forward to port 1, the same to port 1, these 2 ports will have
         * dependency. If one port stopped working (killed, for example), the port need to
         * be stopped/started again. During the time, another port need to wait until stop/start
         * procedure completed. So, record the pair relationship for those lcores working
         * port 0 receive and forward to port 1, the same to port 1, these 2 ports will have
         * dependency. If one port stopped working (killed, for example), the port need to
         * be stopped/started again. During the time, another port need to wait until stop/start
         * procedure completed. So, record the pair relationship for those lcores working

-        * on ports. 
+        * on ports.

         **/
        for (portid = 0; portid < nb_ports; portid++) {
                uint32_t pair_port;
         **/
        for (portid = 0; portid < nb_ports; portid++) {
                uint32_t pair_port;


@@ -1239,12 +1239,12 @@ MAIN(int argc, char **argv)
                                continue;
                        for (j = 0; j < lcore_queue_conf[i].n_rx_port;j++) {
                                if (lcore_queue_conf[i].rx_port_list[j] == portid) {
                                continue;
                        for (j = 0; j < lcore_queue_conf[i].n_rx_port;j++) {
                                if (lcore_queue_conf[i].rx_port_list[j] == portid) {

-                                       lcore = i;      
+                                       lcore = i;

                                        find_lcore = 1;
                                        break;
                                }
                                if (lcore_queue_conf[i].rx_port_list[j] == pair_port) {
                                        find_lcore = 1;
                                        break;
                                }
                                if (lcore_queue_conf[i].rx_port_list[j] == pair_port) {

-                                       pair_lcore = i; 
+                                       pair_lcore = i;

                                        find_pair_lcore = 1;
                                        break;
                                }
                                        find_pair_lcore = 1;
                                        break;
                                }


@@ -1261,21 +1261,21 @@ MAIN(int argc, char **argv)
        }
 
        /* Create message buffer for all master and slave */
        }
 
        /* Create message buffer for all master and slave */

-       message_pool = rte_mempool_create("ms_msg_pool", 
+       message_pool = rte_mempool_create("ms_msg_pool",

                           NB_CORE_MSGBUF * RTE_MAX_LCORE,
                           sizeof(enum l2fwd_cmd), NB_CORE_MSGBUF / 2,
                           0,
                           rte_pktmbuf_pool_init, NULL,
                           rte_pktmbuf_init, NULL,
                           NB_CORE_MSGBUF * RTE_MAX_LCORE,
                           sizeof(enum l2fwd_cmd), NB_CORE_MSGBUF / 2,
                           0,
                           rte_pktmbuf_pool_init, NULL,
                           rte_pktmbuf_init, NULL,

-                          rte_socket_id(), 0); 
+                          rte_socket_id(), 0);

 
        if (message_pool == NULL)
                rte_exit(EXIT_FAILURE, "Create msg mempool failed\n");
 
        /* Create ring for each master and slave pair, also register cb when slave leaves */
        for (i = 0; i < RTE_MAX_LCORE; i++) {
 
        if (message_pool == NULL)
                rte_exit(EXIT_FAILURE, "Create msg mempool failed\n");
 
        /* Create ring for each master and slave pair, also register cb when slave leaves */
        for (i = 0; i < RTE_MAX_LCORE; i++) {

-               /** 
-                * Only create ring and register slave_exit cb in case that core involved into 
+               /**
+                * Only create ring and register slave_exit cb in case that core involved into

                 * packet forwarding
                 **/
                if (lcore_resource[i].enabled) {
                 * packet forwarding
                 **/
                if (lcore_resource[i].enabled) {


@@ -1287,7 +1287,7 @@ MAIN(int argc, char **argv)
 
                        if (flib_register_slave_exit_notify(i,
                                slave_exit_cb) != 0)
 
                        if (flib_register_slave_exit_notify(i,
                                slave_exit_cb) != 0)

-                               rte_exit(EXIT_FAILURE, 
+                               rte_exit(EXIT_FAILURE,

                                                "Register master_trace_slave_exit failed");
                }
        }
                                                "Register master_trace_slave_exit failed");
                }
        }


@@ -1304,19 +1304,19 @@ MAIN(int argc, char **argv)
                diff_tsc = cur_tsc - prev_tsc;
                /* if timer is enabled */
                if (timer_period > 0) {
                diff_tsc = cur_tsc - prev_tsc;
                /* if timer is enabled */
                if (timer_period > 0) {

-               
+

                        /* advance the timer */
                        timer_tsc += diff_tsc;
                        /* advance the timer */
                        timer_tsc += diff_tsc;

-               
+

                        /* if timer has reached its timeout */
                        if (unlikely(timer_tsc >= (uint64_t) timer_period)) {
                        /* if timer has reached its timeout */
                        if (unlikely(timer_tsc >= (uint64_t) timer_period)) {

-               
+

                                print_stats();
                                /* reset the timer */
                                timer_tsc = 0;
                        }
                }
                                print_stats();
                                /* reset the timer */
                                timer_tsc = 0;
                        }
                }

-               
+

                prev_tsc = cur_tsc;
 
                /* Check any slave need restart or recreate */
                prev_tsc = cur_tsc;
 
                /* Check any slave need restart or recreate */

diff --git a/examples/multi_process/l2fwd_fork/main.h b/examples/multi_process/l2fwd_fork/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/multi_process/l2fwd_fork/main.h
+++ b/examples/multi_process/l2fwd_fork/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/simple_mp/Makefile b/examples/multi_process/simple_mp/Makefile
index 136dbfa..31ec0c8 100644 (file)
--- a/examples/multi_process/simple_mp/Makefile
+++ b/examples/multi_process/simple_mp/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/multi_process/simple_mp/main.c b/examples/multi_process/simple_mp/main.c
index 46b1f9b..8e1ace9 100644 (file)
--- a/examples/multi_process/simple_mp/main.c
+++ b/examples/multi_process/simple_mp/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/simple_mp/mp_commands.c b/examples/multi_process/simple_mp/mp_commands.c
index 8fe6f50..c64ebdd 100644 (file)
--- a/examples/multi_process/simple_mp/mp_commands.c
+++ b/examples/multi_process/simple_mp/mp_commands.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/simple_mp/mp_commands.h b/examples/multi_process/simple_mp/mp_commands.h
index a7968fe..7e9a4ab 100644 (file)
--- a/examples/multi_process/simple_mp/mp_commands.h
+++ b/examples/multi_process/simple_mp/mp_commands.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/multi_process/symmetric_mp/Makefile b/examples/multi_process/symmetric_mp/Makefile
index d21aa7d..c789f3c 100644 (file)
--- a/examples/multi_process/symmetric_mp/Makefile
+++ b/examples/multi_process/symmetric_mp/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c
index 028f98d..634e661 100644 (file)
--- a/examples/multi_process/symmetric_mp/main.c
+++ b/examples/multi_process/symmetric_mp/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/netmap_compat/Makefile b/examples/netmap_compat/Makefile
index 8c9b67a..d398e5f 100644 (file)
--- a/examples/netmap_compat/Makefile
+++ b/examples/netmap_compat/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/netmap_compat/bridge/Makefile b/examples/netmap_compat/bridge/Makefile
index 893264b..13eb229 100644 (file)
--- a/examples/netmap_compat/bridge/Makefile
+++ b/examples/netmap_compat/bridge/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/netmap_compat/bridge/bridge.c b/examples/netmap_compat/bridge/bridge.c
index e0cef57..d9c892c 100644 (file)
--- a/examples/netmap_compat/bridge/bridge.c
+++ b/examples/netmap_compat/bridge/bridge.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -181,7 +181,7 @@ parse_args(int argc, char **argv)
                                rte_exit(EXIT_FAILURE, "configs with %u "
                                        "ports are not supported\n",
                                        ports.num + 1);
                                rte_exit(EXIT_FAILURE, "configs with %u "
                                        "ports are not supported\n",
                                        ports.num + 1);

-                                       
+

                        }
 
                        ports.p[ports.num].str = optarg;
                        }
 
                        ports.p[ports.num].str = optarg;


@@ -232,7 +232,7 @@ netmap_port_open(uint32_t idx)
 
        port = ports.p + idx;
 
 
        port = ports.p + idx;
 

-       port->fd = rte_netmap_open("/dev/netmap", O_RDWR); 
+       port->fd = rte_netmap_open("/dev/netmap", O_RDWR);

 
        rte_snprintf(req.nr_name, sizeof(req.nr_name), "%s", port->str);
        req.nr_version = NETMAP_API;
 
        rte_snprintf(req.nr_name, sizeof(req.nr_name), "%s", port->str);
        req.nr_version = NETMAP_API;


@@ -263,7 +263,7 @@ netmap_port_open(uint32_t idx)
                printf("[E] NETMAP mmap failed for fd: %d)\n", port->fd);
                return (-ENOMEM);
        }
                printf("[E] NETMAP mmap failed for fd: %d)\n", port->fd);
                return (-ENOMEM);
        }

-       
+

        port->nmif = NETMAP_IF(ports.mem, req.nr_offset);
 
        port->tx_ring = NETMAP_TXRING(port->nmif, 0);
        port->nmif = NETMAP_IF(ports.mem, req.nr_offset);
 
        port->tx_ring = NETMAP_TXRING(port->nmif, 0);

diff --git a/examples/netmap_compat/lib/compat_netmap.c b/examples/netmap_compat/lib/compat_netmap.c
index ebb98ff..946fab4 100644 (file)
--- a/examples/netmap_compat/lib/compat_netmap.c
+++ b/examples/netmap_compat/lib/compat_netmap.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -92,7 +92,7 @@ struct netmap_state {
 static struct netmap_port ports[RTE_MAX_ETHPORTS];
 static struct netmap_state netmap;
 
 static struct netmap_port ports[RTE_MAX_ETHPORTS];
 static struct netmap_state netmap;
 

-static struct fd_port fd_port[COMPAT_NETMAP_MAX_NOFILE]; 
+static struct fd_port fd_port[COMPAT_NETMAP_MAX_NOFILE];

 static const int next_fd_start = RLIMIT_NOFILE + 1;
 static rte_spinlock_t netmap_lock;
 
 static const int next_fd_start = RLIMIT_NOFILE + 1;
 static rte_spinlock_t netmap_lock;
 


@@ -288,7 +288,7 @@ netmap_ring_setup(struct netmap_ring *ring, uint8_t port, uint32_t ringid,
        ring->flags = 0;
        ring->ts.tv_sec = 0;
        ring->ts.tv_usec = 0;
        ring->flags = 0;
        ring->ts.tv_sec = 0;
        ring->ts.tv_usec = 0;

-           
+

        for (j = 0; j < ring->num_slots; j++) {
                ring->slot[j].buf_idx = BUF_IDX(port, ringid, j);
                ring->slot[j].len = 0;
        for (j = 0; j < ring->num_slots; j++) {
                ring->slot[j].buf_idx = BUF_IDX(port, ringid, j);
                ring->slot[j].len = 0;


@@ -487,7 +487,7 @@ rx_sync_ring(struct netmap_ring *ring, uint8_t port, uint16_t ring_number,
                ring->avail += n_rx;
                n_free_slots -= n_rx;
        }
                ring->avail += n_rx;
                n_free_slots -= n_rx;
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -705,7 +705,7 @@ rte_netmap_init_port(uint8_t portid, const struct rte_netmap_port_conf *conf)
 
        ret = rte_eth_dev_configure(portid, conf->nr_rx_rings,
                conf->nr_tx_rings, conf->eth_conf);
 
        ret = rte_eth_dev_configure(portid, conf->nr_rx_rings,
                conf->nr_tx_rings, conf->eth_conf);

-                                   
+

        if (ret < 0) {
            RTE_LOG(ERR, USER1, "Couldn't configure port %hhu\n", portid);
            return (ret);
        if (ret < 0) {
            RTE_LOG(ERR, USER1, "Couldn't configure port %hhu\n", portid);
            return (ret);


@@ -725,7 +725,7 @@ rte_netmap_init_port(uint8_t portid, const struct rte_netmap_port_conf *conf)
 
                ret = rte_eth_rx_queue_setup(portid, i, rx_slots,
                        conf->socket_id, conf->rx_conf, conf->pool);
 
                ret = rte_eth_rx_queue_setup(portid, i, rx_slots,
                        conf->socket_id, conf->rx_conf, conf->pool);

-                                        
+

                if (ret < 0) {
                        RTE_LOG(ERR, USER1,
                                "Couldn't configure RX queue %hu of "
                if (ret < 0) {
                        RTE_LOG(ERR, USER1,
                                "Couldn't configure RX queue %hu of "


@@ -774,7 +774,7 @@ int rte_netmap_ioctl(int fd, int op, void *param)
        if (!FD_VALID(fd)) {
            errno = EBADF;
            return (-1);
        if (!FD_VALID(fd)) {
            errno = EBADF;
            return (-1);

-       } 
+       }

 
        switch (op) {
 
 
        switch (op) {
 


@@ -829,7 +829,7 @@ rte_netmap_mmap(void *addr, size_t length,
        return ((void *)((uintptr_t)netmap.mem + offset));
 }
 
        return ((void *)((uintptr_t)netmap.mem + offset));
 }
 

-/** 
+/**

  * Return a "fake" file descriptor with a value above RLIMIT_NOFILE so that
  * any attempt to use that file descriptor with the usual API will fail.
  */
  * Return a "fake" file descriptor with a value above RLIMIT_NOFILE so that
  * any attempt to use that file descriptor with the usual API will fail.
  */


@@ -869,7 +869,7 @@ rte_netmap_poll(struct pollfd *fds, nfds_t nfds, int timeout)
                                fds[i].revents = 0;
                                continue;
                        }
                                fds[i].revents = 0;
                                continue;
                        }

-               
+

                        idx = FD_TO_IDX(fds[i].fd);
                        if ((port = fd_port[idx].port) >= RTE_DIM(ports) ||
                                        ports[port].fd != idx) {
                        idx = FD_TO_IDX(fds[i].fd);
                        if ((port = fd_port[idx].port) >= RTE_DIM(ports) ||
                                        ports[port].fd != idx) {

diff --git a/examples/netmap_compat/lib/compat_netmap.h b/examples/netmap_compat/lib/compat_netmap.h
index 0971443..f7f2276 100644 (file)
--- a/examples/netmap_compat/lib/compat_netmap.h
+++ b/examples/netmap_compat/lib/compat_netmap.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/netmap_compat/netmap/netmap.h b/examples/netmap_compat/netmap/netmap.h
index 8dba31c..677c8a9 100644 (file)
--- a/examples/netmap_compat/netmap/netmap.h
+++ b/examples/netmap_compat/netmap/netmap.h
@@ -1,22 +1,22 @@
 /*
  * Copyright (C) 2011 Matteo Landi, Luigi Rizzo. All rights reserved.
 /*
  * Copyright (C) 2011 Matteo Landi, Luigi Rizzo. All rights reserved.

- * 
+ *

  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 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.
  *   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.
  *   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.

- * 
+ *

  *   3. Neither the name of the authors nor the names of their contributors
  *      may be used to endorse or promote products derived from this
  *      software without specific prior written permission.
  *   3. Neither the name of the authors nor the names of their contributors
  *      may be used to endorse or promote products derived from this
  *      software without specific prior written permission.

- * 
+ *

  * THIS SOFTWARE IS PROVIDED BY MATTEO LANDI 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
  * THIS SOFTWARE IS PROVIDED BY MATTEO LANDI 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


@@ -37,7 +37,7 @@
  * Definitions of constants and the structures used by the netmap
  * framework, for the part visible to both kernel and userspace.
  * Detailed info on netmap is available with "man netmap" or at
  * Definitions of constants and the structures used by the netmap
  * framework, for the part visible to both kernel and userspace.
  * Detailed info on netmap is available with "man netmap" or at

- * 
+ *

  *     http://info.iet.unipi.it/~luigi/netmap/
  */
 
  *     http://info.iet.unipi.it/~luigi/netmap/
  */
 


@@ -234,7 +234,7 @@ struct netmap_if {
        ssize_t ring_ofs[0];
 };
 
        ssize_t ring_ofs[0];
 };
 

-#ifndef NIOCREGIF      
+#ifndef NIOCREGIF

 /*
  * ioctl names and related fields
  *
 /*
  * ioctl names and related fields
  *

diff --git a/examples/netmap_compat/netmap/netmap_user.h b/examples/netmap_compat/netmap/netmap_user.h
index 86b1b71..f369592 100644 (file)
--- a/examples/netmap_compat/netmap/netmap_user.h
+++ b/examples/netmap_compat/netmap/netmap_user.h
@@ -1,22 +1,22 @@
 /*
  * Copyright (C) 2011 Matteo Landi, Luigi Rizzo. All rights reserved.
 /*
  * Copyright (C) 2011 Matteo Landi, Luigi Rizzo. All rights reserved.

- * 
+ *

  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 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.
  *   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.
  *   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.

- * 
+ *

  *   3. Neither the name of the authors nor the names of their contributors
  *      may be used to endorse or promote products derived from this
  *      software without specific prior written permission.
  *   3. Neither the name of the authors nor the names of their contributors
  *      may be used to endorse or promote products derived from this
  *      software without specific prior written permission.

- * 
+ *

  * THIS SOFTWARE IS PROVIDED BY MATTEO LANDI 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
  * THIS SOFTWARE IS PROVIDED BY MATTEO LANDI 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


@@ -77,7 +77,7 @@
 
 #define NETMAP_BUF_IDX(ring, buf)                      \
        ( ((char *)(buf) - ((char *)(ring) + (ring)->buf_ofs) ) / \
 
 #define NETMAP_BUF_IDX(ring, buf)                      \
        ( ((char *)(buf) - ((char *)(ring) + (ring)->buf_ofs) ) / \

-               (ring)->nr_buf_size ) 
+               (ring)->nr_buf_size )

 
 #define        NETMAP_RING_NEXT(r, i)                          \
        ((i)+1 == (r)->num_slots ? 0 : (i) + 1 )
 
 #define        NETMAP_RING_NEXT(r, i)                          \
        ((i)+1 == (r)->num_slots ? 0 : (i) + 1 )

diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile
index 43c9720..5113a12 100644 (file)
--- a/examples/qos_meter/Makefile
+++ b/examples/qos_meter/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c
index e1698cc..30816dc 100755 (executable)
--- a/examples/qos_meter/main.c
+++ b/examples/qos_meter/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -67,7 +67,7 @@
 #endif
 
 /*
 #endif
 
 /*

- * Buffer pool configuration 
+ * Buffer pool configuration

  *
  ***/
 #define MBUF_SIZE           (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
  *
  ***/
 #define MBUF_SIZE           (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)


@@ -155,7 +155,7 @@ struct rte_meter_trtcm_params app_trtcm_params[] = {
 
 FLOW_METER app_flows[APP_FLOWS_MAX];
 
 
 FLOW_METER app_flows[APP_FLOWS_MAX];
 

-static void 
+static void

 app_configure_flow_table(void)
 {
        uint32_t i, j;
 app_configure_flow_table(void)
 {
        uint32_t i, j;


@@ -204,22 +204,22 @@ main_loop(__attribute__((unused)) void *dummy)
        while (1) {
                uint64_t time_diff;
                int i, nb_rx;
        while (1) {
                uint64_t time_diff;
                int i, nb_rx;

-               
+

                /* Mechanism to avoid stale packets in the output buffer */
                current_time = rte_rdtsc();
                time_diff = current_time - last_time;
                if (unlikely(time_diff > TIME_TX_DRAIN)) {
                        int ret;
                /* Mechanism to avoid stale packets in the output buffer */
                current_time = rte_rdtsc();
                time_diff = current_time - last_time;
                if (unlikely(time_diff > TIME_TX_DRAIN)) {
                        int ret;

-                       
+

                        if (pkts_tx_len == 0) {
                                last_time = current_time;
                        if (pkts_tx_len == 0) {
                                last_time = current_time;

-                               
+

                                continue;
                        }
 
                        /* Write packet burst to NIC TX */
                        ret = rte_eth_tx_burst(port_tx, NIC_TX_QUEUE, pkts_tx, pkts_tx_len);
                                continue;
                        }
 
                        /* Write packet burst to NIC TX */
                        ret = rte_eth_tx_burst(port_tx, NIC_TX_QUEUE, pkts_tx, pkts_tx_len);

-                       
+

                        /* Free buffers for any packets not written successfully */
                        if (unlikely(ret < pkts_tx_len)) {
                                for ( ; ret < pkts_tx_len; ret ++) {
                        /* Free buffers for any packets not written successfully */
                        if (unlikely(ret < pkts_tx_len)) {
                                for ( ; ret < pkts_tx_len; ret ++) {


@@ -229,17 +229,17 @@ main_loop(__attribute__((unused)) void *dummy)
 
                        /* Empty the output buffer */
                        pkts_tx_len = 0;
 
                        /* Empty the output buffer */
                        pkts_tx_len = 0;

-                       
+

                        last_time = current_time;
                }
                        last_time = current_time;
                }

-               
+

                /* Read packet burst from NIC RX */
                nb_rx = rte_eth_rx_burst(port_rx, NIC_RX_QUEUE, pkts_rx, PKT_RX_BURST_MAX);
                /* Read packet burst from NIC RX */
                nb_rx = rte_eth_rx_burst(port_rx, NIC_RX_QUEUE, pkts_rx, PKT_RX_BURST_MAX);

-               
+

                /* Handle packets */
                for (i = 0; i < nb_rx; i ++) {
                        struct rte_mbuf *pkt = pkts_rx[i];
                /* Handle packets */
                for (i = 0; i < nb_rx; i ++) {
                        struct rte_mbuf *pkt = pkts_rx[i];

-                       
+

                        /* Handle current packet */
                        if (app_pkt_handle(pkt, current_time) == DROP)
                                rte_pktmbuf_free(pkt);
                        /* Handle current packet */
                        if (app_pkt_handle(pkt, current_time) == DROP)
                                rte_pktmbuf_free(pkt);


@@ -247,19 +247,19 @@ main_loop(__attribute__((unused)) void *dummy)
                                pkts_tx[pkts_tx_len] = pkt;
                                pkts_tx_len ++;
                        }
                                pkts_tx[pkts_tx_len] = pkt;
                                pkts_tx_len ++;
                        }

-                       
+

                        /* Write packets from output buffer to NIC TX when full burst is available */
                        if (unlikely(pkts_tx_len == PKT_TX_BURST_MAX)) {
                                /* Write packet burst to NIC TX */
                                int ret = rte_eth_tx_burst(port_tx, NIC_TX_QUEUE, pkts_tx, PKT_TX_BURST_MAX);
                        /* Write packets from output buffer to NIC TX when full burst is available */
                        if (unlikely(pkts_tx_len == PKT_TX_BURST_MAX)) {
                                /* Write packet burst to NIC TX */
                                int ret = rte_eth_tx_burst(port_tx, NIC_TX_QUEUE, pkts_tx, PKT_TX_BURST_MAX);

-                               
+

                                /* Free buffers for any packets not written successfully */
                                if (unlikely(ret < PKT_TX_BURST_MAX)) {
                                        for ( ; ret < PKT_TX_BURST_MAX; ret ++) {
                                                rte_pktmbuf_free(pkts_tx[ret]);
                                        }
                                }
                                /* Free buffers for any packets not written successfully */
                                if (unlikely(ret < PKT_TX_BURST_MAX)) {
                                        for ( ; ret < PKT_TX_BURST_MAX; ret ++) {
                                                rte_pktmbuf_free(pkts_tx[ret]);
                                        }
                                }

-                               
+

                                /* Empty the output buffer */
                                pkts_tx_len = 0;
                        }
                                /* Empty the output buffer */
                                pkts_tx_len = 0;
                        }


@@ -303,7 +303,7 @@ parse_args(int argc, char **argv)
        static struct option lgopts[] = {
                {NULL, 0, 0, 0}
        };
        static struct option lgopts[] = {
                {NULL, 0, 0, 0}
        };

-       uint64_t port_mask, i, mask;            
+       uint64_t port_mask, i, mask;

 
        argvopt = argv;
 
 
        argvopt = argv;
 


@@ -316,7 +316,7 @@ parse_args(int argc, char **argv)
                                print_usage(prgname);
                                return -1;
                        }
                                print_usage(prgname);
                                return -1;
                        }

-                       
+

                        for (i = 0, mask = 1; i < 64; i ++, mask <<= 1){
                                if (mask & port_mask){
                                        port_rx = i;
                        for (i = 0, mask = 1; i < 64; i ++, mask <<= 1){
                                if (mask & port_mask){
                                        port_rx = i;


@@ -332,14 +332,14 @@ parse_args(int argc, char **argv)
                                        break;
                                }
                        }
                                        break;
                                }
                        }

-                       
+

                        if (port_mask != 0) {
                                printf("invalid port mask (more than 2 ports)\n");
                                print_usage(prgname);
                                return -1;
                        }
                        break;
                        if (port_mask != 0) {
                                printf("invalid port mask (more than 2 ports)\n");
                                print_usage(prgname);
                                return -1;
                        }
                        break;

-                       
+

                default:
                        print_usage(prgname);
                        return -1;
                default:
                        print_usage(prgname);
                        return -1;


@@ -370,18 +370,18 @@ MAIN(int argc, char **argv)
        argc -= ret;
        argv += ret;
        if (rte_lcore_count() != 1) {
        argc -= ret;
        argv += ret;
        if (rte_lcore_count() != 1) {

-               rte_exit(EXIT_FAILURE, "This application does not accept more than one core. " 
+               rte_exit(EXIT_FAILURE, "This application does not accept more than one core. "

                "Please adjust the \"-c COREMASK\" parameter accordingly.\n");
        }
                "Please adjust the \"-c COREMASK\" parameter accordingly.\n");
        }

-       
+

        /* Application non-EAL arguments parse */
        ret = parse_args(argc, argv);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Invalid input arguments\n");
 
        /* Buffer pool init */
        /* Application non-EAL arguments parse */
        ret = parse_args(argc, argv);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Invalid input arguments\n");
 
        /* Buffer pool init */

-       pool = rte_mempool_create("pool", NB_MBUF, MBUF_SIZE, MEMPOOL_CACHE_SIZE, 
-               sizeof(struct rte_pktmbuf_pool_private), rte_pktmbuf_pool_init, NULL, 
+       pool = rte_mempool_create("pool", NB_MBUF, MBUF_SIZE, MEMPOOL_CACHE_SIZE,
+               sizeof(struct rte_pktmbuf_pool_private), rte_pktmbuf_pool_init, NULL,

                rte_pktmbuf_init, NULL, rte_socket_id(), 0);
        if (pool == NULL)
                rte_exit(EXIT_FAILURE, "Buffer pool creation error\n");
                rte_pktmbuf_init, NULL, rte_socket_id(), 0);
        if (pool == NULL)
                rte_exit(EXIT_FAILURE, "Buffer pool creation error\n");


@@ -397,7 +397,7 @@ MAIN(int argc, char **argv)
        ret = rte_eth_rx_queue_setup(port_rx, NIC_RX_QUEUE, NIC_RX_QUEUE_DESC, rte_eth_dev_socket_id(port_rx), &rx_conf, pool);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Port %d RX queue setup error (%d)\n", port_rx, ret);
        ret = rte_eth_rx_queue_setup(port_rx, NIC_RX_QUEUE, NIC_RX_QUEUE_DESC, rte_eth_dev_socket_id(port_rx), &rx_conf, pool);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Port %d RX queue setup error (%d)\n", port_rx, ret);

-       
+

        ret = rte_eth_tx_queue_setup(port_rx, NIC_TX_QUEUE, NIC_TX_QUEUE_DESC, rte_eth_dev_socket_id(port_rx), &tx_conf);
        if (ret < 0)
        rte_exit(EXIT_FAILURE, "Port %d TX queue setup error (%d)\n", port_rx, ret);
        ret = rte_eth_tx_queue_setup(port_rx, NIC_TX_QUEUE, NIC_TX_QUEUE_DESC, rte_eth_dev_socket_id(port_rx), &tx_conf);
        if (ret < 0)
        rte_exit(EXIT_FAILURE, "Port %d TX queue setup error (%d)\n", port_rx, ret);


@@ -417,7 +417,7 @@ MAIN(int argc, char **argv)
        ret = rte_eth_dev_start(port_rx);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Port %d start error (%d)\n", port_rx, ret);
        ret = rte_eth_dev_start(port_rx);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Port %d start error (%d)\n", port_rx, ret);

-               
+

        ret = rte_eth_dev_start(port_tx);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Port %d start error (%d)\n", port_tx, ret);
        ret = rte_eth_dev_start(port_tx);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Port %d start error (%d)\n", port_tx, ret);


@@ -425,7 +425,7 @@ MAIN(int argc, char **argv)
        rte_eth_promiscuous_enable(port_rx);
 
        rte_eth_promiscuous_enable(port_tx);
        rte_eth_promiscuous_enable(port_rx);
 
        rte_eth_promiscuous_enable(port_tx);

-       
+

        /* App configuration */
        app_configure_flow_table();
 
        /* App configuration */
        app_configure_flow_table();
 

diff --git a/examples/qos_meter/main.h b/examples/qos_meter/main.h
index 076fc7d..7bffce5 100755 (executable)
--- a/examples/qos_meter/main.h
+++ b/examples/qos_meter/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/qos_meter/rte_policer.c b/examples/qos_meter/rte_policer.c
index dffb17f..35f5f1b 100644 (file)
--- a/examples/qos_meter/rte_policer.c
+++ b/examples/qos_meter/rte_policer.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -35,24 +35,24 @@
 #include "rte_policer.h"
 
 int
 #include "rte_policer.h"
 
 int

-rte_phb_config(struct rte_phb *phb_table, uint32_t phb_table_index, 
+rte_phb_config(struct rte_phb *phb_table, uint32_t phb_table_index,

        enum rte_meter_color pre_meter, enum rte_meter_color post_meter, enum rte_phb_action action)
 {
        struct rte_phb *phb = NULL;
        enum rte_meter_color pre_meter, enum rte_meter_color post_meter, enum rte_phb_action action)
 {
        struct rte_phb *phb = NULL;

-       
+

        /* User argument checking */
        if (phb_table == NULL) {
                return -1;
        }
        /* User argument checking */
        if (phb_table == NULL) {
                return -1;
        }

-       
+

        if ((pre_meter > e_RTE_METER_RED) || (post_meter > e_RTE_METER_RED) || (pre_meter > post_meter)) {
                return -2;
        }
        if ((pre_meter > e_RTE_METER_RED) || (post_meter > e_RTE_METER_RED) || (pre_meter > post_meter)) {
                return -2;
        }

-       
+

        /* Set action in PHB table entry */
        phb = &phb_table[phb_table_index];
        phb->actions[pre_meter][post_meter] = action;
        /* Set action in PHB table entry */
        phb = &phb_table[phb_table_index];
        phb->actions[pre_meter][post_meter] = action;

-       
-       
+
+

        return 0;
 }
        return 0;
 }

diff --git a/examples/qos_meter/rte_policer.h b/examples/qos_meter/rte_policer.h
index bca65a5..d2bcafb 100644 (file)
--- a/examples/qos_meter/rte_policer.h
+++ b/examples/qos_meter/rte_policer.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -49,7 +49,7 @@ struct rte_phb {
 };
 
 int
 };
 
 int

-rte_phb_config(struct rte_phb *phb_table, uint32_t phb_table_index, 
+rte_phb_config(struct rte_phb *phb_table, uint32_t phb_table_index,

        enum rte_meter_color pre_meter, enum rte_meter_color post_meter, enum rte_phb_action action);
 
 static inline enum rte_phb_action
        enum rte_meter_color pre_meter, enum rte_meter_color post_meter, enum rte_phb_action action);
 
 static inline enum rte_phb_action


@@ -57,7 +57,7 @@ policer_run(struct rte_phb *phb_table, uint32_t phb_table_index, enum rte_meter_
 {
        struct rte_phb *phb = &phb_table[phb_table_index];
        enum rte_phb_action action = phb->actions[pre_meter][post_meter];
 {
        struct rte_phb *phb = &phb_table[phb_table_index];
        enum rte_phb_action action = phb->actions[pre_meter][post_meter];

-       
+

        return action;
 }
 
        return action;
 }
 

diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile
index 1ce1f10..48713f9 100755 (executable)
--- a/examples/qos_sched/Makefile
+++ b/examples/qos_sched/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/qos_sched/app_thread.c b/examples/qos_sched/app_thread.c
index 6c3640e..7501147 100755 (executable)
--- a/examples/qos_sched/app_thread.c
+++ b/examples/qos_sched/app_thread.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
index 97383fb..99469fe 100755 (executable)
--- a/examples/qos_sched/args.c
+++ b/examples/qos_sched/args.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -69,7 +69,7 @@ static const char usage[] =
        "                                                                               \n"
        "Application optional parameters:                                               \n"
         "    --i     : run in interactive mode (default value is %u)                    \n"
        "                                                                               \n"
        "Application optional parameters:                                               \n"
         "    --i     : run in interactive mode (default value is %u)                    \n"

-       "    --mst I : master core index (default value is %u)                          \n" 
+       "    --mst I : master core index (default value is %u)                          \n"

        "    --rsz \"A, B, C\" :   Ring sizes                                           \n"
        "           A = Size (in number of buffer descriptors) of each of the NIC RX    \n"
        "               rings read by the I/O RX lcores (default value is %u)           \n"
        "    --rsz \"A, B, C\" :   Ring sizes                                           \n"
        "           A = Size (in number of buffer descriptors) of each of the NIC RX    \n"
        "               rings read by the I/O RX lcores (default value is %u)           \n"


@@ -178,7 +178,7 @@ app_parse_opt_vals(const char *conf_str, char separator, uint32_t n_vals, uint32
        for(i = 0; i < n_tokens; i++) {
                opt_vals[i] = (uint32_t)atol(tokens[i]);
        }
        for(i = 0; i < n_tokens; i++) {
                opt_vals[i] = (uint32_t)atol(tokens[i]);
        }

-       
+

        free(string);
 
        return n_tokens;
        free(string);
 
        return n_tokens;


@@ -191,7 +191,7 @@ app_parse_ring_conf(const char *conf_str)
        uint32_t vals[3];
 
        ret = app_parse_opt_vals(conf_str, ',', 3, vals);
        uint32_t vals[3];
 
        ret = app_parse_opt_vals(conf_str, ',', 3, vals);

-       if (ret != 3)   
+       if (ret != 3)

                return ret;
 
        ring_conf.rx_size = vals[0];
                return ret;
 
        ring_conf.rx_size = vals[0];


@@ -208,7 +208,7 @@ app_parse_rth_conf(const char *conf_str)
        uint32_t vals[3];
 
        ret = app_parse_opt_vals(conf_str, ',', 3, vals);
        uint32_t vals[3];
 
        ret = app_parse_opt_vals(conf_str, ',', 3, vals);

-       if (ret != 3)   
+       if (ret != 3)

                return ret;
 
        rx_thresh.pthresh = (uint8_t)vals[0];
                return ret;
 
        rx_thresh.pthresh = (uint8_t)vals[0];


@@ -225,7 +225,7 @@ app_parse_tth_conf(const char *conf_str)
        uint32_t vals[3];
 
        ret = app_parse_opt_vals(conf_str, ',', 3, vals);
        uint32_t vals[3];
 
        ret = app_parse_opt_vals(conf_str, ',', 3, vals);

-       if (ret != 3)   
+       if (ret != 3)

                return ret;
 
        tx_thresh.pthresh = (uint8_t)vals[0];
                return ret;
 
        tx_thresh.pthresh = (uint8_t)vals[0];


@@ -320,7 +320,7 @@ app_parse_burst_conf(const char *conf_str)
        return 0;
 }
 
        return 0;
 }
 

-/* 
+/*

  * Parses the argument given in the command line of the application,
  * calculates mask for used cores and initializes EAL with calculated core mask
  */
  * Parses the argument given in the command line of the application,
  * calculates mask for used cores and initializes EAL with calculated core mask
  */

diff --git a/examples/qos_sched/cfg_file.c b/examples/qos_sched/cfg_file.c
index e8c481e..f726458 100755 (executable)
--- a/examples/qos_sched/cfg_file.c
+++ b/examples/qos_sched/cfg_file.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -333,7 +333,7 @@ cfg_load_port(struct cfg_file *cfg, struct rte_sched_port_params *port_params)
        entry = cfg_get_entry(cfg, "port", "number of subports per port");
        if (entry)
                port_params->n_subports_per_port = (uint32_t)atoi(entry);
        entry = cfg_get_entry(cfg, "port", "number of subports per port");
        if (entry)
                port_params->n_subports_per_port = (uint32_t)atoi(entry);

-       
+

        entry = cfg_get_entry(cfg, "port", "number of pipes per subport");
        if (entry)
                port_params->n_pipes_per_subport = (uint32_t)atoi(entry);
        entry = cfg_get_entry(cfg, "port", "number of pipes per subport");
        if (entry)
                port_params->n_pipes_per_subport = (uint32_t)atoi(entry);


@@ -341,7 +341,7 @@ cfg_load_port(struct cfg_file *cfg, struct rte_sched_port_params *port_params)
        entry = cfg_get_entry(cfg, "port", "queue sizes");
        if (entry) {
                char *next;
        entry = cfg_get_entry(cfg, "port", "queue sizes");
        if (entry) {
                char *next;

-               
+

                for(j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j++) {
                        port_params->qsize[j] = (uint16_t)strtol(entry, &next, 10);
                        if (next == NULL)
                for(j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j++) {
                        port_params->qsize[j] = (uint16_t)strtol(entry, &next, 10);
                        if (next == NULL)


@@ -420,7 +420,7 @@ cfg_load_port(struct cfg_file *cfg, struct rte_sched_port_params *port_params)
                }
        }
 #endif /* RTE_SCHED_RED */
                }
        }
 #endif /* RTE_SCHED_RED */

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -457,15 +457,15 @@ cfg_load_pipe(struct cfg_file *cfg, struct rte_sched_pipe_params *pipe_params)
                entry = cfg_get_entry(cfg, pipe_name, "tc 0 rate");
                if (entry)
                        pipe_params[j].tc_rate[0] = (uint32_t)atoi(entry);
                entry = cfg_get_entry(cfg, pipe_name, "tc 0 rate");
                if (entry)
                        pipe_params[j].tc_rate[0] = (uint32_t)atoi(entry);

-                       
+

                entry = cfg_get_entry(cfg, pipe_name, "tc 1 rate");
                if (entry)
                        pipe_params[j].tc_rate[1] = (uint32_t)atoi(entry);
                entry = cfg_get_entry(cfg, pipe_name, "tc 1 rate");
                if (entry)
                        pipe_params[j].tc_rate[1] = (uint32_t)atoi(entry);

-                       
+

                entry = cfg_get_entry(cfg, pipe_name, "tc 2 rate");
                if (entry)
                        pipe_params[j].tc_rate[2] = (uint32_t)atoi(entry);
                entry = cfg_get_entry(cfg, pipe_name, "tc 2 rate");
                if (entry)
                        pipe_params[j].tc_rate[2] = (uint32_t)atoi(entry);

-                       
+

                entry = cfg_get_entry(cfg, pipe_name, "tc 3 rate");
                if (entry)
                        pipe_params[j].tc_rate[3] = (uint32_t)atoi(entry);
                entry = cfg_get_entry(cfg, pipe_name, "tc 3 rate");
                if (entry)
                        pipe_params[j].tc_rate[3] = (uint32_t)atoi(entry);

diff --git a/examples/qos_sched/cfg_file.h b/examples/qos_sched/cfg_file.h
index eaaeb0a..3a8fc66 100755 (executable)
--- a/examples/qos_sched/cfg_file.h
+++ b/examples/qos_sched/cfg_file.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -64,7 +64,7 @@ int cfg_load_pipe(struct cfg_file *cfg, struct rte_sched_pipe_params *pipe);
 int cfg_load_subport(struct cfg_file *cfg, struct rte_sched_subport_params *subport);
 
 
 int cfg_load_subport(struct cfg_file *cfg, struct rte_sched_subport_params *subport);
 
 

-/* reads a config file from disk and returns a handle to the config 
+/* reads a config file from disk and returns a handle to the config

  * 'flags' is reserved for future use and must be 0
  */
 struct cfg_file *cfg_load(const char *filename, int flags);
  * 'flags' is reserved for future use and must be 0
  */
 struct cfg_file *cfg_load(const char *filename, int flags);

diff --git a/examples/qos_sched/cmdline.c b/examples/qos_sched/cmdline.c
index 1957bcd..f79d524 100644 (file)
--- a/examples/qos_sched/cmdline.c
+++ b/examples/qos_sched/cmdline.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index e021815..9d8c8b0 100755 (executable)
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -138,7 +138,7 @@ app_init_port(uint8_t portid, struct rte_mempool *mp)
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d, port=%hu\n",
                ret, portid);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d, port=%hu\n",
                ret, portid);

-       
+

        /* init one TX queue */
        fflush(stdout);
        ret = rte_eth_tx_queue_setup(portid, 0,
        /* init one TX queue */
        fflush(stdout);
        ret = rte_eth_tx_queue_setup(portid, 0,


@@ -167,10 +167,10 @@ app_init_port(uint8_t portid, struct rte_mempool *mp)
                printf(" Link Down\n");
        }
        rte_eth_promiscuous_enable(portid);
                printf(" Link Down\n");
        }
        rte_eth_promiscuous_enable(portid);

-       
+

        /* mark port as initialized */
        app_inited_port_mask |= 1u << portid;
        /* mark port as initialized */
        app_inited_port_mask |= 1u << portid;

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -189,12 +189,12 @@ static struct rte_sched_pipe_params pipe_profiles[RTE_SCHED_PIPE_PROFILES_PER_PO
                .tb_rate = 305175,
                .tb_size = 1000000,
 
                .tb_rate = 305175,
                .tb_size = 1000000,
 

-               .tc_rate = {305175, 305175, 305175, 305175}, 
+               .tc_rate = {305175, 305175, 305175, 305175},

                .tc_period = 40,
 #ifdef RTE_SCHED_SUBPORT_TC_OV
                .tc_ov_weight = 1,
 #endif
                .tc_period = 40,
 #ifdef RTE_SCHED_SUBPORT_TC_OV
                .tc_ov_weight = 1,
 #endif

-               
+

                .wrr_weights = {1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1},
        },
 };
                .wrr_weights = {1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1},
        },
 };


@@ -263,7 +263,7 @@ app_init_sched_port(uint32_t portid, uint32_t socketid)
                        rte_exit(EXIT_FAILURE, "Unable to config sched subport %u, err=%d\n",
                                        subport, err);
                }
                        rte_exit(EXIT_FAILURE, "Unable to config sched subport %u, err=%d\n",
                                        subport, err);
                }

-       
+

                for (pipe = 0; pipe < port_params.n_pipes_per_subport; pipe ++) {
                        if (app_pipe_to_profile[subport][pipe] != -1) {
                                err = rte_sched_pipe_config(port, subport, pipe,
                for (pipe = 0; pipe < port_params.n_pipes_per_subport; pipe ++) {
                        if (app_pipe_to_profile[subport][pipe] != -1) {
                                err = rte_sched_pipe_config(port, subport, pipe,


@@ -276,7 +276,7 @@ app_init_sched_port(uint32_t portid, uint32_t socketid)
                        }
                }
        }
                        }
                }
        }

-       
+

        return port;
 }
 
        return port;
 }
 


@@ -285,7 +285,7 @@ app_load_cfg_profile(const char *profile)
 {
        if (profile == NULL)
                return 0;
 {
        if (profile == NULL)
                return 0;

-       
+

        struct cfg_file *cfg_file = cfg_load(profile, 0);
        if (cfg_file == NULL)
                rte_exit(EXIT_FAILURE, "Cannot load configuration profile %s\n", profile);
        struct cfg_file *cfg_file = cfg_load(profile, 0);
        if (cfg_file == NULL)
                rte_exit(EXIT_FAILURE, "Cannot load configuration profile %s\n", profile);


@@ -314,7 +314,7 @@ int app_init(void)
        /* load configuration profile */
        if (app_load_cfg_profile(cfg_profile) != 0)
                rte_exit(EXIT_FAILURE, "Invalid configuration profile\n");
        /* load configuration profile */
        if (app_load_cfg_profile(cfg_profile) != 0)
                rte_exit(EXIT_FAILURE, "Invalid configuration profile\n");

-       
+

        /* Initialize each active flow */
        for(i = 0; i < nb_pfc; i++) {
                uint32_t socket = rte_lcore_to_socket_id(qos_conf[i].rx_core);
        /* Initialize each active flow */
        for(i = 0; i < nb_pfc; i++) {
                uint32_t socket = rte_lcore_to_socket_id(qos_conf[i].rx_core);


@@ -351,13 +351,13 @@ int app_init(void)
 
                app_init_port(qos_conf[i].rx_port, qos_conf[i].mbuf_pool);
                app_init_port(qos_conf[i].tx_port, qos_conf[i].mbuf_pool);
 
                app_init_port(qos_conf[i].rx_port, qos_conf[i].mbuf_pool);
                app_init_port(qos_conf[i].tx_port, qos_conf[i].mbuf_pool);

-               
+

                qos_conf[i].sched_port = app_init_sched_port(qos_conf[i].tx_port, socket);
        }
 
        RTE_LOG(INFO, APP, "time stamp clock running at %" PRIu64 " Hz\n",
                         rte_get_timer_hz());
                qos_conf[i].sched_port = app_init_sched_port(qos_conf[i].tx_port, socket);
        }
 
        RTE_LOG(INFO, APP, "time stamp clock running at %" PRIu64 " Hz\n",
                         rte_get_timer_hz());

-       
+

        RTE_LOG(INFO, APP, "Ring sizes: NIC RX = %u, Mempool = %d SW queue = %u,"
                         "NIC TX = %u\n", ring_conf.rx_size, mp_size, ring_conf.ring_size,
                         ring_conf.tx_size);
        RTE_LOG(INFO, APP, "Ring sizes: NIC RX = %u, Mempool = %d SW queue = %u,"
                         "NIC TX = %u\n", ring_conf.rx_size, mp_size, ring_conf.ring_size,
                         ring_conf.tx_size);


@@ -365,7 +365,7 @@ int app_init(void)
        RTE_LOG(INFO, APP, "Burst sizes: RX read = %hu, RX write = %hu,\n"
                                                  "             Worker read/QoS enqueue = %hu,\n"
                                                  "             QoS dequeue = %hu, Worker write = %hu\n",
        RTE_LOG(INFO, APP, "Burst sizes: RX read = %hu, RX write = %hu,\n"
                                                  "             Worker read/QoS enqueue = %hu,\n"
                                                  "             QoS dequeue = %hu, Worker write = %hu\n",

-               burst_conf.rx_burst, burst_conf.ring_burst, burst_conf.ring_burst, 
+               burst_conf.rx_burst, burst_conf.ring_burst, burst_conf.ring_burst,

                burst_conf.qos_dequeue, burst_conf.tx_burst);
 
        RTE_LOG(INFO, APP, "NIC thresholds RX (p = %hhu, h = %hhu, w = %hhu),"
                burst_conf.qos_dequeue, burst_conf.tx_burst);
 
        RTE_LOG(INFO, APP, "NIC thresholds RX (p = %hhu, h = %hhu, w = %hhu),"

diff --git a/examples/qos_sched/main.c b/examples/qos_sched/main.c
index ed4879c..2d9b077 100755 (executable)
--- a/examples/qos_sched/main.c
+++ b/examples/qos_sched/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/qos_sched/main.h b/examples/qos_sched/main.h
index 0f1f167..f3b3956 100755 (executable)
--- a/examples/qos_sched/main.h
+++ b/examples/qos_sched/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/qos_sched/profile.cfg b/examples/qos_sched/profile.cfg
index 0368537..10180c2 100644 (file)
--- a/examples/qos_sched/profile.cfg
+++ b/examples/qos_sched/profile.cfg
@@ -1,12 +1,12 @@
 ;   BSD LICENSE
 ;   BSD LICENSE

-; 
+;

 ;   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 ;   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
 ;   are met:
 ;   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
 ;     * 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


@@ -16,7 +16,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.
 ;     * 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
 ;   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


@@ -31,7 +31,7 @@
 
 ; This file enables the following hierarchical scheduler configuration for each
 ; 10GbE output port:
 
 ; This file enables the following hierarchical scheduler configuration for each
 ; 10GbE output port:

-;      * Single subport (subport 0): 
+;      * Single subport (subport 0):

 ;              - Subport rate set to 100% of port rate
 ;              - Each of the 4 traffic classes has rate set to 100% of port rate
 ;      * 4K pipes per subport 0 (pipes 0 .. 4095) with identical configuration:
 ;              - Subport rate set to 100% of port rate
 ;              - Each of the 4 traffic classes has rate set to 100% of port rate
 ;      * 4K pipes per subport 0 (pipes 0 .. 4095) with identical configuration:


@@ -42,7 +42,7 @@
 ;
 ; For more details, please refer to chapter "Quality of Service (QoS) Framework"
 ; of Intel Data Plane Development Kit (Intel DPDK) Programmer's Guide.
 ;
 ; For more details, please refer to chapter "Quality of Service (QoS) Framework"
 ; of Intel Data Plane Development Kit (Intel DPDK) Programmer's Guide.

- 
+

 ; Port configuration
 [port]
 frame overhead = 24
 ; Port configuration
 [port]
 frame overhead = 24

diff --git a/examples/qos_sched/profile_ov.cfg b/examples/qos_sched/profile_ov.cfg
index 4672e42..33000df 100644 (file)
--- a/examples/qos_sched/profile_ov.cfg
+++ b/examples/qos_sched/profile_ov.cfg
@@ -1,12 +1,12 @@
 ;   BSD LICENSE
 ;   BSD LICENSE

-; 
+;

 ;   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 ;   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
 ;   are met:
 ;   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
 ;     * 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


@@ -16,7 +16,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.
 ;     * 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
 ;   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


@@ -28,7 +28,7 @@
 ;   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.
 ;   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.

- 
+

 ; Port configuration
 [port]
 frame overhead = 24
 ; Port configuration
 [port]
 frame overhead = 24

diff --git a/examples/qos_sched/stats.c b/examples/qos_sched/stats.c
index c427424..b4db7b5 100644 (file)
--- a/examples/qos_sched/stats.c
+++ b/examples/qos_sched/stats.c
@@ -1,13 +1,13 @@
 /*-
  *  *   BSD LICENSE
 /*-
  *  *   BSD LICENSE

- *  * 
+ *  *

  *  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *  *   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
  *  *   are met:
  *  *   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
  *  *     * 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.
  *  *     * 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
  *  *   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

diff --git a/examples/quota_watermark/Makefile b/examples/quota_watermark/Makefile
index 30b674b..17fe473 100644 (file)
--- a/examples/quota_watermark/Makefile
+++ b/examples/quota_watermark/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/quota_watermark/include/conf.h b/examples/quota_watermark/include/conf.h
index 5ecfcee..8d95aaa 100644 (file)
--- a/examples/quota_watermark/include/conf.h
+++ b/examples/quota_watermark/include/conf.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/quota_watermark/qw/Makefile b/examples/quota_watermark/qw/Makefile
index 3ec7df2..fac9328 100644 (file)
--- a/examples/quota_watermark/qw/Makefile
+++ b/examples/quota_watermark/qw/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/quota_watermark/qw/args.c b/examples/quota_watermark/qw/args.c
index 3b19410..408b54d 100644 (file)
--- a/examples/quota_watermark/qw/args.c
+++ b/examples/quota_watermark/qw/args.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/quota_watermark/qw/args.h b/examples/quota_watermark/qw/args.h
index e24516c..d6d4fb6 100644 (file)
--- a/examples/quota_watermark/qw/args.h
+++ b/examples/quota_watermark/qw/args.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/quota_watermark/qw/init.c b/examples/quota_watermark/qw/init.c
index 44455b2..d163d7f 100644 (file)
--- a/examples/quota_watermark/qw/init.c
+++ b/examples/quota_watermark/qw/init.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/quota_watermark/qw/init.h b/examples/quota_watermark/qw/init.h
index 6e38197..9b67138 100644 (file)
--- a/examples/quota_watermark/qw/init.h
+++ b/examples/quota_watermark/qw/init.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/quota_watermark/qw/main.c b/examples/quota_watermark/qw/main.c
index 21e0fc7..579698b 100644 (file)
--- a/examples/quota_watermark/qw/main.c
+++ b/examples/quota_watermark/qw/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -358,7 +358,7 @@ MAIN(int argc, char **argv)
             for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++)
                 if (is_bit_set(port_id, portmask))
                     init_ring(lcore_id, port_id);
             for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++)
                 if (is_bit_set(port_id, portmask))
                     init_ring(lcore_id, port_id);

-            
+

             /* typecast is a workaround for GCC 4.3 bug */
             rte_eal_remote_launch((int (*)(void *))pipeline_stage, NULL, lcore_id);
         }
             /* typecast is a workaround for GCC 4.3 bug */
             rte_eal_remote_launch((int (*)(void *))pipeline_stage, NULL, lcore_id);
         }


@@ -367,7 +367,7 @@ MAIN(int argc, char **argv)
     /* Start send_stage() on the last slave core */
     /* typecast is a workaround for GCC 4.3 bug */
     rte_eal_remote_launch((int (*)(void *))send_stage, NULL, last_lcore_id);
     /* Start send_stage() on the last slave core */
     /* typecast is a workaround for GCC 4.3 bug */
     rte_eal_remote_launch((int (*)(void *))send_stage, NULL, last_lcore_id);

-    
+

     /* Start receive_stage() on the master core */
     receive_stage(NULL);
 
     /* Start receive_stage() on the master core */
     receive_stage(NULL);
 

diff --git a/examples/quota_watermark/qw/main.h b/examples/quota_watermark/qw/main.h
index da366b0..3b78324 100644 (file)
--- a/examples/quota_watermark/qw/main.h
+++ b/examples/quota_watermark/qw/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/quota_watermark/qwctl/Makefile b/examples/quota_watermark/qwctl/Makefile
index b3ba6ee..1ca2f1e 100644 (file)
--- a/examples/quota_watermark/qwctl/Makefile
+++ b/examples/quota_watermark/qwctl/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/quota_watermark/qwctl/commands.c b/examples/quota_watermark/qwctl/commands.c
index c07ac2d..5348dd3 100644 (file)
--- a/examples/quota_watermark/qwctl/commands.c
+++ b/examples/quota_watermark/qwctl/commands.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/quota_watermark/qwctl/commands.h b/examples/quota_watermark/qwctl/commands.h
index a8574e5..c010941 100644 (file)
--- a/examples/quota_watermark/qwctl/commands.h
+++ b/examples/quota_watermark/qwctl/commands.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/quota_watermark/qwctl/qwctl.c b/examples/quota_watermark/qwctl/qwctl.c
index e516d3b..8bf9e33 100644 (file)
--- a/examples/quota_watermark/qwctl/qwctl.c
+++ b/examples/quota_watermark/qwctl/qwctl.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/quota_watermark/qwctl/qwctl.h b/examples/quota_watermark/qwctl/qwctl.h
index d24e5b6..4209307 100644 (file)
--- a/examples/quota_watermark/qwctl/qwctl.h
+++ b/examples/quota_watermark/qwctl/qwctl.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/timer/Makefile b/examples/timer/Makefile
index 30f7192..af12b7b 100644 (file)
--- a/examples/timer/Makefile
+++ b/examples/timer/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/timer/main.c b/examples/timer/main.c
index 1204857..a5ff015 100644 (file)
--- a/examples/timer/main.c
+++ b/examples/timer/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/timer/main.h b/examples/timer/main.h
index ce7e697..f54938b 100644 (file)
--- a/examples/timer/main.h
+++ b/examples/timer/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile
index 83b173b..47e054d 100644 (file)
--- a/examples/vhost/Makefile
+++ b/examples/vhost/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/vhost/eventfd_link/Makefile b/examples/vhost/eventfd_link/Makefile
index 5fe7297..fc3927b 100644 (file)
--- a/examples/vhost/eventfd_link/Makefile
+++ b/examples/vhost/eventfd_link/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -28,7 +28,7 @@
 #   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.
 #   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.

- 
+

 obj-m += eventfd_link.o
 
 
 obj-m += eventfd_link.o
 
 

diff --git a/examples/vhost/eventfd_link/eventfd_link.c b/examples/vhost/eventfd_link/eventfd_link.c
index f7975fa..fc0653a 100644 (file)
--- a/examples/vhost/eventfd_link/eventfd_link.c
+++ b/examples/vhost/eventfd_link/eventfd_link.c
@@ -1,23 +1,23 @@
 /*-
  *  * GPL LICENSE SUMMARY
 /*-
  *  * GPL LICENSE SUMMARY

- *  * 
+ *  *

  *  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- *  * 
+ *  *

  *  *   This program is free software; you can redistribute it and/or modify
  *  *   it under the terms of version 2 of the GNU General Public License as
  *  *   published by the Free Software Foundation.
  *  *   This program is free software; you can redistribute it and/or modify
  *  *   it under the terms of version 2 of the GNU General Public License as
  *  *   published by the Free Software Foundation.

- *  * 
+ *  *

  *  *   This program is distributed in the hope that it will be useful, but
  *  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  *   General Public License for more details.
  *  *   This program is distributed in the hope that it will be useful, but
  *  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  *   General Public License for more details.

- *  * 
+ *  *

  *  *   You should have received a copy of the GNU General Public License
  *  *   along with this program; if not, write to the Free Software
  *  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *  *   The full GNU General Public License is included in this distribution
  *  *   in the file called LICENSE.GPL.
  *  *   You should have received a copy of the GNU General Public License
  *  *   along with this program; if not, write to the Free Software
  *  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *  *   The full GNU General Public License is included in this distribution
  *  *   in the file called LICENSE.GPL.

- *  * 
+ *  *

  *  *   Contact Information:
  *  *   Intel Corporation
  *   */
  *  *   Contact Information:
  *  *   Intel Corporation
  *   */

diff --git a/examples/vhost/eventfd_link/eventfd_link.h b/examples/vhost/eventfd_link/eventfd_link.h
index f33c2f8..a32a8dd 100644 (file)
--- a/examples/vhost/eventfd_link/eventfd_link.h
+++ b/examples/vhost/eventfd_link/eventfd_link.h
@@ -1,38 +1,38 @@
 /*-
  *  * This file is provided under a dual BSD/GPLv2 license.  When using or
  *  *   redistributing this file, you may do so under either license.
 /*-
  *  * This file is provided under a dual BSD/GPLv2 license.  When using or
  *  *   redistributing this file, you may do so under either license.

- *  * 
+ *  *

  *  *   GPL LICENSE SUMMARY
  *  *   GPL LICENSE SUMMARY

- *  * 
+ *  *

  *  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- *  * 
+ *  *

  *  *   This program is free software; you can redistribute it and/or modify
  *  *   it under the terms of version 2 of the GNU General Public License as
  *  *   published by the Free Software Foundation.
  *  *   This program is free software; you can redistribute it and/or modify
  *  *   it under the terms of version 2 of the GNU General Public License as
  *  *   published by the Free Software Foundation.

- *  * 
+ *  *

  *  *   This program is distributed in the hope that it will be useful, but
  *  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  *   General Public License for more details.
  *  *   This program is distributed in the hope that it will be useful, but
  *  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  *   General Public License for more details.

- *  * 
+ *  *

  *  *   You should have received a copy of the GNU General Public License
  *  *   along with this program; if not, write to the Free Software
  *  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *  *   The full GNU General Public License is included in this distribution
  *  *   in the file called LICENSE.GPL.
  *  *   You should have received a copy of the GNU General Public License
  *  *   along with this program; if not, write to the Free Software
  *  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *  *   The full GNU General Public License is included in this distribution
  *  *   in the file called LICENSE.GPL.

- *  * 
+ *  *

  *  *   Contact Information:
  *  *   Intel Corporation
  *  *   Contact Information:
  *  *   Intel Corporation

- *  * 
+ *  *

  *  *   BSD LICENSE
  *  *   BSD LICENSE

- *  * 
+ *  *

  *  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *  *   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
  *  *   are met:
  *  *   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
  *  *     * 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


@@ -42,7 +42,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.
  *  *     * 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
  *  *   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


@@ -54,7 +54,7 @@
  *  *   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.
  *  *   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.

- *  * 
+ *  *

  *   */
 
 #ifndef _EVENTFD_LINK_H_
  *   */
 
 #ifndef _EVENTFD_LINK_H_

diff --git a/examples/vhost/libvirt/qemu-wrap.py b/examples/vhost/libvirt/qemu-wrap.py
index e073b7c..e2d68a0 100755 (executable)
--- a/examples/vhost/libvirt/qemu-wrap.py
+++ b/examples/vhost/libvirt/qemu-wrap.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 #/*
 # *   BSD LICENSE
 #!/usr/bin/python
 #/*
 # *   BSD LICENSE

-# * 
+# *

 # *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 # *   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
 # *   are met:
 # *   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
 # *     * 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


@@ -18,7 +18,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.
 # *     * 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
 # *   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


@@ -33,23 +33,23 @@
 # */
 
 #####################################################################
 # */
 
 #####################################################################

-# This script is designed to modify the call to the QEMU emulator 
-# to support userspace vhost when starting a guest machine through 
-# libvirt with vhost enabled. The steps to enable this are as follows 
+# This script is designed to modify the call to the QEMU emulator
+# to support userspace vhost when starting a guest machine through
+# libvirt with vhost enabled. The steps to enable this are as follows

 # and should be run as root:
 #
 # 1. Place this script in a libvirtd's binary search PATH ($PATH)
 # and should be run as root:
 #
 # 1. Place this script in a libvirtd's binary search PATH ($PATH)

-#    A good location would be in the same directory that the QEMU 
+#    A good location would be in the same directory that the QEMU

 #    binary is located
 #    binary is located

-#   
-# 2. Ensure that the script has the same owner/group and file 
+#
+# 2. Ensure that the script has the same owner/group and file

 #    permissions as the QEMU binary
 #
 # 3. Update the VM xml file using "virsh edit VM.xml"
 #
 #    3.a) Set the VM to use the launch script
 #
 #    permissions as the QEMU binary
 #
 # 3. Update the VM xml file using "virsh edit VM.xml"
 #
 #    3.a) Set the VM to use the launch script
 #

-#      Set the emulator path contained in the 
+#      Set the emulator path contained in the

 #              <emulator><emulator/> tags
 #
 #      e.g replace <emulator>/usr/bin/qemu-kvm<emulator/>
 #              <emulator><emulator/> tags
 #
 #      e.g replace <emulator>/usr/bin/qemu-kvm<emulator/>


@@ -62,9 +62,9 @@
 #              <driver name="vhost"/>
 #              <interface/>
 #
 #              <driver name="vhost"/>
 #              <interface/>
 #

-# 4. Enable libvirt to access our userpace device file by adding it to 
+# 4. Enable libvirt to access our userpace device file by adding it to

 #    controllers cgroup for libvirtd using the following steps
 #    controllers cgroup for libvirtd using the following steps

-#    
+#

 #   4.a) In /etc/libvirt/qemu.conf add/edit the following lines:
 #         1) cgroup_controllers = [ ... "devices", ... ]
 #                2) clear_emulator_capabilities = 0
 #   4.a) In /etc/libvirt/qemu.conf add/edit the following lines:
 #         1) cgroup_controllers = [ ... "devices", ... ]
 #                2) clear_emulator_capabilities = 0


@@ -80,41 +80,41 @@
 #
 #   4.b) Disable SELinux or set to permissive mode
 #
 #
 #   4.b) Disable SELinux or set to permissive mode
 #

-#   4.c) Mount cgroup device controller 
+#   4.c) Mount cgroup device controller

 #        "mkdir /dev/cgroup"
 #        "mount -t cgroup none /dev/cgroup -o devices"
 #
 #        "mkdir /dev/cgroup"
 #        "mount -t cgroup none /dev/cgroup -o devices"
 #

-#   4.d) Set hugetlbfs_mount variable - ( Optional ) 
-#        VMs using userspace vhost must use hugepage backed 
+#   4.d) Set hugetlbfs_mount variable - ( Optional )
+#        VMs using userspace vhost must use hugepage backed

 #        memory. This can be enabled in the libvirt XML
 #        memory. This can be enabled in the libvirt XML

-#        config by adding a memory backing section to the 
+#        config by adding a memory backing section to the

 #        XML config e.g.
 #             <memoryBacking>
 #             <hugepages/>
 #             </memoryBacking>
 #        This memory backing section should be added after the
 #        <memory> and <currentMemory> sections. This will add
 #        XML config e.g.
 #             <memoryBacking>
 #             <hugepages/>
 #             </memoryBacking>
 #        This memory backing section should be added after the
 #        <memory> and <currentMemory> sections. This will add

-#        flags "-mem-prealloc -mem-path <path>" to the QEMU 
-#        command line. The hugetlbfs_mount variable can be used 
+#        flags "-mem-prealloc -mem-path <path>" to the QEMU
+#        command line. The hugetlbfs_mount variable can be used

 #        to override the default <path> passed through by libvirt.
 #        to override the default <path> passed through by libvirt.

-# 
-#        if "-mem-prealloc" or "-mem-path <path>" are not passed 
+#
+#        if "-mem-prealloc" or "-mem-path <path>" are not passed

 #        through and a vhost device is detected then these options will
 #        be automatically added by this script. This script will detect
 #        through and a vhost device is detected then these options will
 #        be automatically added by this script. This script will detect

-#        the system hugetlbfs mount point to be used for <path>. The 
-#        default <path> for this script can be overidden by the 
+#        the system hugetlbfs mount point to be used for <path>. The
+#        default <path> for this script can be overidden by the

 #        hugetlbfs_dir variable in the configuration section of this script.
 #        hugetlbfs_dir variable in the configuration section of this script.

-#        
+#

 #
 #   4.e) Restart the libvirtd system process
 #        e.g. on Fedora "systemctl restart libvirtd.service"
 #
 #
 #   4.f) Edit the Configuration Parameters section of this script
 #
 #   4.e) Restart the libvirtd system process
 #        e.g. on Fedora "systemctl restart libvirtd.service"
 #
 #
 #   4.f) Edit the Configuration Parameters section of this script

-#        to point to the correct emulator location and set any 
+#        to point to the correct emulator location and set any

 #        addition options
 #
 #        addition options
 #

-# The script modifies the libvirtd Qemu call by modifying/adding 
+# The script modifies the libvirtd Qemu call by modifying/adding

 # options based on the configuration parameters below.
 # NOTE:
 #     emul_path and us_vhost_path must be set
 # options based on the configuration parameters below.
 # NOTE:
 #     emul_path and us_vhost_path must be set


@@ -125,24 +125,24 @@
 #############################################
 # Configuration Parameters
 #############################################
 #############################################
 # Configuration Parameters
 #############################################

-#Path to QEMU binary 
+#Path to QEMU binary

 emul_path = "/usr/local/bin/qemu-system-x86_64"
 
 #Path to userspace vhost device file
 emul_path = "/usr/local/bin/qemu-system-x86_64"
 
 #Path to userspace vhost device file

-# This filename should match the --dev-basename --dev-index parameters of 
+# This filename should match the --dev-basename --dev-index parameters of

 # the command used to launch the userspace vhost sample application e.g.
 # if the sample app lauch command is:
 #    ./build/vhost-switch ..... --dev-basename usvhost --dev-index 1
 # then this variable should be set to:
 # the command used to launch the userspace vhost sample application e.g.
 # if the sample app lauch command is:
 #    ./build/vhost-switch ..... --dev-basename usvhost --dev-index 1
 # then this variable should be set to:

-#   us_vhost_path = "/dev/usvhost-1" 
-us_vhost_path = "/dev/usvhost-1" 
+#   us_vhost_path = "/dev/usvhost-1"
+us_vhost_path = "/dev/usvhost-1"

 
 #List of additional user defined emulation options. These options will
 
 #List of additional user defined emulation options. These options will

-#be added to all Qemu calls 
+#be added to all Qemu calls

 emul_opts_user = []
 
 #List of additional user defined emulation options for vhost only.
 emul_opts_user = []
 
 #List of additional user defined emulation options for vhost only.

-#These options will only be added to vhost enabled guests 
+#These options will only be added to vhost enabled guests

 emul_opts_user_vhost = []
 
 #For all VHOST enabled VMs, the VM memory is preallocated from hugetlbfs
 emul_opts_user_vhost = []
 
 #For all VHOST enabled VMs, the VM memory is preallocated from hugetlbfs


@@ -160,13 +160,13 @@ hugetlbfs_dir = ""
 # ****** Do Not Modify Below this Line ******
 #############################################
 
 # ****** Do Not Modify Below this Line ******
 #############################################
 

-import sys, os, subprocess 
+import sys, os, subprocess

 
 
 #List of open userspace vhost file descriptors
 fd_list = []
 
 
 
 #List of open userspace vhost file descriptors
 fd_list = []
 

-#additional virtio device flags when using userspace vhost            
+#additional virtio device flags when using userspace vhost

 vhost_flags = [ "csum=off",
                 "gso=off",
                 "guest_tso4=off",
 vhost_flags = [ "csum=off",
                 "gso=off",
                 "guest_tso4=off",


@@ -180,7 +180,7 @@ vhost_flags = [ "csum=off",
 # Note:
 # if multiple hugetlbfs mount points exist
 # then the first one found will be used
 # Note:
 # if multiple hugetlbfs mount points exist
 # then the first one found will be used

-############################################# 
+#############################################

 def find_huge_mount():
 
     if (len(hugetlbfs_dir)):
 def find_huge_mount():
 
     if (len(hugetlbfs_dir)):


@@ -194,7 +194,7 @@ def find_huge_mount():
         while line:
             line_split = line.split(" ")
             if line_split[2] == 'hugetlbfs':
         while line:
             line_split = line.split(" ")
             if line_split[2] == 'hugetlbfs':

-                huge_mount = line_split[1]                
+                huge_mount = line_split[1]

                 break
             line = f.readline()
     else:
                 break
             line = f.readline()
     else:


@@ -204,14 +204,14 @@ def find_huge_mount():
     f.close
     if len(huge_mount) == 0:
         print "Failed to find hugetlbfs mount point"
     f.close
     if len(huge_mount) == 0:
         print "Failed to find hugetlbfs mount point"

-        exit (1)    
+        exit (1)

 
     return huge_mount
 
 
 #############################################
 # Get a userspace Vhost file descriptor
 
     return huge_mount
 
 
 #############################################
 # Get a userspace Vhost file descriptor

-############################################# 
+#############################################

 def get_vhost_fd():
 
     if (os.access(us_vhost_path, os.F_OK)):
 def get_vhost_fd():
 
     if (os.access(us_vhost_path, os.F_OK)):


@@ -219,7 +219,7 @@ def get_vhost_fd():
     else:
         print ("US-Vhost file %s not found" %us_vhost_path)
         exit (1)
     else:
         print ("US-Vhost file %s not found" %us_vhost_path)
         exit (1)

-    
+

     return fd
 
 
     return fd
 
 


@@ -227,23 +227,23 @@ def get_vhost_fd():
 # Check for vhostfd. if found then replace
 # with our own vhost fd and append any vhost
 # flags onto the end
 # Check for vhostfd. if found then replace
 # with our own vhost fd and append any vhost
 # flags onto the end

-############################################# 
+#############################################

 def modify_netdev_arg(arg):
        
     global fd_list
 def modify_netdev_arg(arg):
        
     global fd_list

-    vhost_in_use = 0 
+    vhost_in_use = 0

     s = ''
     new_opts = []
     netdev_opts = arg.split(",")
     s = ''
     new_opts = []
     netdev_opts = arg.split(",")

-    
+

     for opt in netdev_opts:
         #check if vhost is used
         if "vhost" == opt[:5]:
     for opt in netdev_opts:
         #check if vhost is used
         if "vhost" == opt[:5]:

-            vhost_in_use = 1        
+            vhost_in_use = 1

         else:
             new_opts.append(opt)
 
         else:
             new_opts.append(opt)
 

-    #if using vhost append vhost options 
+    #if using vhost append vhost options

     if vhost_in_use == 1:
         #append vhost on option
         new_opts.append('vhost=on')
     if vhost_in_use == 1:
         #append vhost on option
         new_opts.append('vhost=on')


@@ -252,11 +252,11 @@ def modify_netdev_arg(arg):
         new_opts.append('vhostfd=' + str(new_fd))
         fd_list.append(new_fd)
 
         new_opts.append('vhostfd=' + str(new_fd))
         fd_list.append(new_fd)
 

-    #concatenate all options 
+    #concatenate all options

     for opt in new_opts:
         if len(s) > 0:
                        s+=','
     for opt in new_opts:
         if len(s) > 0:
                        s+=','

-        
+

         s+=opt
 
     return s   
         s+=opt
 
     return s   


@@ -268,23 +268,23 @@ def modify_netdev_arg(arg):
 def main():
 
     global fd_list
 def main():
 
     global fd_list

-    global vhost_in_use    
+    global vhost_in_use

     new_args = []
     num_cmd_args = len(sys.argv)
     emul_call = ''
     mem_prealloc_set = 0
     new_args = []
     num_cmd_args = len(sys.argv)
     emul_call = ''
     mem_prealloc_set = 0

-    mem_path_set = 0 
+    mem_path_set = 0

     num = 0;
 
     #parse the parameters
     while (num < num_cmd_args):
         arg = sys.argv[num]
     num = 0;
 
     #parse the parameters
     while (num < num_cmd_args):
         arg = sys.argv[num]

-        
+

                #Check netdev +1 parameter for vhostfd
         if arg == '-netdev':
             num_vhost_devs = len(fd_list)
             new_args.append(arg)
                #Check netdev +1 parameter for vhostfd
         if arg == '-netdev':
             num_vhost_devs = len(fd_list)
             new_args.append(arg)

-            
+

             num+=1
             arg = sys.argv[num]
             mod_arg = modify_netdev_arg(arg)
             num+=1
             arg = sys.argv[num]
             mod_arg = modify_netdev_arg(arg)


@@ -311,13 +311,13 @@ def main():
         elif arg == '-mem-path':
             mem_path_set = 1
             new_args.append(arg)
         elif arg == '-mem-path':
             mem_path_set = 1
             new_args.append(arg)

-    
+

         else:
             new_args.append(arg)
 
         num+=1
 
         else:
             new_args.append(arg)
 
         num+=1
 

-    #Set Qemu binary location 
+    #Set Qemu binary location

     emul_call+=emul_path
     emul_call+=" "
 
     emul_call+=emul_path
     emul_call+=" "
 


@@ -327,14 +327,14 @@ def main():
 
     #Add mempath mem options if using vhost and not already added
     if ((len(fd_list) > 0) and (mem_path_set == 0)):
 
     #Add mempath mem options if using vhost and not already added
     if ((len(fd_list) > 0) and (mem_path_set == 0)):

-        #Detect and add hugetlbfs mount point 
+        #Detect and add hugetlbfs mount point

         mp = find_huge_mount()
         mp = "".join(["-mem-path ", mp])
         emul_call += mp
         mp = find_huge_mount()
         mp = "".join(["-mem-path ", mp])
         emul_call += mp

-        emul_call += " "   
-    
+        emul_call += " "
+

 
 

-    #add user options        
+    #add user options

     for opt in emul_opts_user:
         emul_call += opt
         emul_call += " "
     for opt in emul_opts_user:
         emul_call += opt
         emul_call += " "


@@ -353,7 +353,7 @@ def main():
         emul_call+=str(arg)
         emul_call+= " "
 
         emul_call+=str(arg)
         emul_call+= " "
 

-    #Call QEMU 
+    #Call QEMU

     subprocess.call(emul_call, shell=True)
 
 
     subprocess.call(emul_call, shell=True)
 
 

diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index e911111..118f6e0 100644 (file)
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -67,7 +67,7 @@
                                                        (num_switching_cores*RTE_TEST_TX_DESC_DEFAULT) +\
                                                        (num_switching_cores*MBUF_CACHE_SIZE))
 
                                                        (num_switching_cores*RTE_TEST_TX_DESC_DEFAULT) +\
                                                        (num_switching_cores*MBUF_CACHE_SIZE))
 

-#define MBUF_CACHE_SIZE 128 
+#define MBUF_CACHE_SIZE 128

 #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 
 /*
 #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 
 /*


@@ -116,7 +116,7 @@
 #define ACK_DEV_REMOVAL 0
 
 /* Configurable number of RX/TX ring descriptors */
 #define ACK_DEV_REMOVAL 0
 
 /* Configurable number of RX/TX ring descriptors */

-#define RTE_TEST_RX_DESC_DEFAULT 1024 
+#define RTE_TEST_RX_DESC_DEFAULT 1024

 #define RTE_TEST_TX_DESC_DEFAULT 512
 
 /*
 #define RTE_TEST_TX_DESC_DEFAULT 512
 
 /*


@@ -945,7 +945,7 @@ virtio_dev_rx(struct virtio_net *dev, struct rte_mbuf **pkts, uint32_t count)
                res_base_idx = vq->last_used_idx_res;
                avail_idx = *((volatile uint16_t *)&vq->avail->idx);
 
                res_base_idx = vq->last_used_idx_res;
                avail_idx = *((volatile uint16_t *)&vq->avail->idx);
 

-               free_entries = (avail_idx - res_base_idx);              
+               free_entries = (avail_idx - res_base_idx);

                /* If retry is enabled and the queue is full then we wait and retry to avoid packet loss. */
                if (enable_retry && unlikely(count > free_entries)) {
                        for (retry = 0; retry < burst_rx_retry_num; retry++) {
                /* If retry is enabled and the queue is full then we wait and retry to avoid packet loss. */
                if (enable_retry && unlikely(count > free_entries)) {
                        for (retry = 0; retry < burst_rx_retry_num; retry++) {


@@ -1374,14 +1374,14 @@ virtio_dev_tx(struct virtio_net* dev, struct rte_mempool *mbuf_pool)
 
                /* Discard first buffer as it is the virtio header */
                desc = &vq->desc[desc->next];
 
                /* Discard first buffer as it is the virtio header */
                desc = &vq->desc[desc->next];

-                       
+

                /* Buffer address translation. */
                buff_addr = gpa_to_vva(dev, desc->addr);
                /* Prefetch buffer address. */
                rte_prefetch0((void*)(uintptr_t)buff_addr);
                /* Buffer address translation. */
                buff_addr = gpa_to_vva(dev, desc->addr);
                /* Prefetch buffer address. */
                rte_prefetch0((void*)(uintptr_t)buff_addr);

-               
+

                used_idx = vq->last_used_idx & (vq->size - 1);
                used_idx = vq->last_used_idx & (vq->size - 1);

-               
+

                if (packet_success < (free_entries - 1)) {
                        /* Prefetch descriptor index. */
                        rte_prefetch0(&vq->desc[head[packet_success+1]]);
                if (packet_success < (free_entries - 1)) {
                        /* Prefetch descriptor index. */
                        rte_prefetch0(&vq->desc[head[packet_success+1]]);


@@ -1482,11 +1482,11 @@ switch_worker(__attribute__((unused)) void *arg)
                }
 
                rte_prefetch0(lcore_ll->ll_root_used);
                }
 
                rte_prefetch0(lcore_ll->ll_root_used);

-               /* 
+               /*

                 * Inform the configuration core that we have exited the linked list and that no devices are
                 * in use if requested.
                 */
                 * Inform the configuration core that we have exited the linked list and that no devices are
                 * in use if requested.
                 */

-               if (lcore_ll->dev_removal_flag == REQUEST_DEV_REMOVAL) 
+               if (lcore_ll->dev_removal_flag == REQUEST_DEV_REMOVAL)

                        lcore_ll->dev_removal_flag = ACK_DEV_REMOVAL;
 
                /*
                        lcore_ll->dev_removal_flag = ACK_DEV_REMOVAL;
 
                /*


@@ -2542,8 +2542,8 @@ set_irq_status (struct virtio_net *dev)
 }
 
 /*
 }
 
 /*

- * Remove a device from the specific data core linked list and from the main linked list. Synchonization 
- * occurs through the use of the lcore dev_removal_flag. Device is made volatile here to avoid re-ordering 
+ * Remove a device from the specific data core linked list and from the main linked list. Synchonization
+ * occurs through the use of the lcore dev_removal_flag. Device is made volatile here to avoid re-ordering

  * of dev->remove=1 which can cause an infinite loop in the rte_pause loop.
  */
 static void
  * of dev->remove=1 which can cause an infinite loop in the rte_pause loop.
  */
 static void


@@ -2602,8 +2602,8 @@ destroy_device (volatile struct virtio_net *dev)
        RTE_LCORE_FOREACH_SLAVE(lcore) {
                lcore_info[lcore].lcore_ll->dev_removal_flag = REQUEST_DEV_REMOVAL;
        }
        RTE_LCORE_FOREACH_SLAVE(lcore) {
                lcore_info[lcore].lcore_ll->dev_removal_flag = REQUEST_DEV_REMOVAL;
        }

-       
-       /* 
+
+       /*

         * Once each core has set the dev_removal_flag to ACK_DEV_REMOVAL we can be sure that
         * they can no longer access the device removed from the linked lists and that the devices
         * are no longer in use.
         * Once each core has set the dev_removal_flag to ACK_DEV_REMOVAL we can be sure that
         * they can no longer access the device removed from the linked lists and that the devices
         * are no longer in use.


@@ -2617,10 +2617,10 @@ destroy_device (volatile struct virtio_net *dev)
        /* Add the entries back to the lcore and main free ll.*/
        put_data_ll_free_entry(&lcore_info[ll_lcore_dev_cur->dev->coreid].lcore_ll->ll_root_free, ll_lcore_dev_cur);
        put_data_ll_free_entry(&ll_root_free, ll_main_dev_cur);
        /* Add the entries back to the lcore and main free ll.*/
        put_data_ll_free_entry(&lcore_info[ll_lcore_dev_cur->dev->coreid].lcore_ll->ll_root_free, ll_lcore_dev_cur);
        put_data_ll_free_entry(&ll_root_free, ll_main_dev_cur);

-       
+

        /* Decrement number of device on the lcore. */
        lcore_info[ll_lcore_dev_cur->dev->coreid].lcore_ll->device_num--;
        /* Decrement number of device on the lcore. */
        lcore_info[ll_lcore_dev_cur->dev->coreid].lcore_ll->device_num--;

-       
+

        RTE_LOG(INFO, DATA, "(%"PRIu64") Device has been removed from data core\n", dev->device_fh);
 
        if (zero_copy) {
        RTE_LOG(INFO, DATA, "(%"PRIu64") Device has been removed from data core\n", dev->device_fh);
 
        if (zero_copy) {


@@ -2945,9 +2945,9 @@ MAIN(int argc, char *argv[])
                nb_ports = RTE_MAX_ETHPORTS;
 
        /*
                nb_ports = RTE_MAX_ETHPORTS;
 
        /*

-        * Update the global var NUM_PORTS and global array PORTS
-        * and get value of var VALID_NUM_PORTS according to system ports number
-        */
+        * Update the global var NUM_PORTS and global array PORTS
+        * and get value of var VALID_NUM_PORTS according to system ports number
+        */

        valid_num_ports = check_ports_num(nb_ports);
 
        if ((valid_num_ports ==  0) || (valid_num_ports > MAX_SUP_PORTS)) {
        valid_num_ports = check_ports_num(nb_ports);
 
        if ((valid_num_ports ==  0) || (valid_num_ports > MAX_SUP_PORTS)) {

diff --git a/examples/vhost/main.h b/examples/vhost/main.h
index 45db454..e973b77 100644 (file)
--- a/examples/vhost/main.h
+++ b/examples/vhost/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/vhost/vhost-net-cdev.c b/examples/vhost/vhost-net-cdev.c
index 4cf3c56..94539fc 100644 (file)
--- a/examples/vhost/vhost-net-cdev.c
+++ b/examples/vhost/vhost-net-cdev.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/vhost/vhost-net-cdev.h b/examples/vhost/vhost-net-cdev.h
index 7f16b6d..575daa9 100644 (file)
--- a/examples/vhost/vhost-net-cdev.h
+++ b/examples/vhost/vhost-net-cdev.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/vhost/virtio-net.c b/examples/vhost/virtio-net.c
index 8a3e333..74b8f03 100644 (file)
--- a/examples/vhost/virtio-net.c
+++ b/examples/vhost/virtio-net.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -413,7 +413,7 @@ init_device(struct virtio_net *dev)
        vq_offset = offsetof(struct virtio_net, mem);
 
        /* Set everything to 0. */
        vq_offset = offsetof(struct virtio_net, mem);
 
        /* Set everything to 0. */

-       memset((void*)(uintptr_t)((uint64_t)(uintptr_t)dev + vq_offset), 0, 
+       memset((void*)(uintptr_t)((uint64_t)(uintptr_t)dev + vq_offset), 0,

                (sizeof(struct virtio_net) - (size_t)vq_offset));
        memset(dev->virtqueue[VIRTIO_RXQ], 0, sizeof(struct vhost_virtqueue));
        memset(dev->virtqueue[VIRTIO_TXQ], 0, sizeof(struct vhost_virtqueue));
                (sizeof(struct virtio_net) - (size_t)vq_offset));
        memset(dev->virtqueue[VIRTIO_RXQ], 0, sizeof(struct vhost_virtqueue));
        memset(dev->virtqueue[VIRTIO_TXQ], 0, sizeof(struct vhost_virtqueue));


@@ -996,7 +996,7 @@ eventfd_copy(struct virtio_net *dev, struct eventfd_copy *eventfd_copy)
        /* Call the IOCTL to copy the eventfd. */
        ret = ioctl(eventfd_link, EVENTFD_COPY, eventfd_copy);
        close(eventfd_link);
        /* Call the IOCTL to copy the eventfd. */
        ret = ioctl(eventfd_link, EVENTFD_COPY, eventfd_copy);
        close(eventfd_link);

-       
+

        if (ret < 0) {
                RTE_LOG(ERR, CONFIG, "(%"PRIu64") EVENTFD_COPY ioctl failed\n",  dev->device_fh);
                return -1;
        if (ret < 0) {
                RTE_LOG(ERR, CONFIG, "(%"PRIu64") EVENTFD_COPY ioctl failed\n",  dev->device_fh);
                return -1;

diff --git a/examples/vhost/virtio-net.h b/examples/vhost/virtio-net.h
index fbc2a16..3d1f255 100644 (file)
--- a/examples/vhost/virtio-net.h
+++ b/examples/vhost/virtio-net.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/vhost_xen/Makefile b/examples/vhost_xen/Makefile
index c0cd22e..e6fa1a1 100644 (file)
--- a/examples/vhost_xen/Makefile
+++ b/examples/vhost_xen/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/vhost_xen/main.c b/examples/vhost_xen/main.c
index 2ec44ee..62141e1 100644 (file)
--- a/examples/vhost_xen/main.c
+++ b/examples/vhost_xen/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -682,7 +682,7 @@ virtio_dev_rx(struct virtio_net *dev, struct rte_mbuf **pkts, uint32_t count)
                res_cur_idx++;
                packet_success++;
 
                res_cur_idx++;
                packet_success++;
 

-               /* mergeable is disabled then a header is required per buffer. */       
+               /* mergeable is disabled then a header is required per buffer. */

                rte_memcpy((void *)(uintptr_t)buff_hdr_addr, (const void*)&virtio_hdr, vq->vhost_hlen);
                if (res_cur_idx < res_end_idx) {
                        /* Prefetch descriptor index. */
                rte_memcpy((void *)(uintptr_t)buff_hdr_addr, (const void*)&virtio_hdr, vq->vhost_hlen);
                if (res_cur_idx < res_end_idx) {
                        /* Prefetch descriptor index. */


@@ -982,7 +982,7 @@ virtio_dev_tx(struct virtio_net* dev, struct rte_mempool *mbuf_pool)
                /* Setup dummy mbuf. This is copied to a real mbuf if transmitted out the physical port. */
                m.pkt.data_len = desc->len;
                m.pkt.data = (void*)(uintptr_t)buff_addr;
                /* Setup dummy mbuf. This is copied to a real mbuf if transmitted out the physical port. */
                m.pkt.data_len = desc->len;
                m.pkt.data = (void*)(uintptr_t)buff_addr;

-               m.pkt.nb_segs = 1; 
+               m.pkt.nb_segs = 1;

 
                virtio_tx_route(dev, &m, mbuf_pool, 0);
 
 
                virtio_tx_route(dev, &m, mbuf_pool, 0);
 


@@ -999,7 +999,7 @@ virtio_dev_tx(struct virtio_net* dev, struct rte_mempool *mbuf_pool)
  * This function is called by each data core. It handles all RX/TX registered with the
  * core. For TX the specific lcore linked list is used. For RX, MAC addresses are compared
  * with all devices in the main linked list.
  * This function is called by each data core. It handles all RX/TX registered with the
  * core. For TX the specific lcore linked list is used. For RX, MAC addresses are compared
  * with all devices in the main linked list.

- */ 
+ */

 static int
 switch_worker(__attribute__((unused)) void *arg)
 {
 static int
 switch_worker(__attribute__((unused)) void *arg)
 {


@@ -1056,11 +1056,11 @@ switch_worker(__attribute__((unused)) void *arg)
 
                }
 
 
                }
 

-               /* 
+               /*

                 * Inform the configuration core that we have exited the linked list and that no devices are
                 * in use if requested.
                 */
                 * Inform the configuration core that we have exited the linked list and that no devices are
                 * in use if requested.
                 */

-               if (lcore_ll->dev_removal_flag == REQUEST_DEV_REMOVAL) 
+               if (lcore_ll->dev_removal_flag == REQUEST_DEV_REMOVAL)

                        lcore_ll->dev_removal_flag = ACK_DEV_REMOVAL;
 
                /*
                        lcore_ll->dev_removal_flag = ACK_DEV_REMOVAL;
 
                /*


@@ -1235,7 +1235,7 @@ init_data_ll (void)
        return 0;
 }
 /*
        return 0;
 }
 /*

- * Remove a device from the specific data core linked list and from the main linked list. The 
+ * Remove a device from the specific data core linked list and from the main linked list. The

  * rx/tx thread must be set the flag to indicate that it is safe to remove the device.
  * used.
  */
  * rx/tx thread must be set the flag to indicate that it is safe to remove the device.
  * used.
  */


@@ -1293,8 +1293,8 @@ destroy_device (volatile struct virtio_net *dev)
        RTE_LCORE_FOREACH_SLAVE(lcore) {
                lcore_info[lcore].lcore_ll->dev_removal_flag = REQUEST_DEV_REMOVAL;
        }
        RTE_LCORE_FOREACH_SLAVE(lcore) {
                lcore_info[lcore].lcore_ll->dev_removal_flag = REQUEST_DEV_REMOVAL;
        }

-       
-       /* 
+
+       /*

         * Once each core has set the dev_removal_flag to ACK_DEV_REMOVAL we can be sure that
         * they can no longer access the device removed from the linked lists and that the devices
         * are no longer in use.
         * Once each core has set the dev_removal_flag to ACK_DEV_REMOVAL we can be sure that
         * they can no longer access the device removed from the linked lists and that the devices
         * are no longer in use.


@@ -1311,7 +1311,7 @@ destroy_device (volatile struct virtio_net *dev)
 
        /* Decrement number of device on the lcore. */
        lcore_info[ll_lcore_dev_cur->dev->coreid].lcore_ll->device_num--;
 
        /* Decrement number of device on the lcore. */
        lcore_info[ll_lcore_dev_cur->dev->coreid].lcore_ll->device_num--;

-       
+

        RTE_LOG(INFO, DATA, "  #####(%"PRIu64") Device has been removed from data core\n", dev->device_fh);
 }
 
        RTE_LOG(INFO, DATA, "  #####(%"PRIu64") Device has been removed from data core\n", dev->device_fh);
 }
 


@@ -1438,7 +1438,7 @@ print_stats(void)
 
 int init_virtio_net(struct virtio_net_device_ops const * const ops);
 
 
 int init_virtio_net(struct virtio_net_device_ops const * const ops);
 

-/* 
+/*

  * Main function, does initialisation and calls the per-lcore functions. The CUSE
  * device is also registered here to handle the IOCTLs.
  */
  * Main function, does initialisation and calls the per-lcore functions. The CUSE
  * device is also registered here to handle the IOCTLs.
  */

diff --git a/examples/vhost_xen/main.h b/examples/vhost_xen/main.h
index 0ec39cc..749c7b4 100644 (file)
--- a/examples/vhost_xen/main.h
+++ b/examples/vhost_xen/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/vhost_xen/vhost_monitor.c b/examples/vhost_xen/vhost_monitor.c
index 5d67ab2..b9c1cb5 100644 (file)
--- a/examples/vhost_xen/vhost_monitor.c
+++ b/examples/vhost_xen/vhost_monitor.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -130,7 +130,7 @@ get_xen_guest(int dom_id)
 }
 
 
 }
 
 

-static struct xen_guest * 
+static struct xen_guest *

 add_xen_guest(int32_t dom_id)
 {
        struct xen_guest *guest = NULL;
 add_xen_guest(int32_t dom_id)
 {
        struct xen_guest *guest = NULL;


@@ -165,7 +165,7 @@ cleanup_device(struct virtio_net_config_ll *ll_dev)
 }
 
 /*
 }
 
 /*

- * Add entry containing a device to the device configuration linked list. 
+ * Add entry containing a device to the device configuration linked list.

  */
 static void
 add_config_ll_entry(struct virtio_net_config_ll *new_ll_dev)
  */
 static void
 add_config_ll_entry(struct virtio_net_config_ll *new_ll_dev)


@@ -179,13 +179,13 @@ add_config_ll_entry(struct virtio_net_config_ll *new_ll_dev)
                        new_ll_dev->dev.device_fh = 0;
                        new_ll_dev->next = ll_dev;
                        ll_root = new_ll_dev;
                        new_ll_dev->dev.device_fh = 0;
                        new_ll_dev->next = ll_dev;
                        ll_root = new_ll_dev;

-               } else {                
+               } else {

                        /* increment through the ll until we find un unused device_id,
                         * insert the device at that entry
                         */
                        while ((ll_dev->next != NULL) && (ll_dev->dev.device_fh == (ll_dev->next->dev.device_fh - 1)))
                                ll_dev = ll_dev->next;
                        /* increment through the ll until we find un unused device_id,
                         * insert the device at that entry
                         */
                        while ((ll_dev->next != NULL) && (ll_dev->dev.device_fh == (ll_dev->next->dev.device_fh - 1)))
                                ll_dev = ll_dev->next;

-                       
+

                        new_ll_dev->dev.device_fh = ll_dev->dev.device_fh + 1;
                        new_ll_dev->next = ll_dev->next;
                        ll_dev->next = new_ll_dev;
                        new_ll_dev->dev.device_fh = ll_dev->dev.device_fh + 1;
                        new_ll_dev->next = ll_dev->next;
                        ll_dev->next = new_ll_dev;


@@ -202,7 +202,7 @@ add_config_ll_entry(struct virtio_net_config_ll *new_ll_dev)
  */
 static struct virtio_net_config_ll *
 rm_config_ll_entry(struct virtio_net_config_ll *ll_dev, struct virtio_net_config_ll *ll_dev_last)
  */
 static struct virtio_net_config_ll *
 rm_config_ll_entry(struct virtio_net_config_ll *ll_dev, struct virtio_net_config_ll *ll_dev_last)

-{      
+{

        /* First remove the device and then clean it up. */
        if (ll_dev == ll_root) {
                ll_root = ll_dev->next;
        /* First remove the device and then clean it up. */
        if (ll_dev == ll_root) {
                ll_root = ll_dev->next;


@@ -218,23 +218,23 @@ rm_config_ll_entry(struct virtio_net_config_ll *ll_dev, struct virtio_net_config
 /*
  * Retrieves an entry from the devices configuration linked list.
  */
 /*
  * Retrieves an entry from the devices configuration linked list.
  */

-static struct virtio_net_config_ll * 
+static struct virtio_net_config_ll *

 get_config_ll_entry(unsigned int virtio_idx, unsigned int dom_id)
 {
        struct virtio_net_config_ll *ll_dev = ll_root;
 
        /* Loop through linked list until the dom_id is found. */
        while (ll_dev != NULL) {
 get_config_ll_entry(unsigned int virtio_idx, unsigned int dom_id)
 {
        struct virtio_net_config_ll *ll_dev = ll_root;
 
        /* Loop through linked list until the dom_id is found. */
        while (ll_dev != NULL) {

-               if (ll_dev->dev.dom_id == dom_id && ll_dev->dev.virtio_idx == virtio_idx) 
+               if (ll_dev->dev.dom_id == dom_id && ll_dev->dev.virtio_idx == virtio_idx)

                        return ll_dev;
                ll_dev = ll_dev->next;
                        return ll_dev;
                ll_dev = ll_dev->next;

-       } 
+       }

 
        return NULL;
 }
 
 
        return NULL;
 }
 

-/* 
- * Initialise all variables in device structure. 
+/*
+ * Initialise all variables in device structure.

  */
 static void
 init_dev(struct virtio_net *dev)
  */
 static void
 init_dev(struct virtio_net *dev)


@@ -253,14 +253,14 @@ virtio_net_config_ll *new_device(unsigned int virtio_idx, struct xen_guest *gues
        uint64_t gpa;
        uint32_t i;
 
        uint64_t gpa;
        uint32_t i;
 

-       /* Setup device and virtqueues. */      
+       /* Setup device and virtqueues. */

        new_ll_dev   = calloc(1, sizeof(struct virtio_net_config_ll));
        virtqueue_rx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), CACHE_LINE_SIZE);
        virtqueue_tx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), CACHE_LINE_SIZE);
        if (new_ll_dev == NULL || virtqueue_rx == NULL || virtqueue_tx == NULL)
                goto err;
 
        new_ll_dev   = calloc(1, sizeof(struct virtio_net_config_ll));
        virtqueue_rx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), CACHE_LINE_SIZE);
        virtqueue_tx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), CACHE_LINE_SIZE);
        if (new_ll_dev == NULL || virtqueue_rx == NULL || virtqueue_tx == NULL)
                goto err;
 

-       new_ll_dev->dev.virtqueue_rx = virtqueue_rx;    
+       new_ll_dev->dev.virtqueue_rx = virtqueue_rx;

        new_ll_dev->dev.virtqueue_tx = virtqueue_tx;
        new_ll_dev->dev.dom_id       = guest->dom_id;
        new_ll_dev->dev.virtio_idx   = virtio_idx;
        new_ll_dev->dev.virtqueue_tx = virtqueue_tx;
        new_ll_dev->dev.dom_id       = guest->dom_id;
        new_ll_dev->dev.virtio_idx   = virtio_idx;


@@ -285,7 +285,7 @@ virtio_net_config_ll *new_device(unsigned int virtio_idx, struct xen_guest *gues
        new_ll_dev->dev.mem = malloc(sizeof(struct virtio_memory) + sizeof(struct virtio_memory_regions) * MAX_XENVIRT_MEMPOOL);
        new_ll_dev->dev.mem->nregions = guest->pool_num;
        for (i = 0; i < guest->pool_num; i++) {
        new_ll_dev->dev.mem = malloc(sizeof(struct virtio_memory) + sizeof(struct virtio_memory_regions) * MAX_XENVIRT_MEMPOOL);
        new_ll_dev->dev.mem->nregions = guest->pool_num;
        for (i = 0; i < guest->pool_num; i++) {

-               gpa = new_ll_dev->dev.mem->regions[i].guest_phys_address = (uint64_t)guest->mempool[i].gva; 
+               gpa = new_ll_dev->dev.mem->regions[i].guest_phys_address = (uint64_t)guest->mempool[i].gva;

                new_ll_dev->dev.mem->regions[i].guest_phys_address_end = gpa + guest->mempool[i].mempfn_num * getpagesize();
                new_ll_dev->dev.mem->regions[i].address_offset = (uint64_t)guest->mempool[i].hva - gpa;
        }
                new_ll_dev->dev.mem->regions[i].guest_phys_address_end = gpa + guest->mempool[i].mempfn_num * getpagesize();
                new_ll_dev->dev.mem->regions[i].address_offset = (uint64_t)guest->mempool[i].hva - gpa;
        }


@@ -323,7 +323,7 @@ destroy_guest(struct xen_guest *guest)
 /*
  * This function will cleanup the device and remove it from device configuration linked list.
  */
 /*
  * This function will cleanup the device and remove it from device configuration linked list.
  */

-static void 
+static void

 destroy_device(unsigned int virtio_idx, unsigned int dom_id)
 {
        struct virtio_net_config_ll *ll_dev_cur_ctx, *ll_dev_last = NULL;
 destroy_device(unsigned int virtio_idx, unsigned int dom_id)
 {
        struct virtio_net_config_ll *ll_dev_cur_ctx, *ll_dev_last = NULL;


@@ -358,7 +358,7 @@ destroy_device(unsigned int virtio_idx, unsigned int dom_id)
 
 
 
 
 
 

-static void 
+static void

 watch_unmap_event(void)
 {
        int i;
 watch_unmap_event(void)
 {
        int i;


@@ -396,7 +396,7 @@ _find_next_remove:
                RTE_LOG(INFO, XENHOST, "  #####%s: destroy guest (%d)\n", __func__, guest->dom_id);
                destroy_guest(guest);
                goto _find_next_remove;
                RTE_LOG(INFO, XENHOST, "  #####%s: destroy guest (%d)\n", __func__, guest->dom_id);
                destroy_guest(guest);
                goto _find_next_remove;

-       } 
+       }

        return;
 }
 
        return;
 }
 


@@ -488,7 +488,7 @@ void
 virtio_monitor_loop(void)
 {
        char **vec;
 virtio_monitor_loop(void)
 {
        char **vec;

-       xs_transaction_t th;    
+       xs_transaction_t th;

        char *buf;
        unsigned int len;
        unsigned int dom_id;
        char *buf;
        unsigned int len;
        unsigned int dom_id;


@@ -526,7 +526,7 @@ virtio_monitor_loop(void)
 
                if (buf) {
                        /* theres' some node for vhost existed */
 
                if (buf) {
                        /* theres' some node for vhost existed */

-                       if (rte_strsplit(vec[XS_WATCH_PATH], strnlen(vec[XS_WATCH_PATH], PATH_MAX), 
+                       if (rte_strsplit(vec[XS_WATCH_PATH], strnlen(vec[XS_WATCH_PATH], PATH_MAX),

                                                str_fld, _NUM_FLD, '/') == _NUM_FLD) {
                                if (strstr(str_fld[FLD_NODE], VIRTIO_START)) {
                                        errno = 0;
                                                str_fld, _NUM_FLD, '/') == _NUM_FLD) {
                                if (strstr(str_fld[FLD_NODE], VIRTIO_START)) {
                                        errno = 0;


@@ -575,15 +575,15 @@ virtio_monitor_loop(void)
                        }
                }
 
                        }
                }
 

-               free(vec);              
-       }        
+               free(vec);
+       }

        return;
 }
 
 /*
  * Register ops so that we can add/remove device to data core.
  */
        return;
 }
 
 /*
  * Register ops so that we can add/remove device to data core.
  */

-int 
+int

 init_virtio_xen(struct virtio_net_device_ops const *const ops)
 {
        notify_ops = ops;
 init_virtio_xen(struct virtio_net_device_ops const *const ops)
 {
        notify_ops = ops;

diff --git a/examples/vhost_xen/virtio-net.h b/examples/vhost_xen/virtio-net.h
index 8051a89..c8c5a7a 100644 (file)
--- a/examples/vhost_xen/virtio-net.h
+++ b/examples/vhost_xen/virtio-net.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -59,7 +59,7 @@ struct vhost_virtqueue
  */
 struct virtio_net
 {
  */
 struct virtio_net
 {

-       struct vhost_virtqueue  *virtqueue_tx;  /* Contains all TX virtqueue information. */ 
+       struct vhost_virtqueue  *virtqueue_tx;  /* Contains all TX virtqueue information. */

        struct vhost_virtqueue  *virtqueue_rx;  /* Contains all RX virtqueue information. */
        struct virtio_memory    *mem;           /* QEMU memory and memory region information. */
        struct ether_addr       mac_address;    /* Device MAC address (Obtained on first TX packet). */
        struct vhost_virtqueue  *virtqueue_rx;  /* Contains all RX virtqueue information. */
        struct virtio_memory    *mem;           /* QEMU memory and memory region information. */
        struct ether_addr       mac_address;    /* Device MAC address (Obtained on first TX packet). */


@@ -72,7 +72,7 @@ struct virtio_net
        volatile uint8_t        remove;         /* Device is marked for removal from the data core. */
        uint32_t                virtio_idx;     /* Index of virtio device */
        uint32_t                dom_id;         /* Domain id of xen guest */
        volatile uint8_t        remove;         /* Device is marked for removal from the data core. */
        uint32_t                virtio_idx;     /* Index of virtio device */
        uint32_t                dom_id;         /* Domain id of xen guest */

-} ___rte_cache_aligned;  
+} ___rte_cache_aligned;

 
 /*
  * Device linked list structure for configuration.
 
 /*
  * Device linked list structure for configuration.


@@ -84,7 +84,7 @@ struct virtio_net_config_ll
 };
 
 /*
 };
 
 /*

- * Information relating to memory regions including offsets to addresses in QEMUs memory file. 
+ * Information relating to memory regions including offsets to addresses in QEMUs memory file.

  */
 struct virtio_memory_regions {
        uint64_t        guest_phys_address;     /* Base guest physical address of region. */
  */
 struct virtio_memory_regions {
        uint64_t        guest_phys_address;     /* Base guest physical address of region. */


@@ -95,7 +95,7 @@ struct virtio_memory_regions {
 };
 
 /*
 };
 
 /*

- * Memory structure includes region and mapping information. 
+ * Memory structure includes region and mapping information.

  */
 struct virtio_memory {
        uint32_t                        nregions;       /* Number of memory regions. */
  */
 struct virtio_memory {
        uint32_t                        nregions;       /* Number of memory regions. */

diff --git a/examples/vhost_xen/xen_vhost.h b/examples/vhost_xen/xen_vhost.h
index 944cf0c..8c0d15a 100644 (file)
--- a/examples/vhost_xen/xen_vhost.h
+++ b/examples/vhost_xen/xen_vhost.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -86,7 +86,7 @@ struct xen_vring {
        uint32_t virtio_idx;    /* index of virtio device */
        void *rxvring_addr;     /* mapped virtual address of rxvring */
        void *txvring_addr;     /* mapped virtual address of txvring */
        uint32_t virtio_idx;    /* index of virtio device */
        void *rxvring_addr;     /* mapped virtual address of rxvring */
        void *txvring_addr;     /* mapped virtual address of txvring */

-       uint32_t rxpfn_num;     /* number of gpfn for rxvring */ 
+       uint32_t rxpfn_num;     /* number of gpfn for rxvring */

        uint32_t txpfn_num;     /* number of gpfn for txvring */
        uint32_t *rxpfn_tbl;    /* array of rxvring gpfn */
        uint32_t *txpfn_tbl;    /* array of txvring gpfn */
        uint32_t txpfn_num;     /* number of gpfn for txvring */
        uint32_t *rxpfn_tbl;    /* array of rxvring gpfn */
        uint32_t *txpfn_tbl;    /* array of txvring gpfn */

diff --git a/examples/vhost_xen/xenstore_parse.c b/examples/vhost_xen/xenstore_parse.c
index 6380b85..b8acd3e 100644 (file)
--- a/examples/vhost_xen/xenstore_parse.c
+++ b/examples/vhost_xen/xenstore_parse.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -63,7 +63,7 @@ static struct xs_handle *xs = NULL;
 
 /* gntdev file descriptor to map grant pages */
 static int d_fd = -1;
 
 /* gntdev file descriptor to map grant pages */
 static int d_fd = -1;

- 
+

 /*
  *  The grant node format in xenstore for vring/mpool is like:
  *  idx#_rx_vring_gref = "gref1#, gref2#, gref3#"
 /*
  *  The grant node format in xenstore for vring/mpool is like:
  *  idx#_rx_vring_gref = "gref1#, gref2#, gref3#"


@@ -81,8 +81,8 @@ int cmdline_parse_etheraddr(void *tk, const char *srcbuf,
 
 /* Map grant ref refid at addr_ori*/
 static void *
 
 /* Map grant ref refid at addr_ori*/
 static void *

-xen_grant_mmap(void *addr_ori, int domid, int refid, uint64_t *pindex) 
-{ 
+xen_grant_mmap(void *addr_ori, int domid, int refid, uint64_t *pindex)
+{

        struct ioctl_gntdev_map_grant_ref arg;
        void *addr = NULL;
        int pg_sz = getpagesize();
        struct ioctl_gntdev_map_grant_ref arg;
        void *addr = NULL;
        int pg_sz = getpagesize();


@@ -91,31 +91,31 @@ xen_grant_mmap(void *addr_ori, int domid, int refid, uint64_t *pindex)
        arg.refs[0].domid = domid;
        arg.refs[0].ref = refid;
 
        arg.refs[0].domid = domid;
        arg.refs[0].ref = refid;
 

-       int rv = ioctl(d_fd, IOCTL_GNTDEV_MAP_GRANT_REF, &arg); 
-       if (rv) { 
+       int rv = ioctl(d_fd, IOCTL_GNTDEV_MAP_GRANT_REF, &arg);
+       if (rv) {

                RTE_LOG(ERR, XENHOST, "  %s: (%d,%d) %s (ioctl failed)\n", __func__,
                RTE_LOG(ERR, XENHOST, "  %s: (%d,%d) %s (ioctl failed)\n", __func__,

-                               domid, refid, strerror(errno)); 
-               return NULL; 
-       } 
+                               domid, refid, strerror(errno));
+               return NULL;
+       }

 
        if (addr_ori == NULL)
 
        if (addr_ori == NULL)

-               addr = mmap(addr_ori, pg_sz, PROT_READ|PROT_WRITE, MAP_SHARED, 
-                               d_fd, arg.index); 
+               addr = mmap(addr_ori, pg_sz, PROT_READ|PROT_WRITE, MAP_SHARED,
+                               d_fd, arg.index);

        else
                addr = mmap(addr_ori, pg_sz, PROT_READ|PROT_WRITE, MAP_SHARED | MAP_FIXED,
        else
                addr = mmap(addr_ori, pg_sz, PROT_READ|PROT_WRITE, MAP_SHARED | MAP_FIXED,

-                               d_fd, arg.index); 
+                               d_fd, arg.index);

 
        if (addr == MAP_FAILED) {
                RTE_LOG(ERR, XENHOST, "  %s: (%d, %d) %s (map failed)\n", __func__,
 
        if (addr == MAP_FAILED) {
                RTE_LOG(ERR, XENHOST, "  %s: (%d, %d) %s (map failed)\n", __func__,

-                               domid, refid, strerror(errno)); 
-               return NULL; 
+                               domid, refid, strerror(errno));
+               return NULL;

        }
 
        if (pindex)
                *pindex = arg.index;
 
        return addr;
        }
 
        if (pindex)
                *pindex = arg.index;
 
        return addr;

-} 
+}

 
 /* Unmap one grant ref, and munmap must be called before this */
 static int
 
 /* Unmap one grant ref, and munmap must be called before this */
 static int


@@ -123,7 +123,7 @@ xen_unmap_grant_ref(uint64_t index)
 {
        struct ioctl_gntdev_unmap_grant_ref arg;
        int rv;
 {
        struct ioctl_gntdev_unmap_grant_ref arg;
        int rv;

-       
+

        arg.count = 1;
        arg.index = index;
        rv = ioctl(d_fd, IOCTL_GNTDEV_UNMAP_GRANT_REF, &arg);
        arg.count = 1;
        arg.index = index;
        rv = ioctl(d_fd, IOCTL_GNTDEV_UNMAP_GRANT_REF, &arg);


@@ -179,7 +179,7 @@ xen_read_node(char *path, uint32_t *len)
 
        buf = xs_read(xs, XBT_NULL, path, len);
        return buf;
 
        buf = xs_read(xs, XBT_NULL, path, len);
        return buf;

-} 
+}

 
 static int
 cal_pagenum(struct xen_gnt *gnt)
 
 static int
 cal_pagenum(struct xen_gnt *gnt)


@@ -206,7 +206,7 @@ xen_free_gntnode(struct xen_gntnode *gntnode)
                return;
        if (gntnode->gnt_info)
                free(gntnode->gnt_info);
                return;
        if (gntnode->gnt_info)
                free(gntnode->gnt_info);

-       free(gntnode);  
+       free(gntnode);

 }
 
 /*
 }
 
 /*


@@ -252,7 +252,7 @@ parse_gntnode(int dom_id, char *path)
        gnt = (struct xen_gnt *)calloc(gref_num, sizeof(struct xen_gnt));
        if (gnt == NULL || gntnode == NULL)
                goto err;
        gnt = (struct xen_gnt *)calloc(gref_num, sizeof(struct xen_gnt));
        if (gnt == NULL || gntnode == NULL)
                goto err;

-       
+

        for (i = 0; i < gref_num; i++) {
                errno = 0;
                gnt[i].gref = strtol(gref_list[i], &end, 0);
        for (i = 0; i < gref_num; i++) {
                errno = 0;
                gnt[i].gref = strtol(gref_list[i], &end, 0);


@@ -263,7 +263,7 @@ parse_gntnode(int dom_id, char *path)
                }
                addr = xen_grant_mmap(NULL, dom_id, gnt[i].gref, &index);
                if (addr == NULL) {
                }
                addr = xen_grant_mmap(NULL, dom_id, gnt[i].gref, &index);
                if (addr == NULL) {

-                       RTE_LOG(ERR, XENHOST, "  %s: map gref %u failed\n", __func__, gnt[i].gref); 
+                       RTE_LOG(ERR, XENHOST, "  %s: map gref %u failed\n", __func__, gnt[i].gref);

                        goto err;
                }
                RTE_LOG(INFO, XENHOST, "      %s: map gref %u to %p\n", __func__, gnt[i].gref, addr);
                        goto err;
                }
                RTE_LOG(INFO, XENHOST, "      %s: map gref %u to %p\n", __func__, gnt[i].gref, addr);


@@ -276,11 +276,11 @@ parse_gntnode(int dom_id, char *path)
                        RTE_LOG(INFO, XENHOST, "  %s: release gref %u failed\n", __func__, gnt[i].gref);
                        goto err;
                }
                        RTE_LOG(INFO, XENHOST, "  %s: release gref %u failed\n", __func__, gnt[i].gref);
                        goto err;
                }

-                       
+

        }
        }

-       
+

        gntnode->gnt_num  = gref_num;
        gntnode->gnt_num  = gref_num;

-       gntnode->gnt_info = gnt;        
+       gntnode->gnt_info = gnt;

 
        free(buf);
        free(gref_list);
 
        free(buf);
        free(gref_list);


@@ -332,7 +332,7 @@ map_gntnode(struct xen_gntnode *gntnode, int domid, uint32_t **ppfn, uint32_t *p
        pg_sz = getpagesize();
        for (i = 0; i < gntnode->gnt_num; i++) {
                gnt = gntnode->gnt_info + i;
        pg_sz = getpagesize();
        for (i = 0; i < gntnode->gnt_num; i++) {
                gnt = gntnode->gnt_info + i;

-               total_pages += cal_pagenum(gnt);  
+               total_pages += cal_pagenum(gnt);

        }
        if ((addr = get_xen_virtual(total_pages * pg_sz, pg_sz)) == NULL) {
                RTE_LOG(ERR, XENHOST, "  %s: failed get_xen_virtual\n", __func__);
        }
        if ((addr = get_xen_virtual(total_pages * pg_sz, pg_sz)) == NULL) {
                RTE_LOG(ERR, XENHOST, "  %s: failed get_xen_virtual\n", __func__);


@@ -355,7 +355,7 @@ map_gntnode(struct xen_gntnode *gntnode, int domid, uint32_t **ppfn, uint32_t *p
                                goto _end;
                        /*alternative: batch map, or through libxc*/
                        if (xen_grant_mmap(RTE_PTR_ADD(addr, pfn_num * pg_sz),
                                goto _end;
                        /*alternative: batch map, or through libxc*/
                        if (xen_grant_mmap(RTE_PTR_ADD(addr, pfn_num * pg_sz),

-                                       domid, 
+                                       domid,

                                        gnt->gref_pfn[j * 2].gref,
                                        &pindex[pfn_num]) == NULL) {
                                goto mmap_failed;
                                        gnt->gref_pfn[j * 2].gref,
                                        &pindex[pfn_num]) == NULL) {
                                goto mmap_failed;


@@ -400,10 +400,10 @@ parse_mpool_va(struct xen_mempool *mempool)
        int ret = -1;
 
        errno = 0;
        int ret = -1;
 
        errno = 0;

-       rte_snprintf(path, sizeof(path), 
+       rte_snprintf(path, sizeof(path),

                XEN_VM_ROOTNODE_FMT"/%d_"XEN_GVA_SUFFIX,
                mempool->dom_id, mempool->pool_idx);
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_GVA_SUFFIX,
                mempool->dom_id, mempool->pool_idx);

-               
+

        if((buf = xen_read_node(path, &len)) == NULL)
                goto out;
        mempool->gva = (void *)strtoul(buf, &end, 16);
        if((buf = xen_read_node(path, &len)) == NULL)
                goto out;
        mempool->gva = (void *)strtoul(buf, &end, 16);


@@ -411,7 +411,7 @@ parse_mpool_va(struct xen_mempool *mempool)
                mempool->gva = NULL;
                goto out;
        }
                mempool->gva = NULL;
                goto out;
        }

-       ret = 0;        
+       ret = 0;

 out:
        if (buf)
                free(buf);
 out:
        if (buf)
                free(buf);


@@ -421,14 +421,14 @@ out:
 /*
  * map mbuf pool
  */
 /*
  * map mbuf pool
  */

-static int 
+static int

 map_mempoolnode(struct xen_gntnode *gntnode,
                        struct xen_mempool *mempool)
 {
        if (gntnode == NULL || mempool == NULL)
                return -1;
 map_mempoolnode(struct xen_gntnode *gntnode,
                        struct xen_mempool *mempool)
 {
        if (gntnode == NULL || mempool == NULL)
                return -1;

-       
-       mempool->hva = 
+
+       mempool->hva =

                map_gntnode(gntnode, mempool->dom_id, &mempool->mempfn_tbl, &mempool->mempfn_num, &mempool->pindex);
 
        RTE_LOG(INFO, XENHOST, "  %s: map mempool at %p\n", __func__, (void *)mempool->hva);
                map_gntnode(gntnode, mempool->dom_id, &mempool->mempfn_tbl, &mempool->mempfn_num, &mempool->pindex);
 
        RTE_LOG(INFO, XENHOST, "  %s: map mempool at %p\n", __func__, (void *)mempool->hva);


@@ -444,7 +444,7 @@ cleanup_mempool(struct xen_mempool *mempool)
 {
        int pg_sz = getpagesize();
        uint32_t i;
 {
        int pg_sz = getpagesize();
        uint32_t i;

-       
+

        if (mempool->hva)
                munmap(mempool->hva, mempool->mempfn_num * pg_sz);
        mempool->hva = NULL;
        if (mempool->hva)
                munmap(mempool->hva, mempool->mempfn_num * pg_sz);
        mempool->hva = NULL;


@@ -456,7 +456,7 @@ cleanup_mempool(struct xen_mempool *mempool)
                        mempool->pool_idx,
                        mempool->mempfn_num);
                for (i = 0; i < mempool->mempfn_num; i ++) {
                        mempool->pool_idx,
                        mempool->mempfn_num);
                for (i = 0; i < mempool->mempfn_num; i ++) {

-                       xen_unmap_grant_ref(mempool->pindex[i]); 
+                       xen_unmap_grant_ref(mempool->pindex[i]);

                }
        }
        mempool->pindex = NULL;
                }
        }
        mempool->pindex = NULL;


@@ -485,10 +485,10 @@ parse_mempoolnode(struct xen_guest *guest)
        while (1) {
                /* check if null terminated */
                rte_snprintf(path, sizeof(path),
        while (1) {
                /* check if null terminated */
                rte_snprintf(path, sizeof(path),

-                       XEN_VM_ROOTNODE_FMT"/%d_"XEN_MEMPOOL_SUFFIX, 
+                       XEN_VM_ROOTNODE_FMT"/%d_"XEN_MEMPOOL_SUFFIX,

                        guest->dom_id,
                        guest->pool_num);
                        guest->dom_id,
                        guest->pool_num);

-               
+

                if ((buf = xen_read_node(path, &len)) != NULL) {
                        /* this node exists */
                        free(buf);
                if ((buf = xen_read_node(path, &len)) != NULL) {
                        /* this node exists */
                        free(buf);


@@ -503,7 +503,7 @@ parse_mempoolnode(struct xen_guest *guest)
                mempool = &guest->mempool[guest->pool_num];
                mempool->dom_id = guest->dom_id;
                mempool->pool_idx = guest->pool_num;
                mempool = &guest->mempool[guest->pool_num];
                mempool->dom_id = guest->dom_id;
                mempool->pool_idx = guest->pool_num;

-       
+

                RTE_LOG(INFO, XENHOST, "  %s: mempool %u parse gntnode %s\n", __func__, guest->pool_num, path);
                gntnode = parse_gntnode(guest->dom_id, path);
                if (gntnode == NULL)
                RTE_LOG(INFO, XENHOST, "  %s: mempool %u parse gntnode %s\n", __func__, guest->pool_num, path);
                gntnode = parse_gntnode(guest->dom_id, path);
                if (gntnode == NULL)


@@ -541,10 +541,10 @@ xen_map_vringflag(struct xen_vring *vring)
        int pg_sz = getpagesize();
        char *end;
 
        int pg_sz = getpagesize();
        char *end;
 

-       rte_snprintf(path, sizeof(path), 
+       rte_snprintf(path, sizeof(path),

                XEN_VM_ROOTNODE_FMT"/%d_"XEN_VRINGFLAG_SUFFIX,
                vring->dom_id, vring->virtio_idx);
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_VRINGFLAG_SUFFIX,
                vring->dom_id, vring->virtio_idx);

-               
+

        if((buf = xen_read_node(path, &len)) == NULL)
                goto err;
 
        if((buf = xen_read_node(path, &len)) == NULL)
                goto err;
 


@@ -580,7 +580,7 @@ xen_map_rxvringnode(struct xen_gntnode *gntnode,
        RTE_LOG(INFO, XENHOST, "  %s: map rx vring at %p\n", __func__, (void *)vring->rxvring_addr);
        if (vring->rxvring_addr)
                return 0;
        RTE_LOG(INFO, XENHOST, "  %s: map rx vring at %p\n", __func__, (void *)vring->rxvring_addr);
        if (vring->rxvring_addr)
                return 0;

-       else 
+       else

                return -1;
 }
 
                return -1;
 }
 


@@ -669,7 +669,7 @@ xen_parse_etheraddr(struct xen_vring *vring)
        uint32_t len;
        int ret = -1;
 
        uint32_t len;
        int ret = -1;
 

-       rte_snprintf(path, sizeof(path), 
+       rte_snprintf(path, sizeof(path),

                XEN_VM_ROOTNODE_FMT"/%d_"XEN_ADDR_SUFFIX,
                vring->dom_id, vring->virtio_idx);
 
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_ADDR_SUFFIX,
                vring->dom_id, vring->virtio_idx);
 


@@ -699,12 +699,12 @@ parse_vringnode(struct xen_guest *guest, uint32_t virtio_idx)
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_RXVRING_SUFFIX,
                guest->dom_id,
                virtio_idx);
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_RXVRING_SUFFIX,
                guest->dom_id,
                virtio_idx);

-       
+

        RTE_LOG(INFO, XENHOST, "  %s: virtio %u parse rx gntnode %s\n", __func__, virtio_idx, path);
        rx_gntnode = parse_gntnode(guest->dom_id, path);
        if (rx_gntnode == NULL)
                goto err;
        RTE_LOG(INFO, XENHOST, "  %s: virtio %u parse rx gntnode %s\n", __func__, virtio_idx, path);
        rx_gntnode = parse_gntnode(guest->dom_id, path);
        if (rx_gntnode == NULL)
                goto err;

-       
+

        /*check if null terminated */
        rte_snprintf(path, sizeof(path),
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_TXVRING_SUFFIX,
        /*check if null terminated */
        rte_snprintf(path, sizeof(path),
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_TXVRING_SUFFIX,


@@ -720,7 +720,7 @@ parse_vringnode(struct xen_guest *guest, uint32_t virtio_idx)
        bzero(vring, sizeof(*vring));
        vring->dom_id = guest->dom_id;
        vring->virtio_idx = virtio_idx;
        bzero(vring, sizeof(*vring));
        vring->dom_id = guest->dom_id;
        vring->virtio_idx = virtio_idx;

-               
+

        if (xen_parse_etheraddr(vring) != 0)
                goto err;
 
        if (xen_parse_etheraddr(vring) != 0)
                goto err;
 


@@ -764,7 +764,7 @@ xen_grant_init(void)
 {
        d_fd = open(XEN_GNTDEV_FNAME, O_RDWR);
 
 {
        d_fd = open(XEN_GNTDEV_FNAME, O_RDWR);
 

-       return d_fd == -1? (-1): (0); 
+       return d_fd == -1? (-1): (0);

 }
 
 /*
 }
 
 /*

diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile
index b638d42..198e3bf 100644 (file)
--- a/examples/vmdq/Makefile
+++ b/examples/vmdq/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c
index 0f52bdd..3600549 100644 (file)
--- a/examples/vmdq/main.c
+++ b/examples/vmdq/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -74,8 +74,8 @@
 
 #define MAX_QUEUES 128
 /*
 
 #define MAX_QUEUES 128
 /*

- * For 10 GbE, 128 queues require roughly 
- * 128*512 (RX/TX_queue_nb * RX/TX_ring_descriptors_nb) per port. 
+ * For 10 GbE, 128 queues require roughly
+ * 128*512 (RX/TX_queue_nb * RX/TX_ring_descriptors_nb) per port.

  */
 #define NUM_MBUFS_PER_PORT (128*512)
 #define MBUF_CACHE_SIZE 64
  */
 #define NUM_MBUFS_PER_PORT (128*512)
 #define MBUF_CACHE_SIZE 64


@@ -90,7 +90,7 @@
 #define RX_PTHRESH 8 /**< Default values of RX prefetch threshold reg. */
 #define RX_HTHRESH 8 /**< Default values of RX host threshold reg. */
 #define RX_WTHRESH 4 /**< Default values of RX write-back threshold reg. */
 #define RX_PTHRESH 8 /**< Default values of RX prefetch threshold reg. */
 #define RX_HTHRESH 8 /**< Default values of RX host threshold reg. */
 #define RX_WTHRESH 4 /**< Default values of RX write-back threshold reg. */

- 
+

 /*
  * These default values are optimized for use with the Intel(R) 82599 10 GbE
  * Controller and the DPDK ixgbe PMD. Consider using other values for other
 /*
  * These default values are optimized for use with the Intel(R) 82599 10 GbE
  * Controller and the DPDK ixgbe PMD. Consider using other values for other


@@ -99,7 +99,7 @@
 #define TX_PTHRESH 36 /**< Default values of TX prefetch threshold reg. */
 #define TX_HTHRESH 0  /**< Default values of TX host threshold reg. */
 #define TX_WTHRESH 0  /**< Default values of TX write-back threshold reg. */
 #define TX_PTHRESH 36 /**< Default values of TX prefetch threshold reg. */
 #define TX_HTHRESH 0  /**< Default values of TX host threshold reg. */
 #define TX_WTHRESH 0  /**< Default values of TX write-back threshold reg. */

- 
+

 #define MAX_PKT_BURST 32
 
 /*
 #define MAX_PKT_BURST 32
 
 /*


@@ -243,7 +243,7 @@ get_eth_conf(struct rte_eth_conf *eth_conf, uint32_t num_pools)
 
 /*
  * Validate the pool number accrording to the max pool number gotten form dev_info
 
 /*
  * Validate the pool number accrording to the max pool number gotten form dev_info

- * If the pool number is invalid, give the error message and return -1 
+ * If the pool number is invalid, give the error message and return -1

  */
 static inline int
 validate_num_pools(uint32_t max_nb_pools)
  */
 static inline int
 validate_num_pools(uint32_t max_nb_pools)


@@ -331,11 +331,11 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool)
        printf("Port %u MAC: %02"PRIx8" %02"PRIx8" %02"PRIx8
                        " %02"PRIx8" %02"PRIx8" %02"PRIx8"\n",
                        (unsigned)port,
        printf("Port %u MAC: %02"PRIx8" %02"PRIx8" %02"PRIx8
                        " %02"PRIx8" %02"PRIx8" %02"PRIx8"\n",
                        (unsigned)port,

-                       vmdq_ports_eth_addr[port].addr_bytes[0], 
-                       vmdq_ports_eth_addr[port].addr_bytes[1], 
+                       vmdq_ports_eth_addr[port].addr_bytes[0],
+                       vmdq_ports_eth_addr[port].addr_bytes[1],

                        vmdq_ports_eth_addr[port].addr_bytes[2],
                        vmdq_ports_eth_addr[port].addr_bytes[2],

-                       vmdq_ports_eth_addr[port].addr_bytes[3], 
-                       vmdq_ports_eth_addr[port].addr_bytes[4], 
+                       vmdq_ports_eth_addr[port].addr_bytes[3],
+                       vmdq_ports_eth_addr[port].addr_bytes[4],

                        vmdq_ports_eth_addr[port].addr_bytes[5]);
 
        return 0;
                        vmdq_ports_eth_addr[port].addr_bytes[5]);
 
        return 0;


@@ -347,7 +347,7 @@ vmdq_parse_num_pools(const char *q_arg)
 {
        char *end = NULL;
        int n;
 {
        char *end = NULL;
        int n;

- 
+

        /* parse number string */
        n = strtol(q_arg, &end, 10);
        if ((q_arg[0] == '\0') || (end == NULL) || (*end != '\0'))
        /* parse number string */
        n = strtol(q_arg, &end, 10);
        if ((q_arg[0] == '\0') || (end == NULL) || (*end != '\0'))


@@ -443,13 +443,13 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port)
 {
        struct ether_hdr *eth;
        void *tmp;
 {
        struct ether_hdr *eth;
        void *tmp;

- 
+

        eth = rte_pktmbuf_mtod(m, struct ether_hdr *);
        eth = rte_pktmbuf_mtod(m, struct ether_hdr *);

- 
+

        /* 02:00:00:00:00:xx */
        tmp = &eth->d_addr.addr_bytes[0];
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
        /* 02:00:00:00:00:xx */
        tmp = &eth->d_addr.addr_bytes[0];
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);

- 
+

        /* src addr */
        ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
 }
        /* src addr */
        ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
 }


@@ -502,7 +502,7 @@ lcore_main(__attribute__((__unused__)) void* dummy)
                endQueue = (uint16_t)(startQueue + (num_queues/num_cores));
        }
 
                endQueue = (uint16_t)(startQueue + (num_queues/num_cores));
        }
 

-       printf("core %u(lcore %u) reading queues %i-%i\n", (unsigned)core_id, 
+       printf("core %u(lcore %u) reading queues %i-%i\n", (unsigned)core_id,

                (unsigned)lcore_id, startQueue, endQueue - 1);
 
        if (startQueue == endQueue) {
                (unsigned)lcore_id, startQueue, endQueue - 1);
 
        if (startQueue == endQueue) {


@@ -518,7 +518,7 @@ lcore_main(__attribute__((__unused__)) void* dummy)
                        const uint8_t sport = ports[p];
                        const uint8_t dport = ports[p ^ 1]; /* 0 <-> 1, 2 <-> 3 etc */
 
                        const uint8_t sport = ports[p];
                        const uint8_t dport = ports[p ^ 1]; /* 0 <-> 1, 2 <-> 3 etc */
 

-                       if ((sport == INVALID_PORT_ID) || (dport == INVALID_PORT_ID)) 
+                       if ((sport == INVALID_PORT_ID) || (dport == INVALID_PORT_ID))

                                continue;
 
                        for (q = startQueue; q < endQueue; q++) {
                                continue;
 
                        for (q = startQueue; q < endQueue; q++) {


@@ -545,10 +545,10 @@ lcore_main(__attribute__((__unused__)) void* dummy)
        }
 }
 
        }
 }
 

-/* 
+/*

  * Update the global var NUM_PORTS and array PORTS according to system ports number
  * and return valid ports number
  * Update the global var NUM_PORTS and array PORTS according to system ports number
  * and return valid ports number

- */    
+ */

 static unsigned check_ports_num(unsigned nb_ports)
 {
        unsigned valid_num_ports = num_ports;
 static unsigned check_ports_num(unsigned nb_ports)
 {
        unsigned valid_num_ports = num_ports;


@@ -558,7 +558,7 @@ static unsigned check_ports_num(unsigned nb_ports)
                printf("\nSpecified port number(%u) exceeds total system port number(%u)\n",
                        num_ports, nb_ports);
                num_ports = nb_ports;
                printf("\nSpecified port number(%u) exceeds total system port number(%u)\n",
                        num_ports, nb_ports);
                num_ports = nb_ports;

-       }       
+       }

 
        for (portid = 0; portid < num_ports; portid ++) {
                if (ports[portid] >= nb_ports) {
 
        for (portid = 0; portid < num_ports; portid ++) {
                if (ports[portid] >= nb_ports) {


@@ -599,23 +599,23 @@ MAIN(int argc, char *argv[])
 
        if (rte_eal_pci_probe() != 0)
                rte_exit(EXIT_FAILURE, "Error with NIC driver initialization\n");
 
        if (rte_eal_pci_probe() != 0)
                rte_exit(EXIT_FAILURE, "Error with NIC driver initialization\n");

-       
-       for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id ++) 
-               if (rte_lcore_is_enabled(lcore_id)) 
+
+       for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id ++)
+               if (rte_lcore_is_enabled(lcore_id))

                        lcore_ids[core_id ++] = lcore_id;
                        lcore_ids[core_id ++] = lcore_id;

-       
-       if (rte_lcore_count() > RTE_MAX_LCORE) 
+
+       if (rte_lcore_count() > RTE_MAX_LCORE)

                rte_exit(EXIT_FAILURE,"Not enough cores\n");
                rte_exit(EXIT_FAILURE,"Not enough cores\n");

-       
+

        nb_ports = rte_eth_dev_count();
        if (nb_ports > RTE_MAX_ETHPORTS)
                nb_ports = RTE_MAX_ETHPORTS;
 
        nb_ports = rte_eth_dev_count();
        if (nb_ports > RTE_MAX_ETHPORTS)
                nb_ports = RTE_MAX_ETHPORTS;
 

-       /* 
-        * Update the global var NUM_PORTS and global array PORTS 
-        * and get value of var VALID_NUM_PORTS according to system ports number 
-        */     
-       valid_num_ports = check_ports_num(nb_ports);    
+       /*
+        * Update the global var NUM_PORTS and global array PORTS
+        * and get value of var VALID_NUM_PORTS according to system ports number
+        */
+       valid_num_ports = check_ports_num(nb_ports);

 
        if (valid_num_ports < 2 || valid_num_ports % 2) {
                printf("Current valid ports number is %u\n", valid_num_ports);
 
        if (valid_num_ports < 2 || valid_num_ports % 2) {
                printf("Current valid ports number is %u\n", valid_num_ports);


@@ -638,7 +638,7 @@ MAIN(int argc, char *argv[])
                        printf("\nSkipping disabled port %d\n", portid);
                        continue;
                }
                        printf("\nSkipping disabled port %d\n", portid);
                        continue;
                }

-               if (port_init(portid, mbuf_pool) != 0) 
+               if (port_init(portid, mbuf_pool) != 0)

                        rte_exit(EXIT_FAILURE, "Cannot initialize network ports\n");
        }
 
                        rte_exit(EXIT_FAILURE, "Cannot initialize network ports\n");
        }
 

diff --git a/examples/vmdq/main.h b/examples/vmdq/main.h
index 41766e3..f13c9aa 100644 (file)
--- a/examples/vmdq/main.h
+++ b/examples/vmdq/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile
index a0868bf..10a9a9a 100644 (file)
--- a/examples/vmdq_dcb/Makefile
+++ b/examples/vmdq_dcb/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index 1626ba5..2f708a1 100644 (file)
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -368,7 +368,7 @@ lcore_main(void *arg)
        uint16_t startQueue = (uint16_t)(core_num * (NUM_QUEUES/num_cores));
        uint16_t endQueue = (uint16_t)(startQueue + (NUM_QUEUES/num_cores));
        uint16_t q, i, p;
        uint16_t startQueue = (uint16_t)(core_num * (NUM_QUEUES/num_cores));
        uint16_t endQueue = (uint16_t)(startQueue + (NUM_QUEUES/num_cores));
        uint16_t q, i, p;

-       
+

        printf("Core %u(lcore %u) reading queues %i-%i\n", (unsigned)core_num,
               rte_lcore_id(), startQueue, endQueue - 1);
 
        printf("Core %u(lcore %u) reading queues %i-%i\n", (unsigned)core_num,
               rte_lcore_id(), startQueue, endQueue - 1);
 


@@ -400,7 +400,7 @@ lcore_main(void *arg)
        }
 }
 
        }
 }
 

-/* 
+/*

  * Update the global var NUM_PORTS and array PORTS according to system ports number
  * and return valid ports number
  */
  * Update the global var NUM_PORTS and array PORTS according to system ports number
  * and return valid ports number
  */


@@ -408,13 +408,13 @@ static unsigned check_ports_num(unsigned nb_ports)
 {
        unsigned valid_num_ports = num_ports;
        unsigned portid;
 {
        unsigned valid_num_ports = num_ports;
        unsigned portid;

- 
+

        if (num_ports > nb_ports) {
                printf("\nSpecified port number(%u) exceeds total system port number(%u)\n",
                        num_ports, nb_ports);
                num_ports = nb_ports;
        }
        if (num_ports > nb_ports) {
                printf("\nSpecified port number(%u) exceeds total system port number(%u)\n",
                        num_ports, nb_ports);
                num_ports = nb_ports;
        }

- 
+

        for (portid = 0; portid < num_ports; portid ++) {
                if (ports[portid] >= nb_ports) {
                        printf("\nSpecified port ID(%u) exceeds max system port ID(%u)\n",
        for (portid = 0; portid < num_ports; portid ++) {
                if (ports[portid] >= nb_ports) {
                        printf("\nSpecified port ID(%u) exceeds max system port ID(%u)\n",


@@ -460,17 +460,17 @@ MAIN(int argc, char *argv[])
                rte_exit(EXIT_FAILURE,"This program can only run on an even"
                                "number of cores(1-128)\n\n");
        }
                rte_exit(EXIT_FAILURE,"This program can only run on an even"
                                "number of cores(1-128)\n\n");
        }

-       
+

        nb_ports = rte_eth_dev_count();
        if (nb_ports > RTE_MAX_ETHPORTS)
                nb_ports = RTE_MAX_ETHPORTS;
 
        nb_ports = rte_eth_dev_count();
        if (nb_ports > RTE_MAX_ETHPORTS)
                nb_ports = RTE_MAX_ETHPORTS;
 

-        /* 
-        * Update the global var NUM_PORTS and global array PORTS 
-        * and get value of var VALID_NUM_PORTS according to system ports number 
+        /*
+        * Update the global var NUM_PORTS and global array PORTS
+        * and get value of var VALID_NUM_PORTS according to system ports number

         */
        valid_num_ports = check_ports_num(nb_ports);
         */
        valid_num_ports = check_ports_num(nb_ports);

- 
+

        if (valid_num_ports < 2 || valid_num_ports % 2) {
                printf("Current valid ports number is %u\n", valid_num_ports);
                rte_exit(EXIT_FAILURE, "Error with valid ports number is not even or less than 2\n");
        if (valid_num_ports < 2 || valid_num_ports % 2) {
                printf("Current valid ports number is %u\n", valid_num_ports);
                rte_exit(EXIT_FAILURE, "Error with valid ports number is not even or less than 2\n");


@@ -492,7 +492,7 @@ MAIN(int argc, char *argv[])
                        printf("\nSkipping disabled port %d\n", portid);
                        continue;
                }
                        printf("\nSkipping disabled port %d\n", portid);
                        continue;
                }

-               if (port_init(portid, mbuf_pool) != 0) 
+               if (port_init(portid, mbuf_pool) != 0)

                        rte_exit(EXIT_FAILURE, "Cannot initialize network ports\n");
        }
 
                        rte_exit(EXIT_FAILURE, "Cannot initialize network ports\n");
        }
 

diff --git a/examples/vmdq_dcb/main.h b/examples/vmdq_dcb/main.h
index 41766e3..f13c9aa 100644 (file)
--- a/examples/vmdq_dcb/main.h
+++ b/examples/vmdq_dcb/main.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/Makefile b/lib/Makefile
index b92b392..d90916e 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile
index 3c840e1..7eae449 100644 (file)
--- a/lib/librte_cmdline/Makefile
+++ b/lib/librte_cmdline/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_cmdline/cmdline.c b/lib/librte_cmdline/cmdline.c
index b3dc17c..78572f4 100755 (executable)
--- a/lib/librte_cmdline/cmdline.c
+++ b/lib/librte_cmdline/cmdline.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline.h b/lib/librte_cmdline/cmdline.h
index 42d0de6..535a119 100644 (file)
--- a/lib/librte_cmdline/cmdline.h
+++ b/lib/librte_cmdline/cmdline.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_cirbuf.c b/lib/librte_cmdline/cmdline_cirbuf.c
index 8c0a50e..b9f9f4b 100644 (file)
--- a/lib/librte_cmdline/cmdline_cirbuf.c
+++ b/lib/librte_cmdline/cmdline_cirbuf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_cirbuf.h b/lib/librte_cmdline/cmdline_cirbuf.h
index 00e63bd..6321dec 100644 (file)
--- a/lib/librte_cmdline/cmdline_cirbuf.h
+++ b/lib/librte_cmdline/cmdline_cirbuf.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/librte_cmdline/cmdline_parse.c
index 5d42219..40969ef 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse.c
+++ b/lib/librte_cmdline/cmdline_parse.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse.h b/lib/librte_cmdline/cmdline_parse.h
index c765a2d..f18836d 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse.h
+++ b/lib/librte_cmdline/cmdline_parse.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.c b/lib/librte_cmdline/cmdline_parse_etheraddr.c
index 53760d8..5e11631 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_etheraddr.c
+++ b/lib/librte_cmdline/cmdline_parse_etheraddr.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.h b/lib/librte_cmdline/cmdline_parse_etheraddr.h
index 90cc579..4427e40 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_etheraddr.h
+++ b/lib/librte_cmdline/cmdline_parse_etheraddr.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/librte_cmdline/cmdline_parse_ipaddr.c
index 2861fc7..501f35b 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_ipaddr.c
+++ b/lib/librte_cmdline/cmdline_parse_ipaddr.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.h b/lib/librte_cmdline/cmdline_parse_ipaddr.h
index bdc7e3b..0e2f490 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_ipaddr.h
+++ b/lib/librte_cmdline/cmdline_parse_ipaddr.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c
index dc0c628..832310d 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_num.c
+++ b/lib/librte_cmdline/cmdline_parse_num.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_num.h b/lib/librte_cmdline/cmdline_parse_num.h
index 249cf0e..77f2f9b 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_num.h
+++ b/lib/librte_cmdline/cmdline_parse_num.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_portlist.c b/lib/librte_cmdline/cmdline_parse_portlist.c
index e997f30..d7a93cc 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_portlist.c
+++ b/lib/librte_cmdline/cmdline_parse_portlist.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_portlist.h b/lib/librte_cmdline/cmdline_parse_portlist.h
index 7c34c8f..6fdc406 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_portlist.h
+++ b/lib/librte_cmdline/cmdline_parse_portlist.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_string.c b/lib/librte_cmdline/cmdline_parse_string.c
index d0d432b..cbad6fb 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_string.c
+++ b/lib/librte_cmdline/cmdline_parse_string.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_parse_string.h b/lib/librte_cmdline/cmdline_parse_string.h
index 56d88a0..52c916c 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_string.h
+++ b/lib/librte_cmdline/cmdline_parse_string.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_rdline.c b/lib/librte_cmdline/cmdline_rdline.c
index eb2023a..f79ebe3 100644 (file)
--- a/lib/librte_cmdline/cmdline_rdline.c
+++ b/lib/librte_cmdline/cmdline_rdline.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_rdline.h b/lib/librte_cmdline/cmdline_rdline.h
index a2fc9a8..ae6e24e 100644 (file)
--- a/lib/librte_cmdline/cmdline_rdline.h
+++ b/lib/librte_cmdline/cmdline_rdline.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_socket.c b/lib/librte_cmdline/cmdline_socket.c
index f287690..b51b537 100644 (file)
--- a/lib/librte_cmdline/cmdline_socket.c
+++ b/lib/librte_cmdline/cmdline_socket.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_socket.h b/lib/librte_cmdline/cmdline_socket.h
index fa632ea..8cc2dfb 100644 (file)
--- a/lib/librte_cmdline/cmdline_socket.h
+++ b/lib/librte_cmdline/cmdline_socket.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_vt100.c b/lib/librte_cmdline/cmdline_vt100.c
index cc89eab..a253e8b 100644 (file)
--- a/lib/librte_cmdline/cmdline_vt100.c
+++ b/lib/librte_cmdline/cmdline_vt100.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_cmdline/cmdline_vt100.h b/lib/librte_cmdline/cmdline_vt100.h
index 1e773bb..b9840f6 100644 (file)
--- a/lib/librte_cmdline/cmdline_vt100.h
+++ b/lib/librte_cmdline/cmdline_vt100.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile
index 586fddc..3e1441b 100644 (file)
--- a/lib/librte_eal/Makefile
+++ b/lib/librte_eal/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_eal/bsdapp/Makefile b/lib/librte_eal/bsdapp/Makefile
index 22fc4a3..5754820 100644 (file)
--- a/lib/librte_eal/bsdapp/Makefile
+++ b/lib/librte_eal/bsdapp/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_eal/bsdapp/contigmem/BSDmakefile b/lib/librte_eal/bsdapp/contigmem/BSDmakefile
index 9af486d..f64374c 100644 (file)
--- a/lib/librte_eal/bsdapp/contigmem/BSDmakefile
+++ b/lib/librte_eal/bsdapp/contigmem/BSDmakefile
@@ -1,33 +1,33 @@
-#   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 
-#       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 
-#       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 
-#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+#   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
+#       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
+#       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
+#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #
 
 KMOD=  contigmem
 #
 
 KMOD=  contigmem

diff --git a/lib/librte_eal/bsdapp/contigmem/Makefile b/lib/librte_eal/bsdapp/contigmem/Makefile
index 1818501..bab005f 100644 (file)
--- a/lib/librte_eal/bsdapp/contigmem/Makefile
+++ b/lib/librte_eal/bsdapp/contigmem/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -39,7 +39,7 @@ MODULE = contigmem
 #
 # CFLAGS
 #
 #
 # CFLAGS
 #

-MODULE_CFLAGS += -I$(SRCDIR) 
+MODULE_CFLAGS += -I$(SRCDIR)

 MODULE_CFLAGS += -I$(RTE_OUTPUT)/include
 MODULE_CFLAGS += -Winline -Wall -Werror
 MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
 MODULE_CFLAGS += -I$(RTE_OUTPUT)/include
 MODULE_CFLAGS += -Winline -Wall -Werror
 MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h

diff --git a/lib/librte_eal/bsdapp/contigmem/contigmem.c b/lib/librte_eal/bsdapp/contigmem/contigmem.c
index dfe3a90..b71474a 100644 (file)
--- a/lib/librte_eal/bsdapp/contigmem/contigmem.c
+++ b/lib/librte_eal/bsdapp/contigmem/contigmem.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -192,7 +192,7 @@ contigmem_physaddr(SYSCTL_HANDLER_ARGS)
        uint64_t        physaddr;
        int             index = (int)(uintptr_t)arg1;
 
        uint64_t        physaddr;
        int             index = (int)(uintptr_t)arg1;
 

-       physaddr = (uint64_t)vtophys(contigmem_buffers[index]); 
+       physaddr = (uint64_t)vtophys(contigmem_buffers[index]);

        return (sysctl_handle_64(oidp, &physaddr, 0, req));
 }
 
        return (sysctl_handle_64(oidp, &physaddr, 0, req));
 }
 


@@ -224,7 +224,7 @@ contigmem_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, vm_size_t size,
        if ((*offset/PAGE_SIZE) >= contigmem_num_buffers)
                return (EINVAL);
 
        if ((*offset/PAGE_SIZE) >= contigmem_num_buffers)
                return (EINVAL);
 

-       *offset = (vm_ooffset_t)vtophys(contigmem_buffers[*offset/PAGE_SIZE]); 
+       *offset = (vm_ooffset_t)vtophys(contigmem_buffers[*offset/PAGE_SIZE]);

        *obj = vm_pager_allocate(OBJT_DEVICE, cdev, size, nprot, *offset,
                        curthread->td_ucred);
 
        *obj = vm_pager_allocate(OBJT_DEVICE, cdev, size, nprot, *offset,
                        curthread->td_ucred);
 

diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile
index d9d9861..8f44273 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index fab9eca..a1f014f 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.

- * 
+ *

  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
  *   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
  *     * 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


@@ -18,7 +18,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.
  *     * 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
  *   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


@@ -247,7 +247,7 @@ rte_eal_config_attach(void)
                        rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
        }
 
                        rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
        }
 

-       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config), 
+       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config),

                                PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
        close(mem_cfg_fd);
        if (rte_mem_cfg_addr == MAP_FAILED)
                                PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
        close(mem_cfg_fd);
        if (rte_mem_cfg_addr == MAP_FAILED)


@@ -322,8 +322,7 @@ eal_usage(const char *prgname)
               "  --"OPT_VDEV": add a virtual device.\n"
               "               The argument format is <driver><id>[,key=val,...]\n"
               "               (ex: --vdev=eth_pcap0,iface=eth2).\n"
               "  --"OPT_VDEV": add a virtual device.\n"
               "               The argument format is <driver><id>[,key=val,...]\n"
               "               (ex: --vdev=eth_pcap0,iface=eth2).\n"

-              "  --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of "
-                          "native RDTSC\n"
+              "  --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of native RDTSC\n"

               "\nEAL options for DEBUG use only:\n"
               "  --"OPT_NO_HUGE"  : use malloc instead of hugetlbfs\n"
               "  --"OPT_NO_PCI"   : disable pci\n"
               "\nEAL options for DEBUG use only:\n"
               "  --"OPT_NO_HUGE"  : use malloc instead of hugetlbfs\n"
               "  --"OPT_NO_PCI"   : disable pci\n"


@@ -358,11 +357,11 @@ rte_set_application_usage_hook( rte_usage_hook_t usage_func )
 static int xdigit2val(unsigned char c)
 {
        int val;
 static int xdigit2val(unsigned char c)
 {
        int val;

-       if(isdigit(c)) 
+       if(isdigit(c))

                val = c - '0';
        else if(isupper(c))
                val = c - 'A' + 10;
                val = c - '0';
        else if(isupper(c))
                val = c - 'A' + 10;

-       else 
+       else

                val = c - 'a' + 10;
        return val;
 }
                val = c - 'a' + 10;
        return val;
 }


@@ -766,7 +765,7 @@ sync_func(__attribute__((unused)) void *arg)
        return 0;
 }
 
        return 0;
 }
 

-inline static void 
+inline static void

 rte_eal_mcfg_complete(void)
 {
        /* ALL shared mem_config related INIT DONE */
 rte_eal_mcfg_complete(void)
 {
        /* ALL shared mem_config related INIT DONE */

diff --git a/lib/librte_eal/bsdapp/eal/eal_alarm.c b/lib/librte_eal/bsdapp/eal/eal_alarm.c
index 77d30f2..204df85 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_alarm.c
+++ b/lib/librte_eal/bsdapp/eal/eal_alarm.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -45,15 +45,15 @@ rte_eal_alarm_init(void)
 
 
 int
 
 
 int

-rte_eal_alarm_set(uint64_t us __rte_unused, 
-               rte_eal_alarm_callback cb_fn __rte_unused, 
+rte_eal_alarm_set(uint64_t us __rte_unused,
+               rte_eal_alarm_callback cb_fn __rte_unused,

                void *cb_arg __rte_unused)
 {
        return -ENOTSUP;
 }
 
 int
                void *cb_arg __rte_unused)
 {
        return -ENOTSUP;
 }
 
 int

-rte_eal_alarm_cancel(rte_eal_alarm_callback cb_fn __rte_unused, 
+rte_eal_alarm_cancel(rte_eal_alarm_callback cb_fn __rte_unused,

                void *cb_arg __rte_unused)
 {
        return -ENOTSUP;
                void *cb_arg __rte_unused)
 {
        return -ENOTSUP;

diff --git a/lib/librte_eal/bsdapp/eal/eal_debug.c b/lib/librte_eal/bsdapp/eal/eal_debug.c
index 7dd3eb9..44fc4f3 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_debug.c
+++ b/lib/librte_eal/bsdapp/eal/eal_debug.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
index dae3c8b..24248fb 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -114,7 +114,7 @@ eal_hugepage_info_init(void)
        hpi->hugepage_sz = buffer_size;
        hpi->num_pages[0] = num_buffers;
        hpi->lock_descriptor = fd;
        hpi->hugepage_sz = buffer_size;
        hpi->num_pages[0] = num_buffers;
        hpi->lock_descriptor = fd;

-       
+

        tmp_hpi = create_shared_memory(eal_hugepage_info_path(),
                                        sizeof(struct hugepage_info));
        if (tmp_hpi == NULL ) {
        tmp_hpi = create_shared_memory(eal_hugepage_info_path(),
                                        sizeof(struct hugepage_info));
        if (tmp_hpi == NULL ) {


@@ -128,6 +128,6 @@ eal_hugepage_info_init(void)
                RTE_LOG(ERR, EAL, "Failed to unmap shared memory!\n");
                return -1;
        }
                RTE_LOG(ERR, EAL, "Failed to unmap shared memory!\n");
                return -1;
        }

-       
+

        return 0;
 }
        return 0;
 }

diff --git a/lib/librte_eal/bsdapp/eal/eal_interrupts.c b/lib/librte_eal/bsdapp/eal/eal_interrupts.c
index dafece5..cb7d4f1 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/bsdapp/eal/eal_interrupts.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -37,7 +37,7 @@
 
 int
 rte_intr_callback_register(struct rte_intr_handle *intr_handle __rte_unused,
 
 int
 rte_intr_callback_register(struct rte_intr_handle *intr_handle __rte_unused,

-                       rte_intr_callback_fn cb __rte_unused, 
+                       rte_intr_callback_fn cb __rte_unused,

                        void *cb_arg __rte_unused)
 {
        return -ENOTSUP;
                        void *cb_arg __rte_unused)
 {
        return -ENOTSUP;


@@ -45,7 +45,7 @@ rte_intr_callback_register(struct rte_intr_handle *intr_handle __rte_unused,
 
 int
 rte_intr_callback_unregister(struct rte_intr_handle *intr_handle __rte_unused,
 
 int
 rte_intr_callback_unregister(struct rte_intr_handle *intr_handle __rte_unused,

-                       rte_intr_callback_fn cb_fn __rte_unused, 
+                       rte_intr_callback_fn cb_fn __rte_unused,

                        void *cb_arg __rte_unused)
 {
        return -ENOTSUP;
                        void *cb_arg __rte_unused)
 {
        return -ENOTSUP;

diff --git a/lib/librte_eal/bsdapp/eal/eal_lcore.c b/lib/librte_eal/bsdapp/eal/eal_lcore.c
index 807bfac..43a5c01 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_lcore.c
+++ b/lib/librte_eal/bsdapp/eal/eal_lcore.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/eal_log.c b/lib/librte_eal/bsdapp/eal/eal_log.c
index 55b7376..a425f7a 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_log.c
+++ b/lib/librte_eal/bsdapp/eal/eal_log.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c
index 65aabf2..736b3bf 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_memory.c
+++ b/lib/librte_eal/bsdapp/eal/eal_memory.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -137,7 +137,7 @@ rte_eal_contigmem_attach(void)
        int fd_hugepage_info, fd_hugepage = -1;
        unsigned i = 0;
        struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
        int fd_hugepage_info, fd_hugepage = -1;
        unsigned i = 0;
        struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;

-    
+

        /* Obtain a file descriptor for hugepage_info */
        fd_hugepage_info = open(eal_hugepage_info_path(), O_RDONLY);
        if (fd_hugepage_info < 0) {
        /* Obtain a file descriptor for hugepage_info */
        fd_hugepage_info = open(eal_hugepage_info_path(), O_RDONLY);
        if (fd_hugepage_info < 0) {


@@ -173,7 +173,7 @@ rte_eal_contigmem_attach(void)
                                i, hpi->hugedir);
                        goto error;
                }
                                i, hpi->hugedir);
                        goto error;
                }

-        
+

        }
 
        /* hugepage_info is no longer required */
        }
 
        /* hugepage_info is no longer required */

diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c
index 5c4d81b..b560077 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -360,7 +360,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
        /* device is valid, add in list (sorted) */
        if (TAILQ_EMPTY(&pci_device_list)) {
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        /* device is valid, add in list (sorted) */
        if (TAILQ_EMPTY(&pci_device_list)) {
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);

-       }       
+       }

        else {
                struct rte_pci_device *dev2 = NULL;
 
        else {
                struct rte_pci_device *dev2 = NULL;
 


@@ -374,7 +374,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
                }
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        }
                }
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        }

-                               
+

        return 0;
 
 skipdev:
        return 0;
 
 skipdev:

diff --git a/lib/librte_eal/bsdapp/eal/eal_thread.c b/lib/librte_eal/bsdapp/eal/eal_thread.c
index d2bec2e..ab05368 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_thread.c
+++ b/lib/librte_eal/bsdapp/eal/eal_thread.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/eal_timer.c b/lib/librte_eal/bsdapp/eal/eal_timer.c
index b6cea17..9ac3f2e 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_timer.c
+++ b/lib/librte_eal/bsdapp/eal/eal_timer.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/include/eal_filesystem.h b/lib/librte_eal/bsdapp/eal/include/eal_filesystem.h
index 034e58d..6609e08 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/include/eal_filesystem.h
+++ b/lib/librte_eal/bsdapp/eal/include/eal_filesystem.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/include/eal_hugepages.h b/lib/librte_eal/bsdapp/eal/include/eal_hugepages.h
index 064cdb0..51e090b 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/include/eal_hugepages.h
+++ b/lib/librte_eal/bsdapp/eal/include/eal_hugepages.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/include/eal_internal_cfg.h b/lib/librte_eal/bsdapp/eal/include/eal_internal_cfg.h
index 643db7c..2d06c7f 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/include/eal_internal_cfg.h
+++ b/lib/librte_eal/bsdapp/eal/include/eal_internal_cfg.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/include/eal_thread.h b/lib/librte_eal/bsdapp/eal/include/eal_thread.h
index c21b4b0..d029ad3 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/include/eal_thread.h
+++ b/lib/librte_eal/bsdapp/eal/include/eal_thread.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_dom0_common.h b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_dom0_common.h
index ea05d58..99a3343 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_dom0_common.h
+++ b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_dom0_common.h
@@ -1,37 +1,37 @@
 /*-
  *   This file is provided under a dual BSD/LGPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
 /*-
  *   This file is provided under a dual BSD/LGPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.

- * 
+ *

  *   GNU LESSER GENERAL PUBLIC LICENSE
  *   GNU LESSER GENERAL PUBLIC LICENSE

- * 
+ *

  *   Copyright(c) 2007-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2007-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2.1 of the GNU Lesser General Public License
  *   as published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2.1 of the GNU Lesser General Public License
  *   as published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   Lesser General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   Lesser General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  *   Contact Information:
  *   Intel Corporation

- * 
- * 
+ *
+ *

  *   BSD LICENSE
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *   * 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


@@ -41,7 +41,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.
  *   * 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
  *    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


@@ -53,7 +53,7 @@
  *    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.
  *    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.

- * 
+ *

  */
 
 #ifndef _RTE_DOM0_COMMON_H_
  */
 
 #ifndef _RTE_DOM0_COMMON_H_


@@ -63,11 +63,11 @@
 #include <linux/if.h>
 #endif
 
 #include <linux/if.h>
 #endif
 

-#define DOM0_NAME_MAX   256 
+#define DOM0_NAME_MAX   256

 #define DOM0_MM_DEV   "/dev/dom0_mm"
 
 #define DOM0_CONTIG_NUM_ORDER       9       /**< 2M order */
 #define DOM0_MM_DEV   "/dev/dom0_mm"
 
 #define DOM0_CONTIG_NUM_ORDER       9       /**< 2M order */

-#define DOM0_NUM_MEMSEG             512     /**< Maximum nb. of memory segment. */ 
+#define DOM0_NUM_MEMSEG             512     /**< Maximum nb. of memory segment. */

 #define DOM0_MEMBLOCK_SIZE          0x200000 /**< Maximum nb. of memory block(2M). */
 #define DOM0_CONFIG_MEMSIZE         4096     /**< Maximum config memory size(4G). */
 #define DOM0_NUM_MEMBLOCK (DOM0_CONFIG_MEMSIZE / 2) /**< Maximum nb. of 2M memory block. */
 #define DOM0_MEMBLOCK_SIZE          0x200000 /**< Maximum nb. of memory block(2M). */
 #define DOM0_CONFIG_MEMSIZE         4096     /**< Maximum config memory size(4G). */
 #define DOM0_NUM_MEMBLOCK (DOM0_CONFIG_MEMSIZE / 2) /**< Maximum nb. of 2M memory block. */


@@ -78,7 +78,7 @@
 #define RTE_DOM0_IOCTL_GET_MEMSEG_INFO   _IOWR(0, 4, void *)
 
 /**
 #define RTE_DOM0_IOCTL_GET_MEMSEG_INFO   _IOWR(0, 4, void *)
 
 /**

- * A structure used to store memory information. 
+ * A structure used to store memory information.

  */
 struct memory_info {
        char name[DOM0_NAME_MAX];
  */
 struct memory_info {
        char name[DOM0_NAME_MAX];


@@ -96,7 +96,7 @@ struct memseg_info {
 };
 
 /**
 };
 
 /**

- * A structure used to store memory block information. 
+ * A structure used to store memory block information.

  */
 struct memblock_info {
        uint8_t  exchange_flag;
  */
 struct memblock_info {
        uint8_t  exchange_flag;

diff --git a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
index 6733948..87a9cf6 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
+++ b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_kni_common.h
index e13afb2..d0b82da 100755 (executable)
--- a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_kni_common.h
+++ b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_kni_common.h
@@ -1,37 +1,37 @@
 /*-
  *   This file is provided under a dual BSD/LGPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
 /*-
  *   This file is provided under a dual BSD/LGPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.

- * 
+ *

  *   GNU LESSER GENERAL PUBLIC LICENSE
  *   GNU LESSER GENERAL PUBLIC LICENSE

- * 
+ *

  *   Copyright(c) 2007-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2007-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2.1 of the GNU Lesser General Public License
  *   as published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2.1 of the GNU Lesser General Public License
  *   as published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   Lesser General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   Lesser General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  *   Contact Information:
  *   Intel Corporation

- * 
- * 
+ *
+ *

  *   BSD LICENSE
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *   * 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


@@ -41,7 +41,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.
  *   * 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
  *    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


@@ -53,7 +53,7 @@
  *    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.
  *    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.

- * 
+ *

  */
 
 #ifndef _RTE_KNI_COMMON_H_
  */
 
 #ifndef _RTE_KNI_COMMON_H_

diff --git a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_lcore.h b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_lcore.h
index 57499b7..e19ab54 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_lcore.h
+++ b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_lcore.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_per_lcore.h b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_per_lcore.h
index 173c634..db8f274 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_per_lcore.h
+++ b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_per_lcore.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/bsdapp/nic_uio/BSDmakefile b/lib/librte_eal/bsdapp/nic_uio/BSDmakefile
index ef3929b..5454ed8 100644 (file)
--- a/lib/librte_eal/bsdapp/nic_uio/BSDmakefile
+++ b/lib/librte_eal/bsdapp/nic_uio/BSDmakefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_eal/bsdapp/nic_uio/Makefile b/lib/librte_eal/bsdapp/nic_uio/Makefile
index 60094dc..8995761 100644 (file)
--- a/lib/librte_eal/bsdapp/nic_uio/Makefile
+++ b/lib/librte_eal/bsdapp/nic_uio/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -39,7 +39,7 @@ MODULE = nic_uio
 #
 # CFLAGS
 #
 #
 # CFLAGS
 #

-MODULE_CFLAGS += -I$(SRCDIR) 
+MODULE_CFLAGS += -I$(SRCDIR)

 MODULE_CFLAGS += -I$(RTE_OUTPUT)/include
 MODULE_CFLAGS += -Winline -Wall -Werror
 MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
 MODULE_CFLAGS += -I$(RTE_OUTPUT)/include
 MODULE_CFLAGS += -Winline -Wall -Werror
 MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h

diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
index c10e9aa..3fe6f1c 100644 (file)
--- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
+++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
@@ -1,13 +1,13 @@
 /* -
  *   BSD LICENSE
 /* -
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -235,7 +235,7 @@ nic_uio_detach(device_t dev)
                        if (PCI_BAR_IO(pci_read_config(dev, sc->bar_id[i], 4)))
                                bus_release_resource(dev, SYS_RES_IOPORT, sc->bar_id[i],
                                                sc->bar_res[i]);
                        if (PCI_BAR_IO(pci_read_config(dev, sc->bar_id[i], 4)))
                                bus_release_resource(dev, SYS_RES_IOPORT, sc->bar_id[i],
                                                sc->bar_res[i]);

-                       else 
+                       else

                                bus_release_resource(dev, SYS_RES_MEMORY, sc->bar_id[i],
                                                sc->bar_res[i]);
                }
                                bus_release_resource(dev, SYS_RES_MEMORY, sc->bar_id[i],
                                                sc->bar_res[i]);
                }


@@ -286,7 +286,7 @@ nic_uio_load(void)
 
                dev = pci_find_bsf(bus, device, function);
                if (dev != NULL)
 
                dev = pci_find_bsf(bus, device, function);
                if (dev != NULL)

-                       for (i = 0; i < NUM_DEVICES; i++) 
+                       for (i = 0; i < NUM_DEVICES; i++)

                                if (pci_get_vendor(dev) == devices[i].vend &&
                                                pci_get_device(dev) == devices[i].dev)
                                                        device_detach(dev);
                                if (pci_get_vendor(dev) == devices[i].vend &&
                                                pci_get_device(dev) == devices[i].dev)
                                                        device_detach(dev);

diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile
index 0016fc5..3812c95 100644 (file)
--- a/lib/librte_eal/common/Makefile
+++ b/lib/librte_eal/common/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_eal/common/eal_common_cpuflags.c b/lib/librte_eal/common/eal_common_cpuflags.c
index 5c0927c..9e79179 100644 (file)
--- a/lib/librte_eal/common/eal_common_cpuflags.c
+++ b/lib/librte_eal/common/eal_common_cpuflags.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index 8c42738..eae5656 100644 (file)
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.

- * 
+ *

  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
  *   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
  *     * 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


@@ -18,7 +18,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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/eal_common_errno.c b/lib/librte_eal/common/eal_common_errno.c
index 0243816..cd8144a 100644 (file)
--- a/lib/librte_eal/common/eal_common_errno.c
+++ b/lib/librte_eal/common/eal_common_errno.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/eal_common_hexdump.c b/lib/librte_eal/common/eal_common_hexdump.c
index 4b91e0d..ddcb791 100755 (executable)
--- a/lib/librte_eal/common/eal_common_hexdump.c
+++ b/lib/librte_eal/common/eal_common_hexdump.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/eal_common_launch.c b/lib/librte_eal/common/eal_common_launch.c
index 6f7c696..599f83b 100644 (file)
--- a/lib/librte_eal/common/eal_common_launch.c
+++ b/lib/librte_eal/common/eal_common_launch.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c
index acf8977..e4df0b9 100644 (file)
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -298,8 +298,8 @@ rte_eal_common_log_init(FILE *default_log)
                                NULL, NULL,
                                NULL, NULL,
                                SOCKET_ID_ANY, 0);
                                NULL, NULL,
                                NULL, NULL,
                                SOCKET_ID_ANY, 0);

-       
-       if ((log_history_mp == NULL) && 
+
+       if ((log_history_mp == NULL) &&

            ((log_history_mp = rte_mempool_lookup(LOG_HISTORY_MP_NAME)) == NULL)){
                RTE_LOG(ERR, EAL, "%s(): cannot create log_history mempool\n",
                        __func__);
            ((log_history_mp = rte_mempool_lookup(LOG_HISTORY_MP_NAME)) == NULL)){
                RTE_LOG(ERR, EAL, "%s(): cannot create log_history mempool\n",
                        __func__);

diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index e015235..412b432 100644 (file)
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c
index 3918688..524a61c 100644 (file)
--- a/lib/librte_eal/common/eal_common_memzone.c
+++ b/lib/librte_eal/common/eal_common_memzone.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -70,7 +70,7 @@ memzone_lookup_thread_unsafe(const char *name)
         * zones and this function should be called at init only
         */
        for (i = 0; i < RTE_MAX_MEMZONE && mcfg->memzone[i].addr != NULL; i++) {
         * zones and this function should be called at init only
         */
        for (i = 0; i < RTE_MAX_MEMZONE && mcfg->memzone[i].addr != NULL; i++) {

-               if (!strncmp(name, mcfg->memzone[i].name, RTE_MEMZONE_NAMESIZE)) 
+               if (!strncmp(name, mcfg->memzone[i].name, RTE_MEMZONE_NAMESIZE))

                        return &mcfg->memzone[i];
        }
 
                        return &mcfg->memzone[i];
        }
 


@@ -373,7 +373,7 @@ rte_memzone_lookup(const char *name)
        const struct rte_memzone *memzone = NULL;
 
        mcfg = rte_eal_get_configuration()->mem_config;
        const struct rte_memzone *memzone = NULL;
 
        mcfg = rte_eal_get_configuration()->mem_config;

-       
+

        rte_rwlock_read_lock(&mcfg->mlock);
 
        memzone = memzone_lookup_thread_unsafe(name);
        rte_rwlock_read_lock(&mcfg->mlock);
 
        memzone = memzone_lookup_thread_unsafe(name);


@@ -464,7 +464,7 @@ rte_eal_memzone_init(void)
 
        /* mirror the runtime memsegs from config */
        free_memseg = mcfg->free_memseg;
 
        /* mirror the runtime memsegs from config */
        free_memseg = mcfg->free_memseg;

-       
+

        /* secondary processes don't need to initialise anything */
        if (rte_eal_process_type() == RTE_PROC_SECONDARY)
                return 0;
        /* secondary processes don't need to initialise anything */
        if (rte_eal_process_type() == RTE_PROC_SECONDARY)
                return 0;

diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index 7c23e86..4d877ea 100644 (file)
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -183,7 +183,7 @@ pci_dump_one_device(FILE *f, struct rte_pci_device *dev)
        for (i = 0; i != sizeof(dev->mem_resource) /
                sizeof(dev->mem_resource[0]); i++) {
                fprintf(f, "   %16.16"PRIx64" %16.16"PRIx64"\n",
        for (i = 0; i != sizeof(dev->mem_resource) /
                sizeof(dev->mem_resource[0]); i++) {
                fprintf(f, "   %16.16"PRIx64" %16.16"PRIx64"\n",

-                       dev->mem_resource[i].phys_addr, 
+                       dev->mem_resource[i].phys_addr,

                        dev->mem_resource[i].len);
        }
        return 0;
                        dev->mem_resource[i].len);
        }
        return 0;

diff --git a/lib/librte_eal/common/eal_common_tailqs.c b/lib/librte_eal/common/eal_common_tailqs.c
index e7b90c4..f294a58 100644 (file)
--- a/lib/librte_eal/common/eal_common_tailqs.c
+++ b/lib/librte_eal/common/eal_common_tailqs.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -131,7 +131,7 @@ int
 rte_eal_tailqs_init(void)
 {
        unsigned i;
 rte_eal_tailqs_init(void)
 {
        unsigned i;

-       struct rte_mem_config *mcfg = NULL; 
+       struct rte_mem_config *mcfg = NULL;

 
        RTE_BUILD_BUG_ON(RTE_MAX_TAILQ < RTE_TAILQ_NUM);
 
 
        RTE_BUILD_BUG_ON(RTE_MAX_TAILQ < RTE_TAILQ_NUM);
 

diff --git a/lib/librte_eal/common/include/eal_private.h b/lib/librte_eal/common/include/eal_private.h
index b99ad23..232fcec 100644 (file)
--- a/lib/librte_eal/common/include/eal_private.h
+++ b/lib/librte_eal/common/include/eal_private.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/i686/arch/rte_atomic.h b/lib/librte_eal/common/include/i686/arch/rte_atomic.h
index e5e7d0c..6956b87 100644 (file)
--- a/lib/librte_eal/common/include/i686/arch/rte_atomic.h
+++ b/lib/librte_eal/common/include/i686/arch/rte_atomic.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_alarm.h b/lib/librte_eal/common/include/rte_alarm.h
index 16e4794..d451522 100644 (file)
--- a/lib/librte_eal/common/include/rte_alarm.h
+++ b/lib/librte_eal/common/include/rte_alarm.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_atomic.h b/lib/librte_eal/common/include/rte_atomic.h
index ef95160..a5b6eec 100644 (file)
--- a/lib/librte_eal/common/include/rte_atomic.h
+++ b/lib/librte_eal/common/include/rte_atomic.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -84,7 +84,7 @@ extern "C" {
 /**
  * Compiler barrier.
  *
 /**
  * Compiler barrier.
  *

- * Guarantees that operation reordering does not occur at compile time 
+ * Guarantees that operation reordering does not occur at compile time

  * for operations directly before and after the barrier.
  */
 #define        rte_compiler_barrier() do {             \
  * for operations directly before and after the barrier.
  */
 #define        rte_compiler_barrier() do {             \

diff --git a/lib/librte_eal/common/include/rte_branch_prediction.h b/lib/librte_eal/common/include/rte_branch_prediction.h
index 390dae0..a6a56d1 100644 (file)
--- a/lib/librte_eal/common/include/rte_branch_prediction.h
+++ b/lib/librte_eal/common/include/rte_branch_prediction.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_byteorder.h b/lib/librte_eal/common/include/rte_byteorder.h
index 8451440..30fbd56 100644 (file)
--- a/lib/librte_eal/common/include/rte_byteorder.h
+++ b/lib/librte_eal/common/include/rte_byteorder.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
index b6ea7f0..921b91f 100644 (file)
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_cpuflags.h b/lib/librte_eal/common/include/rte_cpuflags.h
index 989b535..5fa96db 100644 (file)
--- a/lib/librte_eal/common/include/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/rte_cpuflags.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_cycles.h b/lib/librte_eal/common/include/rte_cycles.h
index 91904a0..9b4dbe1 100644 (file)
--- a/lib/librte_eal/common/include/rte_cycles.h
+++ b/lib/librte_eal/common/include/rte_cycles.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_debug.h b/lib/librte_eal/common/include/rte_debug.h
index 9cd818c..82ee3b3 100644 (file)
--- a/lib/librte_eal/common/include/rte_debug.h
+++ b/lib/librte_eal/common/include/rte_debug.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index fc2c68f..273da9a 100644 (file)
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -179,7 +179,7 @@ rte_usage_hook_t
 rte_set_application_usage_hook( rte_usage_hook_t usage_func );
 
 /**
 rte_set_application_usage_hook( rte_usage_hook_t usage_func );
 
 /**

- * macro to get the lock of tailq in mem_config 
+ * macro to get the lock of tailq in mem_config

  */
 #define RTE_EAL_TAILQ_RWLOCK         (&rte_eal_get_configuration()->mem_config->qlock)
 
  */
 #define RTE_EAL_TAILQ_RWLOCK         (&rte_eal_get_configuration()->mem_config->qlock)
 


@@ -208,7 +208,7 @@ rte_set_application_usage_hook( rte_usage_hook_t usage_func );
        rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);            \
        TAILQ_INSERT_TAIL(list, elm, next);                     \
        rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);          \
        rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);            \
        TAILQ_INSERT_TAIL(list, elm, next);                     \
        rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);          \

-} while (0)  
+} while (0)

 
 /**
  * Utility macro to do a thread-safe tailq 'REMOVE' of rte_mem_config
 
 /**
  * Utility macro to do a thread-safe tailq 'REMOVE' of rte_mem_config

diff --git a/lib/librte_eal/common/include/rte_eal_memconfig.h b/lib/librte_eal/common/include/rte_eal_memconfig.h
index 3531d69..30ce6fc 100644 (file)
--- a/lib/librte_eal/common/include/rte_eal_memconfig.h
+++ b/lib/librte_eal/common/include/rte_eal_memconfig.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -46,7 +46,7 @@ extern "C" {
 
 /**
  * Index type of tailq_head
 
 /**
  * Index type of tailq_head

- */ 
+ */

 enum rte_tailq_t {
 #define rte_tailq_elem(idx, name)     idx,
 #define rte_tailq_end(idx)            idx
 enum rte_tailq_t {
 #define rte_tailq_elem(idx, name)     idx,
 #define rte_tailq_end(idx)            idx


@@ -65,7 +65,7 @@ struct rte_mem_config {
        uint32_t nchannel;    /**< Number of channels (0 if unknown). */
        uint32_t nrank;       /**< Number of ranks (0 if unknown). */
 
        uint32_t nchannel;    /**< Number of channels (0 if unknown). */
        uint32_t nrank;       /**< Number of ranks (0 if unknown). */
 

-       /** 
+       /**

         * current lock nest order
         *  - qlock->mlock (ring/hash/lpm)
         *  - mplock->qlock->mlock (mempool)
         * current lock nest order
         *  - qlock->mlock (ring/hash/lpm)
         *  - mplock->qlock->mlock (mempool)

diff --git a/lib/librte_eal/common/include/rte_errno.h b/lib/librte_eal/common/include/rte_errno.h
index ec2d9af..45910cd 100644 (file)
--- a/lib/librte_eal/common/include/rte_errno.h
+++ b/lib/librte_eal/common/include/rte_errno.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_hexdump.h b/lib/librte_eal/common/include/rte_hexdump.h
index db08d30..d8176d8 100644 (file)
--- a/lib/librte_eal/common/include/rte_hexdump.h
+++ b/lib/librte_eal/common/include/rte_hexdump.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_interrupts.h b/lib/librte_eal/common/include/rte_interrupts.h
index 61854f9..609c34b 100644 (file)
--- a/lib/librte_eal/common/include/rte_interrupts.h
+++ b/lib/librte_eal/common/include/rte_interrupts.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_launch.h b/lib/librte_eal/common/include/rte_launch.h
index 99b1a77..dd1946d 100644 (file)
--- a/lib/librte_eal/common/include/rte_launch.h
+++ b/lib/librte_eal/common/include/rte_launch.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_lcore.h b/lib/librte_eal/common/include/rte_lcore.h
index de53310..3802a28 100644 (file)
--- a/lib/librte_eal/common/include/rte_lcore.h
+++ b/lib/librte_eal/common/include/rte_lcore.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_log.h b/lib/librte_eal/common/include/rte_log.h
index 3d44ded..8bb5df9 100644 (file)
--- a/lib/librte_eal/common/include/rte_log.h
+++ b/lib/librte_eal/common/include/rte_log.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_malloc_heap.h b/lib/librte_eal/common/include/rte_malloc_heap.h
index 5e139cf..fc4fd0a 100644 (file)
--- a/lib/librte_eal/common/include/rte_malloc_heap.h
+++ b/lib/librte_eal/common/include/rte_malloc_heap.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_memcpy.h b/lib/librte_eal/common/include/rte_memcpy.h
index beb95b8..131b196 100644 (file)
--- a/lib/librte_eal/common/include/rte_memcpy.h
+++ b/lib/librte_eal/common/include/rte_memcpy.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h
index 1313812..7f21244 100644 (file)
--- a/lib/librte_eal/common/include/rte_memory.h
+++ b/lib/librte_eal/common/include/rte_memory.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -94,7 +94,7 @@ struct rte_memseg {
        uint32_t nrank;             /**< Number of ranks. */
 #ifdef RTE_LIBRTE_XEN_DOM0
         /**< store segment MFNs */
        uint32_t nrank;             /**< Number of ranks. */
 #ifdef RTE_LIBRTE_XEN_DOM0
         /**< store segment MFNs */

-       uint64_t mfn[DOM0_NUM_MEMBLOCK]; 
+       uint64_t mfn[DOM0_NUM_MEMBLOCK];

 #endif
 } __attribute__((__packed__));
 
 #endif
 } __attribute__((__packed__));
 


@@ -175,7 +175,7 @@ unsigned rte_memory_get_nrank(void);
 /**
  * Return the physical address of elt, which is an element of the pool mp.
  *
 /**
  * Return the physical address of elt, which is an element of the pool mp.
  *

- * @param memseg_id 
+ * @param memseg_id

  *   The mempool is from which memory segment.
  * @param phy_addr
  *   physical address of elt.
  *   The mempool is from which memory segment.
  * @param phy_addr
  *   physical address of elt.


@@ -186,22 +186,22 @@ unsigned rte_memory_get_nrank(void);
 phys_addr_t rte_mem_phy2mch(uint32_t memseg_id, const phys_addr_t phy_addr);
 
 /**
 phys_addr_t rte_mem_phy2mch(uint32_t memseg_id, const phys_addr_t phy_addr);
 
 /**

- * Memory init for supporting application running on Xen domain0. 
- * 
- * @param void 
- * 
- * @return 
+ * Memory init for supporting application running on Xen domain0.
+ *
+ * @param void
+ *
+ * @return

  *       0: successfully
  *      negative: error
  *       0: successfully
  *      negative: error

- */ 
+ */

 int rte_xen_dom0_memory_init(void);
 
 /**
 int rte_xen_dom0_memory_init(void);
 
 /**

- * Attach to memory setments of primary process on Xen domain0. 
- * 
- * @param void 
- * 
- * @return 
+ * Attach to memory setments of primary process on Xen domain0.
+ *
+ * @param void
+ *
+ * @return

  *       0: successfully
  *       negative: error
  */
  *       0: successfully
  *       negative: error
  */

diff --git a/lib/librte_eal/common/include/rte_memzone.h b/lib/librte_eal/common/include/rte_memzone.h
index 3a000e2..5014409 100644 (file)
--- a/lib/librte_eal/common/include/rte_memzone.h
+++ b/lib/librte_eal/common/include/rte_memzone.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h
index c793773..b56d7d3 100644 (file)
--- a/lib/librte_eal/common/include/rte_pci.h
+++ b/lib/librte_eal/common/include/rte_pci.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h
index a51c1ef..ee7f651 100644 (file)
--- a/lib/librte_eal/common/include/rte_pci_dev_ids.h
+++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h
@@ -1,38 +1,38 @@
 /*-
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
 /*-
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.

- * 
+ *

  *   GPL LICENSE SUMMARY
  *   GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  *   Contact Information:
  *   Intel Corporation

- * 
+ *

  *   BSD LICENSE
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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


@@ -42,7 +42,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.
  *     * 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
  *   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


@@ -54,7 +54,7 @@
  *   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.
  *   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.

- * 
+ *

  */
 
 /**
  */
 
 /**


@@ -470,7 +470,7 @@ RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X540_VF_HV)
 
 /****************** Virtio devices from virtio.h ******************/
 
 
 /****************** Virtio devices from virtio.h ******************/
 

-#define QUMRANET_DEV_ID_VIRTIO                         0x1000
+#define QUMRANET_DEV_ID_VIRTIO                  0x1000

 
 RTE_PCI_DEV_ID_DECL_VIRTIO(PCI_VENDOR_ID_QUMRANET, QUMRANET_DEV_ID_VIRTIO)
 
 
 RTE_PCI_DEV_ID_DECL_VIRTIO(PCI_VENDOR_ID_QUMRANET, QUMRANET_DEV_ID_VIRTIO)
 

diff --git a/lib/librte_eal/common/include/rte_per_lcore.h b/lib/librte_eal/common/include/rte_per_lcore.h
index cc20261..14d3521 100644 (file)
--- a/lib/librte_eal/common/include/rte_per_lcore.h
+++ b/lib/librte_eal/common/include/rte_per_lcore.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_prefetch.h b/lib/librte_eal/common/include/rte_prefetch.h
index f29e1e5..8a691ef 100644 (file)
--- a/lib/librte_eal/common/include/rte_prefetch.h
+++ b/lib/librte_eal/common/include/rte_prefetch.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_random.h b/lib/librte_eal/common/include/rte_random.h
index 41fb6c3..24ae836 100644 (file)
--- a/lib/librte_eal/common/include/rte_random.h
+++ b/lib/librte_eal/common/include/rte_random.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_rwlock.h b/lib/librte_eal/common/include/rte_rwlock.h
index 6c948d4..115731d 100644 (file)
--- a/lib/librte_eal/common/include/rte_rwlock.h
+++ b/lib/librte_eal/common/include/rte_rwlock.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_spinlock.h b/lib/librte_eal/common/include/rte_spinlock.h
index f79e424..661908d 100644 (file)
--- a/lib/librte_eal/common/include/rte_spinlock.h
+++ b/lib/librte_eal/common/include/rte_spinlock.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_string_fns.h b/lib/librte_eal/common/include/rte_string_fns.h
index cbcbc94..b933784 100644 (file)
--- a/lib/librte_eal/common/include/rte_string_fns.h
+++ b/lib/librte_eal/common/include/rte_string_fns.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_tailq.h b/lib/librte_eal/common/include/rte_tailq.h
index 0ddcc11..d084d9a 100644 (file)
--- a/lib/librte_eal/common/include/rte_tailq.h
+++ b/lib/librte_eal/common/include/rte_tailq.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_tailq_elem.h b/lib/librte_eal/common/include/rte_tailq_elem.h
index 2de4010..8ba08eb 100644 (file)
--- a/lib/librte_eal/common/include/rte_tailq_elem.h
+++ b/lib/librte_eal/common/include/rte_tailq_elem.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h
index e64cccc..78793e9 100644 (file)
--- a/lib/librte_eal/common/include/rte_version.h
+++ b/lib/librte_eal/common/include/rte_version.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/rte_warnings.h b/lib/librte_eal/common/include/rte_warnings.h
index 356cfe9..423e6fb 100644 (file)
--- a/lib/librte_eal/common/include/rte_warnings.h
+++ b/lib/librte_eal/common/include/rte_warnings.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/common/include/x86_64/arch/rte_atomic.h b/lib/librte_eal/common/include/x86_64/arch/rte_atomic.h
index 4759495..3ba7d3a 100644 (file)
--- a/lib/librte_eal/common/include/x86_64/arch/rte_atomic.h
+++ b/lib/librte_eal/common/include/x86_64/arch/rte_atomic.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/Makefile b/lib/librte_eal/linuxapp/Makefile
index b00e89f..9ff167c 100644 (file)
--- a/lib/librte_eal/linuxapp/Makefile
+++ b/lib/librte_eal/linuxapp/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile
index b052820..dad1f79 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/eal/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 9d2675b..070bdc9 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2012-2014 6WIND S.A.
  *   All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2012-2014 6WIND S.A.
  *   All rights reserved.

- * 
+ *

  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
  *   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
  *     * 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


@@ -18,7 +18,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.
  *     * 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
  *   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


@@ -256,7 +256,7 @@ rte_eal_config_attach(void)
                        rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
        }
 
                        rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
        }
 

-       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config), 
+       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config),

                                PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
        close(mem_cfg_fd);
        if (rte_mem_cfg_addr == MAP_FAILED)
                                PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
        close(mem_cfg_fd);
        if (rte_mem_cfg_addr == MAP_FAILED)


@@ -358,8 +358,7 @@ eal_usage(const char *prgname)
               "  --"OPT_VDEV": add a virtual device.\n"
               "               The argument format is <driver><id>[,key=val,...]\n"
               "               (ex: --vdev=eth_pcap0,iface=eth2).\n"
               "  --"OPT_VDEV": add a virtual device.\n"
               "               The argument format is <driver><id>[,key=val,...]\n"
               "               (ex: --vdev=eth_pcap0,iface=eth2).\n"

-              "  --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of "
-                          "native RDTSC\n"
+              "  --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of native RDTSC\n"

               "  --"OPT_BASE_VIRTADDR": specify base virtual address\n"
               "  --"OPT_CREATE_UIO_DEV": create /dev/uioX (usually done by hotplug)\n"
               "\nEAL options for DEBUG use only:\n"
               "  --"OPT_BASE_VIRTADDR": specify base virtual address\n"
               "  --"OPT_CREATE_UIO_DEV": create /dev/uioX (usually done by hotplug)\n"
               "\nEAL options for DEBUG use only:\n"


@@ -397,11 +396,11 @@ rte_set_application_usage_hook( rte_usage_hook_t usage_func )
 static int xdigit2val(unsigned char c)
 {
        int val;
 static int xdigit2val(unsigned char c)
 {
        int val;

-       if(isdigit(c)) 
+       if(isdigit(c))

                val = c - '0';
        else if(isupper(c))
                val = c - 'A' + 10;
                val = c - '0';
        else if(isupper(c))
                val = c - 'A' + 10;

-       else 
+       else

                val = c - 'a' + 10;
        return val;
 }
                val = c - 'a' + 10;
        return val;
 }


@@ -753,7 +752,7 @@ eal_parse_args(int argc, char **argv)
                                        "running on Dom0, please configure"
                                        " RTE_LIBRTE_XEN_DOM0=y\n");
                                return -1;
                                        "running on Dom0, please configure"
                                        " RTE_LIBRTE_XEN_DOM0=y\n");
                                return -1;

-               #endif 
+               #endif

                        }
                        else if (!strcmp(lgopts[option_index].name, OPT_NO_PCI)) {
                                internal_config.no_pci = 1;
                        }
                        else if (!strcmp(lgopts[option_index].name, OPT_NO_PCI)) {
                                internal_config.no_pci = 1;


@@ -932,7 +931,7 @@ sync_func(__attribute__((unused)) void *arg)
        return 0;
 }
 
        return 0;
 }
 

-inline static void 
+inline static void

 rte_eal_mcfg_complete(void)
 {
        /* ALL shared mem_config related INIT DONE */
 rte_eal_mcfg_complete(void)
 {
        /* ALL shared mem_config related INIT DONE */


@@ -1007,7 +1006,7 @@ rte_eal_init(int argc, char **argv)
 
        if (rte_eal_iopl_init() == 0)
                rte_config.flags |= EAL_FLG_HIGH_IOPL;
 
        if (rte_eal_iopl_init() == 0)
                rte_config.flags |= EAL_FLG_HIGH_IOPL;

-       
+

        if (rte_eal_pci_init() < 0)
                rte_panic("Cannot init PCI\n");
 
        if (rte_eal_pci_init() < 0)
                rte_panic("Cannot init PCI\n");
 


@@ -1021,7 +1020,7 @@ rte_eal_init(int argc, char **argv)
 
        /* the directories are locked during eal_hugepage_info_init */
        eal_hugedirs_unlock();
 
        /* the directories are locked during eal_hugepage_info_init */
        eal_hugedirs_unlock();

-       
+

        if (rte_eal_memzone_init() < 0)
                rte_panic("Cannot init memzone\n");
 
        if (rte_eal_memzone_init() < 0)
                rte_panic("Cannot init memzone\n");
 

diff --git a/lib/librte_eal/linuxapp/eal/eal_alarm.c b/lib/librte_eal/linuxapp/eal/eal_alarm.c
index f3d6e65..480f0cb 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_alarm.c
+++ b/lib/librte_eal/linuxapp/eal/eal_alarm.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/eal_debug.c b/lib/librte_eal/linuxapp/eal/eal_debug.c
index 7dd3eb9..44fc4f3 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_debug.c
+++ b/lib/librte_eal/linuxapp/eal/eal_debug.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index 4ffeda5..902cc58 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
index 58e1ddf..bd9fc5f 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c
index 9ed7bad..4ad76a7 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c
+++ b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -586,7 +586,7 @@ static inline int
 map_all_segments(void)
 {
        struct ivshmem_segment ms_tbl[RTE_MAX_MEMSEG];
 map_all_segments(void)
 {
        struct ivshmem_segment ms_tbl[RTE_MAX_MEMSEG];

-       struct ivshmem_pci_device * pci_dev; 
+       struct ivshmem_pci_device * pci_dev;

        struct rte_mem_config * mcfg;
        struct ivshmem_segment * seg;
        int fd, fd_zero;
        struct rte_mem_config * mcfg;
        struct ivshmem_segment * seg;
        int fd, fd_zero;


@@ -843,7 +843,7 @@ int rte_eal_ivshmem_init(void)
        /* initialize everything to 0 */
        memset(path, 0, sizeof(path));
        ivshmem_config = NULL;
        /* initialize everything to 0 */
        memset(path, 0, sizeof(path));
        ivshmem_config = NULL;

-       
+

        pagesz = getpagesize();
 
        RTE_LOG(DEBUG, EAL, "Searching for IVSHMEM devices...\n");
        pagesz = getpagesize();
 
        RTE_LOG(DEBUG, EAL, "Searching for IVSHMEM devices...\n");

diff --git a/lib/librte_eal/linuxapp/eal/eal_lcore.c b/lib/librte_eal/linuxapp/eal/eal_lcore.c
index 91164e5..cc9b900 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_lcore.c
+++ b/lib/librte_eal/linuxapp/eal/eal_lcore.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/eal_log.c b/lib/librte_eal/linuxapp/eal/eal_log.c
index 753f180..94dedfb 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_log.c
+++ b/lib/librte_eal/linuxapp/eal/eal_log.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 8d1edd9..d9cfb09 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c
index ac2c1fe..f809574 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -195,14 +195,14 @@ pci_uio_get_mappings(const char *devname, struct uio_map maps[], size_t nb_maps)
        uint64_t offset, size;
 
        for (i = 0; i != nb_maps; i++) {
        uint64_t offset, size;
 
        for (i = 0; i != nb_maps; i++) {

- 
+

                /* check if map directory exists */
                /* check if map directory exists */

-               rte_snprintf(dirname, sizeof(dirname), 
+               rte_snprintf(dirname, sizeof(dirname),

                        "%s/maps/map%u", devname, i);
                        "%s/maps/map%u", devname, i);

- 
+

                if (access(dirname, F_OK) != 0)
                        break;
                if (access(dirname, F_OK) != 0)
                        break;

- 
+

                /* get mapping offset */
                rte_snprintf(filename, sizeof(filename),
                        "%s/offset", dirname);
                /* get mapping offset */
                rte_snprintf(filename, sizeof(filename),
                        "%s/offset", dirname);


@@ -212,7 +212,7 @@ pci_uio_get_mappings(const char *devname, struct uio_map maps[], size_t nb_maps)
                                __func__, dirname);
                        return (-1);
                }
                                __func__, dirname);
                        return (-1);
                }

- 
+

                /* get mapping size */
                rte_snprintf(filename, sizeof(filename),
                        "%s/size", dirname);
                /* get mapping size */
                rte_snprintf(filename, sizeof(filename),
                        "%s/size", dirname);


@@ -222,7 +222,7 @@ pci_uio_get_mappings(const char *devname, struct uio_map maps[], size_t nb_maps)
                                __func__, dirname);
                        return (-1);
                }
                                __func__, dirname);
                        return (-1);
                }

- 
+

                /* get mapping physical address */
                rte_snprintf(filename, sizeof(filename),
                        "%s/addr", dirname);
                /* get mapping physical address */
                rte_snprintf(filename, sizeof(filename),
                        "%s/addr", dirname);


@@ -236,7 +236,7 @@ pci_uio_get_mappings(const char *devname, struct uio_map maps[], size_t nb_maps)
                if ((offset > OFF_MAX) || (size > SIZE_MAX)) {
                        RTE_LOG(ERR, EAL,
                                "%s(): offset/size exceed system max value\n",
                if ((offset > OFF_MAX) || (size > SIZE_MAX)) {
                        RTE_LOG(ERR, EAL,
                                "%s(): offset/size exceed system max value\n",

-                               __func__); 
+                               __func__);

                        return (-1);
                }
 
                        return (-1);
                }
 


@@ -358,7 +358,7 @@ static int pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf,
                /* format could be uio%d ...*/
                int shortprefix_len = sizeof("uio") - 1;
                /* ... or uio:uio%d */
                /* format could be uio%d ...*/
                int shortprefix_len = sizeof("uio") - 1;
                /* ... or uio:uio%d */

-               int longprefix_len = sizeof("uio:uio") - 1; 
+               int longprefix_len = sizeof("uio:uio") - 1;

                char *endptr;
 
                if (strncmp(e->d_name, "uio", 3) != 0)
                char *endptr;
 
                if (strncmp(e->d_name, "uio", 3) != 0)


@@ -521,13 +521,13 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
        for (i = 0; i<PCI_MAX_RESOURCE; i++) {
 
                if (fgets(buf, sizeof(buf), f) == NULL) {
        for (i = 0; i<PCI_MAX_RESOURCE; i++) {
 
                if (fgets(buf, sizeof(buf), f) == NULL) {

-                       RTE_LOG(ERR, EAL, 
+                       RTE_LOG(ERR, EAL,

                                "%s(): cannot read resource\n", __func__);
                        goto error;
                }
 
                if (rte_strsplit(buf, sizeof(buf), res_info.ptrs, 3, ' ') != 3) {
                                "%s(): cannot read resource\n", __func__);
                        goto error;
                }
 
                if (rte_strsplit(buf, sizeof(buf), res_info.ptrs, 3, ' ') != 3) {

-                       RTE_LOG(ERR, EAL, 
+                       RTE_LOG(ERR, EAL,

                                "%s(): bad resource format\n", __func__);
                        goto error;
                }
                                "%s(): bad resource format\n", __func__);
                        goto error;
                }


@@ -536,7 +536,7 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
                end_addr = strtoull(res_info.end_addr, NULL, 16);
                flags = strtoull(res_info.flags, NULL, 16);
                if (errno != 0) {
                end_addr = strtoull(res_info.end_addr, NULL, 16);
                flags = strtoull(res_info.flags, NULL, 16);
                if (errno != 0) {

-                       RTE_LOG(ERR, EAL, 
+                       RTE_LOG(ERR, EAL,

                                "%s(): bad resource format\n", __func__);
                        goto error;
                }
                                "%s(): bad resource format\n", __func__);
                        goto error;
                }


@@ -545,7 +545,7 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
                        dev->mem_resource[i].phys_addr = phys_addr;
                        dev->mem_resource[i].len = end_addr - phys_addr + 1;
                        /* not mapped for now */
                        dev->mem_resource[i].phys_addr = phys_addr;
                        dev->mem_resource[i].len = end_addr - phys_addr + 1;
                        /* not mapped for now */

-                       dev->mem_resource[i].addr = NULL; 
+                       dev->mem_resource[i].addr = NULL;

                }
        }
        fclose(f);
                }
        }
        fclose(f);


@@ -556,24 +556,24 @@ error:
        return -1;
 }
 
        return -1;
 }
 

-/* 
- * parse a sysfs file containing one integer value 
+/*
+ * parse a sysfs file containing one integer value

  * different to the eal version, as it needs to work with 64-bit values
  * different to the eal version, as it needs to work with 64-bit values

- */ 
-static int 
-pci_parse_sysfs_value(const char *filename, uint64_t *val) 
+ */
+static int
+pci_parse_sysfs_value(const char *filename, uint64_t *val)

 {
         FILE *f;
         char buf[BUFSIZ];
         char *end = NULL;
 {
         FILE *f;
         char buf[BUFSIZ];
         char *end = NULL;

- 
+

         f = fopen(filename, "r");
         if (f == NULL) {
                 RTE_LOG(ERR, EAL, "%s(): cannot open sysfs value %s\n",
                         __func__, filename);
                 return -1;
         }
         f = fopen(filename, "r");
         if (f == NULL) {
                 RTE_LOG(ERR, EAL, "%s(): cannot open sysfs value %s\n",
                         __func__, filename);
                 return -1;
         }

- 
+

         if (fgets(buf, sizeof(buf), f) == NULL) {
                 RTE_LOG(ERR, EAL, "%s(): cannot read sysfs value %s\n",
                         __func__, filename);
         if (fgets(buf, sizeof(buf), f) == NULL) {
                 RTE_LOG(ERR, EAL, "%s(): cannot read sysfs value %s\n",
                         __func__, filename);


@@ -662,7 +662,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        /* get max_vfs */
        dev->max_vfs = 0;
        rte_snprintf(filename, sizeof(filename), "%s/max_vfs", dirname);
        /* get max_vfs */
        dev->max_vfs = 0;
        rte_snprintf(filename, sizeof(filename), "%s/max_vfs", dirname);

-       if (!access(filename, F_OK) && 
+       if (!access(filename, F_OK) &&

            eal_parse_sysfs_value(filename, &tmp) == 0) {
                dev->max_vfs = (uint16_t)tmp;
        }
            eal_parse_sysfs_value(filename, &tmp) == 0) {
                dev->max_vfs = (uint16_t)tmp;
        }


@@ -692,7 +692,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        /* device is valid, add in list (sorted) */
        if (TAILQ_EMPTY(&pci_device_list)) {
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        /* device is valid, add in list (sorted) */
        if (TAILQ_EMPTY(&pci_device_list)) {
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);

-       }       
+       }

        else {
                struct rte_pci_device *dev2 = NULL;
 
        else {
                struct rte_pci_device *dev2 = NULL;
 


@@ -706,7 +706,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
                }
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        }
                }
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        }

-                               
+

        return 0;
 }
 
        return 0;
 }
 

diff --git a/lib/librte_eal/linuxapp/eal/eal_thread.c b/lib/librte_eal/linuxapp/eal/eal_thread.c
index bf77873..80a985f 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_thread.c
+++ b/lib/librte_eal/linuxapp/eal/eal_thread.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/eal_timer.c b/lib/librte_eal/linuxapp/eal/eal_timer.c
index 64566d1..7f7589f 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_timer.c
+++ b/lib/librte_eal/linuxapp/eal/eal_timer.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2012-2013 6WIND S.A.
  *   All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2012-2013 6WIND S.A.
  *   All rights reserved.

- * 
+ *

  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
  *   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
  *     * 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


@@ -18,7 +18,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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/eal_xen_memory.c b/lib/librte_eal/linuxapp/eal/eal_xen_memory.c
index c7d709c..4c66bf3 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_xen_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_xen_memory.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -68,7 +68,7 @@
 #include <exec-env/rte_dom0_common.h>
 
 #define PAGE_SIZE RTE_PGSIZE_4K
 #include <exec-env/rte_dom0_common.h>
 
 #define PAGE_SIZE RTE_PGSIZE_4K

-#define DEFAUL_DOM0_NAME "dom0-mem" 
+#define DEFAUL_DOM0_NAME "dom0-mem"

 
 static int xen_fd = -1;
 static const char sys_dir_path[] = "/sys/kernel/mm/dom0-mm/memsize-mB";
 
 static int xen_fd = -1;
 static const char sys_dir_path[] = "/sys/kernel/mm/dom0-mm/memsize-mB";


@@ -139,7 +139,7 @@ get_xen_memory_size(void)
        if (eal_parse_sysfs_value(path, &mem_size) < 0)
                return -1;
 
        if (eal_parse_sysfs_value(path, &mem_size) < 0)
                return -1;
 

-       if (mem_size == 0) 
+       if (mem_size == 0)

                rte_exit(EXIT_FAILURE,"XEN-DOM0:the %s/%s was not"
                        " configured.\n",sys_dir_path, file_name);
        if (mem_size % 2)
                rte_exit(EXIT_FAILURE,"XEN-DOM0:the %s/%s was not"
                        " configured.\n",sys_dir_path, file_name);
        if (mem_size % 2)


@@ -149,7 +149,7 @@ get_xen_memory_size(void)
        if (mem_size > DOM0_CONFIG_MEMSIZE)
                rte_exit(EXIT_FAILURE,"XEN-DOM0:the %s/%s should not be larger"
                        " than %d mB\n",sys_dir_path, file_name, DOM0_CONFIG_MEMSIZE);
        if (mem_size > DOM0_CONFIG_MEMSIZE)
                rte_exit(EXIT_FAILURE,"XEN-DOM0:the %s/%s should not be larger"
                        " than %d mB\n",sys_dir_path, file_name, DOM0_CONFIG_MEMSIZE);

-       
+

        return mem_size;
 }
 
        return mem_size;
 }
 


@@ -167,15 +167,15 @@ rte_mem_phy2mch(uint32_t memseg_id, const phys_addr_t phy_addr)
        mfn_id = (phy_addr - memseg[memseg_id].phys_addr) / RTE_PGSIZE_2M;
 
        /*the MFN is contiguous in 2M */
        mfn_id = (phy_addr - memseg[memseg_id].phys_addr) / RTE_PGSIZE_2M;
 
        /*the MFN is contiguous in 2M */

-       mfn_offset = (phy_addr - memseg[memseg_id].phys_addr) % 
+       mfn_offset = (phy_addr - memseg[memseg_id].phys_addr) %

                                        RTE_PGSIZE_2M / PAGE_SIZE;
                                        RTE_PGSIZE_2M / PAGE_SIZE;

-       mfn = mfn_offset + memseg[memseg_id].mfn[mfn_id];       
-       
+       mfn = mfn_offset + memseg[memseg_id].mfn[mfn_id];
+

        /** return mechine address */
        return (mfn * PAGE_SIZE + phy_addr % PAGE_SIZE);
 }
 
        /** return mechine address */
        return (mfn * PAGE_SIZE + phy_addr % PAGE_SIZE);
 }
 

-int 
+int

 rte_xen_dom0_memory_init(void)
 {
        void *vir_addr, *vma_addr = NULL;
 rte_xen_dom0_memory_init(void)
 {
        void *vir_addr, *vma_addr = NULL;


@@ -198,8 +198,8 @@ rte_xen_dom0_memory_init(void)
                /* if we didn't satisfy total memory requirements */
                rte_exit(EXIT_FAILURE,"Not enough memory available! Requested: %uMB,"
                                " available: %uMB\n", requested, mem_size);
                /* if we didn't satisfy total memory requirements */
                rte_exit(EXIT_FAILURE,"Not enough memory available! Requested: %uMB,"
                                " available: %uMB\n", requested, mem_size);

-       else if (total_mem != 0) 
-               mem_size = requested;           
+       else if (total_mem != 0)
+               mem_size = requested;

 
        /* Check FD and open once */
        if (xen_fd < 0) {
 
        /* Check FD and open once */
        if (xen_fd < 0) {


@@ -239,7 +239,7 @@ rte_xen_dom0_memory_init(void)
                goto fail;
        }
 
                goto fail;
        }
 

-       /* get all memory segements information */  
+       /* get all memory segements information */

        ret = ioctl(xen_fd, RTE_DOM0_IOCTL_GET_MEMSEG_INFO, seginfo);
        if (ret < 0) {
                RTE_LOG(ERR, EAL, "XEN DOM0:failed to get memseg info.\n");
        ret = ioctl(xen_fd, RTE_DOM0_IOCTL_GET_MEMSEG_INFO, seginfo);
        if (ret < 0) {
                RTE_LOG(ERR, EAL, "XEN DOM0:failed to get memseg info.\n");


@@ -251,11 +251,11 @@ rte_xen_dom0_memory_init(void)
        for (memseg_idx = 0; memseg_idx < num_memseg; memseg_idx++)
        {
                vma_len = seginfo[memseg_idx].size;
        for (memseg_idx = 0; memseg_idx < num_memseg; memseg_idx++)
        {
                vma_len = seginfo[memseg_idx].size;

-                
-               /** 
-                * get the biggest virtual memory area up to vma_len. If it fails, 
-                * vma_addr is NULL, so let the kernel provide the address. 
-                */ 
+
+               /**
+                * get the biggest virtual memory area up to vma_len. If it fails,
+                * vma_addr is NULL, so let the kernel provide the address.
+                */

                vma_addr = xen_get_virtual_area(&vma_len, RTE_PGSIZE_2M);
                if (vma_addr == NULL) {
                        flags = MAP_SHARED;
                vma_addr = xen_get_virtual_area(&vma_len, RTE_PGSIZE_2M);
                if (vma_addr == NULL) {
                        flags = MAP_SHARED;


@@ -265,7 +265,7 @@ rte_xen_dom0_memory_init(void)
 
                seginfo[memseg_idx].size = vma_len;
                vir_addr = mmap(vma_addr, seginfo[memseg_idx].size,
 
                seginfo[memseg_idx].size = vma_len;
                vir_addr = mmap(vma_addr, seginfo[memseg_idx].size,

-                       PROT_READ|PROT_WRITE, flags, xen_fd, 
+                       PROT_READ|PROT_WRITE, flags, xen_fd,

                        memseg_idx * page_size);
                if (vir_addr == MAP_FAILED) {
                        RTE_LOG(ERR, EAL, "XEN DOM0:Could not mmap %s\n",
                        memseg_idx * page_size);
                if (vir_addr == MAP_FAILED) {
                        RTE_LOG(ERR, EAL, "XEN DOM0:Could not mmap %s\n",


@@ -275,10 +275,10 @@ rte_xen_dom0_memory_init(void)
                }
 
                memseg[memseg_idx].addr = vir_addr;
                }
 
                memseg[memseg_idx].addr = vir_addr;

-               memseg[memseg_idx].phys_addr = page_size * 
+               memseg[memseg_idx].phys_addr = page_size *

                        seginfo[memseg_idx].pfn ;
                memseg[memseg_idx].len = seginfo[memseg_idx].size;
                        seginfo[memseg_idx].pfn ;
                memseg[memseg_idx].len = seginfo[memseg_idx].size;

-               for ( i = 0; i < seginfo[memseg_idx].size / RTE_PGSIZE_2M; i++) 
+               for ( i = 0; i < seginfo[memseg_idx].size / RTE_PGSIZE_2M; i++)

                        memseg[memseg_idx].mfn[i] = seginfo[memseg_idx].mfn[i];
 
                /* MFNs are continuous in 2M, so assume that page size is 2M */
                        memseg[memseg_idx].mfn[i] = seginfo[memseg_idx].mfn[i];
 
                /* MFNs are continuous in 2M, so assume that page size is 2M */


@@ -295,7 +295,7 @@ rte_xen_dom0_memory_init(void)
 fail:
        if (xen_fd > 0) {
                close(xen_fd);
 fail:
        if (xen_fd > 0) {
                close(xen_fd);

-               xen_fd = -1;    
+               xen_fd = -1;

        }
        return err;
 }
        }
        return err;
 }


@@ -303,7 +303,7 @@ fail:
 /*
  * This creates the memory mappings in the secondary process to match that of
  * the server process. It goes through each memory segment in the DPDK runtime
 /*
  * This creates the memory mappings in the secondary process to match that of
  * the server process. It goes through each memory segment in the DPDK runtime

- * configuration, mapping them in order to form a contiguous block in the 
+ * configuration, mapping them in order to form a contiguous block in the

  * virtual memory space
  */
 int
  * virtual memory space
  */
 int


@@ -311,7 +311,7 @@ rte_xen_dom0_memory_attach(void)
 {
        const struct rte_mem_config *mcfg;
        unsigned s = 0; /* s used to track the segment number */
 {
        const struct rte_mem_config *mcfg;
        unsigned s = 0; /* s used to track the segment number */

-       int xen_fd = -1; 
+       int xen_fd = -1;

        int ret = -1;
        void *vir_addr;
        char name[DOM0_NAME_MAX] = {0};
        int ret = -1;
        void *vir_addr;
        char name[DOM0_NAME_MAX] = {0};


@@ -327,7 +327,7 @@ rte_xen_dom0_memory_attach(void)
                        goto error;
                }
        }
                        goto error;
                }
        }

-       
+

        /* construct memory mangement name for Dom0 */
        rte_snprintf(name, DOM0_NAME_MAX, "%s-%s",
                internal_config.hugefile_prefix, DEFAUL_DOM0_NAME);
        /* construct memory mangement name for Dom0 */
        rte_snprintf(name, DOM0_NAME_MAX, "%s-%s",
                internal_config.hugefile_prefix, DEFAUL_DOM0_NAME);


@@ -356,7 +356,7 @@ rte_xen_dom0_memory_attach(void)
                                "in %s to requested address [%p]\n",
                                (unsigned long long)mcfg->memseg[s].len, DOM0_MM_DEV,
                                mcfg->memseg[s].addr);
                                "in %s to requested address [%p]\n",
                                (unsigned long long)mcfg->memseg[s].len, DOM0_MM_DEV,
                                mcfg->memseg[s].addr);

-                       goto error;     
+                       goto error;

                }
        }
        return 0;
                }
        }
        return 0;

diff --git a/lib/librte_eal/linuxapp/eal/include/eal_filesystem.h b/lib/librte_eal/linuxapp/eal/include/eal_filesystem.h
index 034e58d..6609e08 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/include/eal_filesystem.h
+++ b/lib/librte_eal/linuxapp/eal/include/eal_filesystem.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/include/eal_hugepages.h b/lib/librte_eal/linuxapp/eal/include/eal_hugepages.h
index 064cdb0..51e090b 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/include/eal_hugepages.h
+++ b/lib/librte_eal/linuxapp/eal/include/eal_hugepages.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/include/eal_internal_cfg.h b/lib/librte_eal/linuxapp/eal/include/eal_internal_cfg.h
index 92e3065..dd17df2 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/include/eal_internal_cfg.h
+++ b/lib/librte_eal/linuxapp/eal/include/eal_internal_cfg.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/include/eal_thread.h b/lib/librte_eal/linuxapp/eal/include/eal_thread.h
index c21b4b0..d029ad3 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/include/eal_thread.h
+++ b/lib/librte_eal/linuxapp/eal/include/eal_thread.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_dom0_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_dom0_common.h
index 9f95485..d970778 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_dom0_common.h
+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_dom0_common.h
@@ -1,37 +1,37 @@
 /*-
  *   This file is provided under a dual BSD/LGPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
 /*-
  *   This file is provided under a dual BSD/LGPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.

- * 
+ *

  *   GNU LESSER GENERAL PUBLIC LICENSE
  *   GNU LESSER GENERAL PUBLIC LICENSE

- * 
+ *

  *   Copyright(c) 2007-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2007-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2.1 of the GNU Lesser General Public License
  *   as published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2.1 of the GNU Lesser General Public License
  *   as published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   Lesser General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   Lesser General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  *   Contact Information:
  *   Intel Corporation

- * 
- * 
+ *
+ *

  *   BSD LICENSE
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *   * 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


@@ -41,7 +41,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.
  *   * 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
  *    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


@@ -53,7 +53,7 @@
  *    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.
  *    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.

- * 
+ *

  */
 
 #ifndef _RTE_DOM0_COMMON_H_
  */
 
 #ifndef _RTE_DOM0_COMMON_H_


@@ -63,11 +63,11 @@
 #include <linux/if.h>
 #endif
 
 #include <linux/if.h>
 #endif
 

-#define DOM0_NAME_MAX   256 
+#define DOM0_NAME_MAX   256

 #define DOM0_MM_DEV   "/dev/dom0_mm"
 
 #define DOM0_CONTIG_NUM_ORDER       9       /**< order of 2M */
 #define DOM0_MM_DEV   "/dev/dom0_mm"
 
 #define DOM0_CONTIG_NUM_ORDER       9       /**< order of 2M */

-#define DOM0_NUM_MEMSEG             512     /**< Maximum nb. of memory segment. */ 
+#define DOM0_NUM_MEMSEG             512     /**< Maximum nb. of memory segment. */

 #define DOM0_MEMBLOCK_SIZE          0x200000 /**< size of memory block(2M). */
 #define DOM0_CONFIG_MEMSIZE         4096     /**< Maximum config memory size(4G). */
 #define DOM0_NUM_MEMBLOCK (DOM0_CONFIG_MEMSIZE / 2) /**< Maximum nb. of 2M memory block. */
 #define DOM0_MEMBLOCK_SIZE          0x200000 /**< size of memory block(2M). */
 #define DOM0_CONFIG_MEMSIZE         4096     /**< Maximum config memory size(4G). */
 #define DOM0_NUM_MEMBLOCK (DOM0_CONFIG_MEMSIZE / 2) /**< Maximum nb. of 2M memory block. */


@@ -78,7 +78,7 @@
 #define RTE_DOM0_IOCTL_GET_MEMSEG_INFO   _IOWR(0, 4, void *)
 
 /**
 #define RTE_DOM0_IOCTL_GET_MEMSEG_INFO   _IOWR(0, 4, void *)
 
 /**

- * A structure used to store memory information. 
+ * A structure used to store memory information.

  */
 struct memory_info {
        char name[DOM0_NAME_MAX];
  */
 struct memory_info {
        char name[DOM0_NAME_MAX];


@@ -96,7 +96,7 @@ struct memseg_info {
 };
 
 /**
 };
 
 /**

- * A structure used to store memory block information. 
+ * A structure used to store memory block information.

  */
 struct memblock_info {
        uint8_t exchange_flag;
  */
 struct memblock_info {
        uint8_t exchange_flag;

diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h
index 6733948..87a9cf6 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h
+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
index e13afb2..d0b82da 100755 (executable)
--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -1,37 +1,37 @@
 /*-
  *   This file is provided under a dual BSD/LGPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
 /*-
  *   This file is provided under a dual BSD/LGPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.

- * 
+ *

  *   GNU LESSER GENERAL PUBLIC LICENSE
  *   GNU LESSER GENERAL PUBLIC LICENSE

- * 
+ *

  *   Copyright(c) 2007-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2007-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2.1 of the GNU Lesser General Public License
  *   as published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2.1 of the GNU Lesser General Public License
  *   as published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   Lesser General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   Lesser General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  *   Contact Information:
  *   Intel Corporation

- * 
- * 
+ *
+ *

  *   BSD LICENSE
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *   * 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


@@ -41,7 +41,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.
  *   * 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
  *    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


@@ -53,7 +53,7 @@
  *    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.
  *    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.

- * 
+ *

  */
 
 #ifndef _RTE_KNI_COMMON_H_
  */
 
 #ifndef _RTE_KNI_COMMON_H_

diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_lcore.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_lcore.h
index 57499b7..e19ab54 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_lcore.h
+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_lcore.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_per_lcore.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_per_lcore.h
index 173c634..db8f274 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_per_lcore.h
+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_per_lcore.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_eal/linuxapp/igb_uio/Makefile b/lib/librte_eal/linuxapp/igb_uio/Makefile
index ed85046..ec6e702 100644 (file)
--- a/lib/librte_eal/linuxapp/igb_uio/Makefile
+++ b/lib/librte_eal/linuxapp/igb_uio/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
index 09c40bf..6fa7396 100644 (file)
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
@@ -1,23 +1,23 @@
 /*-
  * GPL LICENSE SUMMARY
 /*-
  * GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  */
  *   Contact Information:
  *   Intel Corporation
  */


@@ -30,7 +30,7 @@
 #include <linux/msi.h>
 #include <linux/version.h>
 
 #include <linux/msi.h>
 #include <linux/version.h>
 

-#ifdef CONFIG_XEN_DOM0 
+#ifdef CONFIG_XEN_DOM0

 #include <xen/xen.h>
 #endif
 
 #include <xen/xen.h>
 #endif
 


@@ -113,7 +113,7 @@ int local_pci_num_vf(struct pci_dev *dev)
 
        if (!dev->is_physfn)
                return 0;
 
        if (!dev->is_physfn)
                return 0;

-       
+

        return iov->nr_virtfn;
 #else
        return pci_num_vf(dev);
        return iov->nr_virtfn;
 #else
        return pci_num_vf(dev);


@@ -146,7 +146,7 @@ store_max_vfs(struct device *dev, struct device_attribute *attr,
        else /* do nothing if change max_vfs number */
                err = -EINVAL;
 
        else /* do nothing if change max_vfs number */
                err = -EINVAL;
 

-       return err ? err : count;                                                       
+       return err ? err : count;

 }
 
 static DEVICE_ATTR(max_vfs, S_IRUGO | S_IWUSR, show_max_vfs, store_max_vfs);
 }
 
 static DEVICE_ATTR(max_vfs, S_IRUGO | S_IWUSR, show_max_vfs, store_max_vfs);


@@ -338,7 +338,7 @@ igbuio_dom0_mmap_phys(struct uio_info *info, struct vm_area_struct *vma)
 }
 
 /**
 }
 
 /**

- * This is uio device mmap method which will use igbuio mmap for Xen 
+ * This is uio device mmap method which will use igbuio mmap for Xen

  * Dom0 environment.
  */
 static int
  * Dom0 environment.
  */
 static int


@@ -346,7 +346,7 @@ igbuio_dom0_pci_mmap(struct uio_info *info, struct vm_area_struct *vma)
 {
        int idx;
 
 {
        int idx;
 

-       if (vma->vm_pgoff >= MAX_UIO_MAPS) 
+       if (vma->vm_pgoff >= MAX_UIO_MAPS)

                return -EINVAL;
        if(info->mem[vma->vm_pgoff].size == 0)
                return  -EINVAL;
                return -EINVAL;
        if(info->mem[vma->vm_pgoff].size == 0)
                return  -EINVAL;


@@ -360,7 +360,7 @@ igbuio_dom0_pci_mmap(struct uio_info *info, struct vm_area_struct *vma)
        default:
                return -EINVAL;
        }
        default:
                return -EINVAL;
        }

-}       
+}

 #endif
 
 /* Remap pci resources described by bar #pci_bar in uio resource n. */
 #endif
 
 /* Remap pci resources described by bar #pci_bar in uio resource n. */


@@ -371,7 +371,7 @@ igbuio_pci_setup_iomem(struct pci_dev *dev, struct uio_info *info,
        unsigned long addr, len;
        void *internal_addr;
 
        unsigned long addr, len;
        void *internal_addr;
 

-       if (sizeof(info->mem) / sizeof (info->mem[0]) <= n)  
+       if (sizeof(info->mem) / sizeof (info->mem[0]) <= n)

                return (EINVAL);
 
        addr = pci_resource_start(dev, pci_bar);
                return (EINVAL);
 
        addr = pci_resource_start(dev, pci_bar);


@@ -396,7 +396,7 @@ igbuio_pci_setup_ioport(struct pci_dev *dev, struct uio_info *info,
 {
        unsigned long addr, len;
 
 {
        unsigned long addr, len;
 

-       if (sizeof(info->port) / sizeof (info->port[0]) <= n)  
+       if (sizeof(info->port) / sizeof (info->port[0]) <= n)

                return (EINVAL);
 
        addr = pci_resource_start(dev, pci_bar);
                return (EINVAL);
 
        addr = pci_resource_start(dev, pci_bar);

diff --git a/lib/librte_eal/linuxapp/kni/Makefile b/lib/librte_eal/linuxapp/kni/Makefile
index 2f56ac2..fb9462f 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/Makefile
+++ b/lib/librte_eal/linuxapp/kni/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_eal/linuxapp/kni/kni_dev.h b/lib/librte_eal/linuxapp/kni/kni_dev.h
index 2e94f46..e79e472 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/kni_dev.h
+++ b/lib/librte_eal/linuxapp/kni/kni_dev.h
@@ -1,23 +1,23 @@
 /*-
  * GPL LICENSE SUMMARY
 /*-
  * GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  */
  *   Contact Information:
  *   Intel Corporation
  */


@@ -115,7 +115,7 @@ struct kni_dev {
 #endif
 
 #ifdef RTE_KNI_VHOST
 #endif
 
 #ifdef RTE_KNI_VHOST

-unsigned int 
+unsigned int

 kni_poll(struct file *file, struct socket *sock, poll_table * wait);
 int kni_chk_vhost_rx(struct kni_dev *kni);
 int kni_vhost_init(struct kni_dev *kni);
 kni_poll(struct file *file, struct socket *sock, poll_table * wait);
 int kni_chk_vhost_rx(struct kni_dev *kni);
 int kni_vhost_init(struct kni_dev *kni);

diff --git a/lib/librte_eal/linuxapp/kni/kni_ethtool.c b/lib/librte_eal/linuxapp/kni/kni_ethtool.c
index 71116bf..d0673e5 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/kni_ethtool.c
+++ b/lib/librte_eal/linuxapp/kni/kni_ethtool.c
@@ -1,23 +1,23 @@
 /*-
  * GPL LICENSE SUMMARY
 /*-
  * GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  */
  *   Contact Information:
  *   Intel Corporation
  */

diff --git a/lib/librte_eal/linuxapp/kni/kni_fifo.h b/lib/librte_eal/linuxapp/kni/kni_fifo.h
index 7af4aac..3ea750e 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/kni_fifo.h
+++ b/lib/librte_eal/linuxapp/kni/kni_fifo.h
@@ -1,23 +1,23 @@
 /*-
  * GPL LICENSE SUMMARY
 /*-
  * GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  */
  *   Contact Information:
  *   Intel Corporation
  */

diff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c
index a69477c..1c085d9 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/kni_misc.c
+++ b/lib/librte_eal/linuxapp/kni/kni_misc.c
@@ -1,23 +1,23 @@
 /*-
  * GPL LICENSE SUMMARY
 /*-
  * GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  */
  *   Contact Information:
  *   Intel Corporation
  */

diff --git a/lib/librte_eal/linuxapp/kni/kni_net.c b/lib/librte_eal/linuxapp/kni/kni_net.c
index fb4b3a8..d3c0190 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/kni_net.c
+++ b/lib/librte_eal/linuxapp/kni/kni_net.c
@@ -1,23 +1,23 @@
 /*-
  * GPL LICENSE SUMMARY
 /*-
  * GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  */
  *   Contact Information:
  *   Intel Corporation
  */


@@ -382,10 +382,10 @@ static int
 kni_net_tx(struct sk_buff *skb, struct net_device *dev)
 {
        struct kni_dev *kni = netdev_priv(dev);
 kni_net_tx(struct sk_buff *skb, struct net_device *dev)
 {
        struct kni_dev *kni = netdev_priv(dev);

-       
+

        dev_kfree_skb(skb);
        kni->stats.tx_dropped++;
        dev_kfree_skb(skb);
        kni->stats.tx_dropped++;

-       
+

        return NETDEV_TX_OK;
 }
 #else
        return NETDEV_TX_OK;
 }
 #else

diff --git a/lib/librte_eal/linuxapp/kni/kni_vhost.c b/lib/librte_eal/linuxapp/kni/kni_vhost.c
index e5c1e2c..fe512c2 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/kni_vhost.c
+++ b/lib/librte_eal/linuxapp/kni/kni_vhost.c
@@ -1,23 +1,23 @@
 /*-
  * GPL LICENSE SUMMARY
 /*-
  * GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  */
  *   Contact Information:
  *   Intel Corporation
  */


@@ -33,7 +33,7 @@
 #include <linux/if_tun.h>
 #include <linux/version.h>
 
 #include <linux/if_tun.h>
 #include <linux/version.h>
 

-#include "kni_dev.h" 
+#include "kni_dev.h"

 #include "kni_fifo.h"
 
 #define RX_BURST_SZ 4
 #include "kni_fifo.h"
 
 #define RX_BURST_SZ 4


@@ -42,7 +42,7 @@ extern void put_unused_fd(unsigned int fd);
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
 extern struct file*
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
 extern struct file*

-sock_alloc_file(struct socket *sock, 
+sock_alloc_file(struct socket *sock,

                int flags, const char *dname);
 
 extern int get_unused_fd_flags(unsigned flags);
                int flags, const char *dname);
 
 extern int get_unused_fd_flags(unsigned flags);


@@ -75,14 +75,14 @@ static struct proto kni_raw_proto = {
 };
 
 static inline int
 };
 
 static inline int

-kni_vhost_net_tx(struct kni_dev *kni, struct iovec *iov, 
+kni_vhost_net_tx(struct kni_dev *kni, struct iovec *iov,

                 unsigned offset, unsigned len)
 {
        struct rte_kni_mbuf *pkt_kva = NULL;
        struct rte_kni_mbuf *pkt_va = NULL;
        int ret;
 
                 unsigned offset, unsigned len)
 {
        struct rte_kni_mbuf *pkt_kva = NULL;
        struct rte_kni_mbuf *pkt_va = NULL;
        int ret;
 

-       KNI_DBG_TX("tx offset=%d, len=%d, iovlen=%d\n", 
+       KNI_DBG_TX("tx offset=%d, len=%d, iovlen=%d\n",

                   offset, len, (int)iov->iov_len);
 
        /**
                   offset, len, (int)iov->iov_len);
 
        /**


@@ -141,7 +141,7 @@ drop:
 }
 
 static inline int
 }
 
 static inline int

-kni_vhost_net_rx(struct kni_dev *kni, struct iovec *iov, 
+kni_vhost_net_rx(struct kni_dev *kni, struct iovec *iov,

                 unsigned offset, unsigned len)
 {
        uint32_t pkt_len;
                 unsigned offset, unsigned len)
 {
        uint32_t pkt_len;


@@ -163,7 +163,7 @@ kni_vhost_net_rx(struct kni_dev *kni, struct iovec *iov,
                return 0;
 
        kva = (struct rte_kni_mbuf*)skb->data;
                return 0;
 
        kva = (struct rte_kni_mbuf*)skb->data;

-       
+

        /* free skb to cache */
        skb->data = NULL;
        if (unlikely(1 != kni_fifo_put(q->fifo, (void **)&skb, 1)))
        /* free skb to cache */
        skb->data = NULL;
        if (unlikely(1 != kni_fifo_put(q->fifo, (void **)&skb, 1)))


@@ -174,16 +174,16 @@ kni_vhost_net_rx(struct kni_dev *kni, struct iovec *iov,
        if (unlikely(pkt_len > len))
                goto drop;
 
        if (unlikely(pkt_len > len))
                goto drop;
 

-       KNI_DBG_RX("rx offset=%d, len=%d, pkt_len=%d, iovlen=%d\n", 
+       KNI_DBG_RX("rx offset=%d, len=%d, pkt_len=%d, iovlen=%d\n",

                   offset, len, pkt_len, (int)iov->iov_len);
 
                   offset, len, pkt_len, (int)iov->iov_len);
 

-       data_kva = kva->data - kni->mbuf_va + kni->mbuf_kva;            
+       data_kva = kva->data - kni->mbuf_va + kni->mbuf_kva;

        if (unlikely(memcpy_toiovecend(iov, data_kva, offset, pkt_len)))
                goto drop;
 
        /* Update statistics */
        kni->stats.rx_bytes += pkt_len;
        if (unlikely(memcpy_toiovecend(iov, data_kva, offset, pkt_len)))
                goto drop;
 
        /* Update statistics */
        kni->stats.rx_bytes += pkt_len;

-       kni->stats.rx_packets++;        
+       kni->stats.rx_packets++;

 
        /* enqueue mbufs into free_q */
        va = (void*)kva - kni->mbuf_kva + kni->mbuf_va;
 
        /* enqueue mbufs into free_q */
        va = (void*)kva - kni->mbuf_kva + kni->mbuf_va;


@@ -202,10 +202,10 @@ drop:
        return 0;
 }
 
        return 0;
 }
 

-static unsigned int 
+static unsigned int

 kni_sock_poll(struct file *file, struct socket *sock, poll_table * wait)
 {
 kni_sock_poll(struct file *file, struct socket *sock, poll_table * wait)
 {

-       struct kni_vhost_queue *q = 
+       struct kni_vhost_queue *q =

                container_of(sock->sk, struct kni_vhost_queue, sk);
        struct kni_dev *kni;
        unsigned int mask = 0;
                container_of(sock->sk, struct kni_vhost_queue, sk);
        struct kni_dev *kni;
        unsigned int mask = 0;


@@ -214,7 +214,7 @@ kni_sock_poll(struct file *file, struct socket *sock, poll_table * wait)
                return POLLERR;
 
        kni = q->kni;
                return POLLERR;
 
        kni = q->kni;

-       KNI_DBG("start kni_poll on group %d, wq 0x%16llx\n", 
+       KNI_DBG("start kni_poll on group %d, wq 0x%16llx\n",

                  kni->group_id, (uint64_t)sock->wq);
 
        poll_wait(file, &sock->wq->wait, wait);
                  kni->group_id, (uint64_t)sock->wq);
 
        poll_wait(file, &sock->wq->wait, wait);


@@ -231,19 +231,19 @@ kni_sock_poll(struct file *file, struct socket *sock, poll_table * wait)
 }
 
 static inline void
 }
 
 static inline void

-kni_vhost_enqueue(struct kni_dev *kni, struct kni_vhost_queue *q, 
+kni_vhost_enqueue(struct kni_dev *kni, struct kni_vhost_queue *q,

                  struct sk_buff *skb, struct rte_kni_mbuf *va)
 {
        struct rte_kni_mbuf *kva;
 
                  struct sk_buff *skb, struct rte_kni_mbuf *va)
 {
        struct rte_kni_mbuf *kva;
 

-       kva = (void *)(va) - kni->mbuf_va + kni->mbuf_kva;             
+       kva = (void *)(va) - kni->mbuf_va + kni->mbuf_kva;

        (skb)->data = (unsigned char*)kva;
        (skb)->len = kva->data_len;
        (skb)->data = (unsigned char*)kva;
        (skb)->len = kva->data_len;

-       skb_queue_tail(&q->sk.sk_receive_queue, skb);   
+       skb_queue_tail(&q->sk.sk_receive_queue, skb);

 }
 
 }
 

-static inline void 
-kni_vhost_enqueue_burst(struct kni_dev *kni, struct kni_vhost_queue *q, 
+static inline void
+kni_vhost_enqueue_burst(struct kni_dev *kni, struct kni_vhost_queue *q,

          struct sk_buff **skb, struct rte_kni_mbuf **va)
 {
        int i;
          struct sk_buff **skb, struct rte_kni_mbuf **va)
 {
        int i;


@@ -251,7 +251,7 @@ kni_vhost_enqueue_burst(struct kni_dev *kni, struct kni_vhost_queue *q,
                kni_vhost_enqueue(kni, q, *skb, *va);
 }
 
                kni_vhost_enqueue(kni, q, *skb, *va);
 }
 

-int 
+int

 kni_chk_vhost_rx(struct kni_dev *kni)
 {
        struct kni_vhost_queue *q = kni->vhost_queue;
 kni_chk_vhost_rx(struct kni_dev *kni)
 {
        struct kni_vhost_queue *q = kni->vhost_queue;


@@ -260,7 +260,7 @@ kni_chk_vhost_rx(struct kni_dev *kni)
        unsigned nb_burst, nb_backlog, i;
        struct sk_buff *skb[RX_BURST_SZ];
        struct rte_kni_mbuf *va[RX_BURST_SZ];
        unsigned nb_burst, nb_backlog, i;
        struct sk_buff *skb[RX_BURST_SZ];
        struct rte_kni_mbuf *va[RX_BURST_SZ];

-       
+

        if (unlikely(BE_STOP & kni->vq_status)) {
                kni->vq_status |= BE_FINISH;
                return 0;
        if (unlikely(BE_STOP & kni->vq_status)) {
                kni->vq_status |= BE_FINISH;
                return 0;


@@ -271,21 +271,21 @@ kni_chk_vhost_rx(struct kni_dev *kni)
 
        nb_skb = kni_fifo_count(q->fifo);
        nb_mbuf = kni_fifo_count(kni->rx_q);
 
        nb_skb = kni_fifo_count(q->fifo);
        nb_mbuf = kni_fifo_count(kni->rx_q);

-       
+

        nb_in = min(nb_mbuf, nb_skb);
        nb_in = min(nb_in, (unsigned)RX_BURST_SZ);
        nb_burst   = (nb_in & ~BURST_MASK);
        nb_backlog = (nb_in & BURST_MASK);
        nb_in = min(nb_mbuf, nb_skb);
        nb_in = min(nb_in, (unsigned)RX_BURST_SZ);
        nb_burst   = (nb_in & ~BURST_MASK);
        nb_backlog = (nb_in & BURST_MASK);

-       
+

        /* enqueue skb_queue per BURST_SIZE bulk */
        if (0 != nb_burst) {
                if (unlikely(RX_BURST_SZ != kni_fifo_get(
        /* enqueue skb_queue per BURST_SIZE bulk */
        if (0 != nb_burst) {
                if (unlikely(RX_BURST_SZ != kni_fifo_get(

-                                    kni->rx_q, (void **)&va, 
+                                    kni->rx_q, (void **)&va,

                                     RX_BURST_SZ)))
                        goto except;
 
                if (unlikely(RX_BURST_SZ != kni_fifo_get(
                                     RX_BURST_SZ)))
                        goto except;
 
                if (unlikely(RX_BURST_SZ != kni_fifo_get(

-                                    q->fifo, (void **)&skb, 
+                                    q->fifo, (void **)&skb,

                                     RX_BURST_SZ)))
                        goto except;
 
                                     RX_BURST_SZ)))
                        goto except;
 


@@ -306,11 +306,11 @@ kni_chk_vhost_rx(struct kni_dev *kni)
        }
 
        /* Ondemand wake up */
        }
 
        /* Ondemand wake up */

-       if ((nb_in == RX_BURST_SZ) || (nb_skb == 0) || 
-           ((nb_mbuf < RX_BURST_SZ) && (nb_mbuf != 0))) { 
-               wake_up_interruptible_poll(sk_sleep(&q->sk), 
+       if ((nb_in == RX_BURST_SZ) || (nb_skb == 0) ||
+           ((nb_mbuf < RX_BURST_SZ) && (nb_mbuf != 0))) {
+               wake_up_interruptible_poll(sk_sleep(&q->sk),

                                   POLLIN | POLLRDNORM | POLLRDBAND);
                                   POLLIN | POLLRDNORM | POLLRDBAND);

-               KNI_DBG_RX("RX CHK KICK nb_mbuf %d, nb_skb %d, nb_in %d\n", 
+               KNI_DBG_RX("RX CHK KICK nb_mbuf %d, nb_skb %d, nb_in %d\n",

                           nb_mbuf, nb_skb, nb_in);
        }
 
                           nb_mbuf, nb_skb, nb_in);
        }
 


@@ -324,11 +324,11 @@ except:
        return 0;
 }
 
        return 0;
 }
 

-static int 
+static int

 kni_sock_sndmsg(struct kiocb *iocb, struct socket *sock,
           struct msghdr *m, size_t total_len)
 {
 kni_sock_sndmsg(struct kiocb *iocb, struct socket *sock,
           struct msghdr *m, size_t total_len)
 {

-       struct kni_vhost_queue *q = 
+       struct kni_vhost_queue *q =

                container_of(sock->sk, struct kni_vhost_queue, sk);
        int vnet_hdr_len = 0;
        unsigned long len = total_len;
                container_of(sock->sk, struct kni_vhost_queue, sk);
        int vnet_hdr_len = 0;
        unsigned long len = total_len;


@@ -336,7 +336,7 @@ kni_sock_sndmsg(struct kiocb *iocb, struct socket *sock,
        if (unlikely(q == NULL || q->kni == NULL))
                return 0;
 
        if (unlikely(q == NULL || q->kni == NULL))
                return 0;
 

-       KNI_DBG_TX("kni_sndmsg len %ld, flags 0x%08x, nb_iov %d\n", 
+       KNI_DBG_TX("kni_sndmsg len %ld, flags 0x%08x, nb_iov %d\n",

                   len, q->flags, (int)m->msg_iovlen);
 
 #ifdef RTE_KNI_VHOST_VNET_HDR_EN
                   len, q->flags, (int)m->msg_iovlen);
 
 #ifdef RTE_KNI_VHOST_VNET_HDR_EN


@@ -354,15 +354,15 @@ kni_sock_sndmsg(struct kiocb *iocb, struct socket *sock,
        return kni_vhost_net_tx(q->kni, m->msg_iov, vnet_hdr_len, len);
 }
 
        return kni_vhost_net_tx(q->kni, m->msg_iov, vnet_hdr_len, len);
 }
 

-static int 
+static int

 kni_sock_rcvmsg(struct kiocb *iocb, struct socket *sock,
           struct msghdr *m, size_t len, int flags)
 {
        int vnet_hdr_len = 0;
 kni_sock_rcvmsg(struct kiocb *iocb, struct socket *sock,
           struct msghdr *m, size_t len, int flags)
 {
        int vnet_hdr_len = 0;

-       int pkt_len = 0; 
-       struct kni_vhost_queue *q = 
+       int pkt_len = 0;
+       struct kni_vhost_queue *q =

                container_of(sock->sk, struct kni_vhost_queue, sk);
                container_of(sock->sk, struct kni_vhost_queue, sk);

-       static struct virtio_net_hdr 
+       static struct virtio_net_hdr

                __attribute__ ((unused)) vnet_hdr = {
                .flags = 0,
                .gso_type = VIRTIO_NET_HDR_GSO_NONE
                __attribute__ ((unused)) vnet_hdr = {
                .flags = 0,
                .gso_type = VIRTIO_NET_HDR_GSO_NONE


@@ -379,31 +379,31 @@ kni_sock_rcvmsg(struct kiocb *iocb, struct socket *sock,
        }
 #endif
 
        }
 #endif
 

-       if (unlikely(0 == (pkt_len = kni_vhost_net_rx(q->kni, 
+       if (unlikely(0 == (pkt_len = kni_vhost_net_rx(q->kni,

                m->msg_iov, vnet_hdr_len, len))))
                return 0;
 
 #ifdef RTE_KNI_VHOST_VNET_HDR_EN
        /* no need to copy hdr when no pkt received */
                m->msg_iov, vnet_hdr_len, len))))
                return 0;
 
 #ifdef RTE_KNI_VHOST_VNET_HDR_EN
        /* no need to copy hdr when no pkt received */

-       if (unlikely(memcpy_toiovecend(m->msg_iov, 
+       if (unlikely(memcpy_toiovecend(m->msg_iov,

                (void *)&vnet_hdr, 0, vnet_hdr_len)))
                return -EFAULT;
 #endif
                (void *)&vnet_hdr, 0, vnet_hdr_len)))
                return -EFAULT;
 #endif

-       KNI_DBG_RX("kni_rcvmsg expect_len %ld, flags 0x%08x, pkt_len %d\n", 
+       KNI_DBG_RX("kni_rcvmsg expect_len %ld, flags 0x%08x, pkt_len %d\n",

                   (unsigned long)len, q->flags, pkt_len);
 
                   (unsigned long)len, q->flags, pkt_len);
 

-       return (pkt_len + vnet_hdr_len); 
+       return (pkt_len + vnet_hdr_len);

 }
 
 /* dummy tap like ioctl */
 }
 
 /* dummy tap like ioctl */

-static int 
+static int

 kni_sock_ioctl(struct socket *sock, unsigned int cmd,
              unsigned long arg)
 {
        void __user *argp = (void __user *)arg;
        struct ifreq __user *ifr = argp;
        unsigned int __user *up = argp;
 kni_sock_ioctl(struct socket *sock, unsigned int cmd,
              unsigned long arg)
 {
        void __user *argp = (void __user *)arg;
        struct ifreq __user *ifr = argp;
        unsigned int __user *up = argp;

-       struct kni_vhost_queue *q = 
+       struct kni_vhost_queue *q =

                container_of(sock->sk, struct kni_vhost_queue, sk);
        struct kni_dev *kni;
        unsigned int u;
                container_of(sock->sk, struct kni_vhost_queue, sk);
        struct kni_dev *kni;
        unsigned int u;


@@ -452,7 +452,7 @@ kni_sock_ioctl(struct socket *sock, unsigned int cmd,
 #ifdef RTE_KNI_VHOST_VNET_HDR_EN
                u |= IFF_VNET_HDR;
 #endif
 #ifdef RTE_KNI_VHOST_VNET_HDR_EN
                u |= IFF_VNET_HDR;
 #endif

-               if (put_user(u, up))  
+               if (put_user(u, up))

                        return -EFAULT;
                return 0;
 
                        return -EFAULT;
                return 0;
 


@@ -499,7 +499,7 @@ kni_sock_ioctl(struct socket *sock, unsigned int cmd,
        }
 }
 
        }
 }
 

-static int 
+static int

 kni_sock_compat_ioctl(struct socket *sock, unsigned int cmd,
                     unsigned long arg)
 {
 kni_sock_compat_ioctl(struct socket *sock, unsigned int cmd,
                     unsigned long arg)
 {


@@ -516,10 +516,10 @@ do {                                                      \
 }while(0)                                               \
 
 
 }while(0)                                               \
 
 

-static int 
+static int

 kni_sock_release(struct socket *sock)
 {
 kni_sock_release(struct socket *sock)
 {

-       struct kni_vhost_queue *q = 
+       struct kni_vhost_queue *q =

                container_of(sock->sk, struct kni_vhost_queue, sk);
        struct kni_dev *kni;
 
                container_of(sock->sk, struct kni_vhost_queue, sk);
        struct kni_dev *kni;
 


@@ -540,13 +540,13 @@ kni_sock_release(struct socket *sock)
        sock->sk = NULL;
 
        sock_put(&q->sk);
        sock->sk = NULL;
 
        sock_put(&q->sk);

-       
+

        KNI_DBG("dummy sock release done\n");
 
        return 0;
 }
 
        KNI_DBG("dummy sock release done\n");
 
        return 0;
 }
 

-int 
+int

 kni_sock_getname (struct socket *sock,
                  struct sockaddr *addr,
                  int *sockaddr_len, int peer)
 kni_sock_getname (struct socket *sock,
                  struct sockaddr *addr,
                  int *sockaddr_len, int peer)


@@ -566,13 +566,13 @@ static const struct proto_ops kni_socket_ops = {
        .compat_ioctl = kni_sock_compat_ioctl,
 };
 
        .compat_ioctl = kni_sock_compat_ioctl,
 };
 

-static void 
+static void

 kni_sk_write_space(struct sock *sk)
 {
        wait_queue_head_t *wqueue;
 
 kni_sk_write_space(struct sock *sk)
 {
        wait_queue_head_t *wqueue;
 

-       if (!sock_writeable(sk) || 
-           !test_and_clear_bit(SOCK_ASYNC_NOSPACE, 
+       if (!sock_writeable(sk) ||
+           !test_and_clear_bit(SOCK_ASYNC_NOSPACE,

                                &sk->sk_socket->flags))
                return;
        wqueue = sk_sleep(sk);
                                &sk->sk_socket->flags))
                return;
        wqueue = sk_sleep(sk);


@@ -581,10 +581,10 @@ kni_sk_write_space(struct sock *sk)
                        wqueue, POLLOUT | POLLWRNORM | POLLWRBAND);
 }
 
                        wqueue, POLLOUT | POLLWRNORM | POLLWRBAND);
 }
 

-static void 
+static void

 kni_sk_destruct(struct sock *sk)
 {
 kni_sk_destruct(struct sock *sk)
 {

-       struct kni_vhost_queue *q = 
+       struct kni_vhost_queue *q =

                container_of(sk, struct kni_vhost_queue, sk);
 
        if (!q)
                container_of(sk, struct kni_vhost_queue, sk);
 
        if (!q)


@@ -607,7 +607,7 @@ kni_sk_destruct(struct sock *sk)
        }
 }
 
        }
 }
 

-static int 
+static int

 kni_vhost_backend_init(struct kni_dev *kni)
 {
        struct kni_vhost_queue *q;
 kni_vhost_backend_init(struct kni_dev *kni)
 {
        struct kni_vhost_queue *q;


@@ -635,7 +635,7 @@ kni_vhost_backend_init(struct kni_dev *kni)
 
        /* cache init */
        q->cache = (struct sk_buff*)
 
        /* cache init */
        q->cache = (struct sk_buff*)

-               kzalloc(RTE_KNI_VHOST_MAX_CACHE_SIZE * sizeof(struct sk_buff), 
+               kzalloc(RTE_KNI_VHOST_MAX_CACHE_SIZE * sizeof(struct sk_buff),

                        GFP_KERNEL);
        if (!q->cache)
                goto free_fd;
                        GFP_KERNEL);
        if (!q->cache)
                goto free_fd;


@@ -653,7 +653,7 @@ kni_vhost_backend_init(struct kni_dev *kni)
                kni_fifo_put(fifo, (void**)&elem, 1);
        }
        q->fifo = fifo;
                kni_fifo_put(fifo, (void**)&elem, 1);
        }
        q->fifo = fifo;

-       
+

        /* store sockfd in vhost_queue */
        q->sockfd = sockfd;
 
        /* store sockfd in vhost_queue */
        q->sockfd = sockfd;
 


@@ -671,18 +671,18 @@ kni_vhost_backend_init(struct kni_dev *kni)
 #ifdef RTE_KNI_VHOST_VNET_HDR_EN
        q->flags |= IFF_VNET_HDR;
 #endif
 #ifdef RTE_KNI_VHOST_VNET_HDR_EN
        q->flags |= IFF_VNET_HDR;
 #endif

-       
+

        /* bind kni_dev with vhost_queue */
        q->kni = kni;
        kni->vhost_queue = q;
        /* bind kni_dev with vhost_queue */
        q->kni = kni;
        kni->vhost_queue = q;

-       
+

        wmb();
 
        kni->vq_status = BE_START;
 
        KNI_DBG("backend init sockfd=%d, sock->wq=0x%16llx,"
        wmb();
 
        kni->vq_status = BE_START;
 
        KNI_DBG("backend init sockfd=%d, sock->wq=0x%16llx,"

-                 "sk->sk_wq=0x%16llx", 
-                 q->sockfd, (uint64_t)q->sock->wq, 
+                 "sk->sk_wq=0x%16llx",
+                 q->sockfd, (uint64_t)q->sock->wq,

                  (uint64_t)q->sk.sk_wq);
 
        return 0;
                  (uint64_t)q->sk.sk_wq);
 
        return 0;


@@ -742,7 +742,7 @@ set_sock_en(struct device *dev, struct device_attribute *attr,
        if (0 != strict_strtoul(buf, 0, &en))
                return -EINVAL;
 
        if (0 != strict_strtoul(buf, 0, &en))
                return -EINVAL;
 

-       if (en) 
+       if (en)

                err = kni_vhost_backend_init(kni);
 
        return err ? err : count;
                err = kni_vhost_backend_init(kni);
 
        return err ? err : count;


@@ -760,11 +760,11 @@ static const struct attribute_group dev_attr_grp = {
        .attrs = dev_attrs,
 };
 
        .attrs = dev_attrs,
 };
 

-int 
+int

 kni_vhost_backend_release(struct kni_dev *kni)
 {
 kni_vhost_backend_release(struct kni_dev *kni)
 {

-       struct kni_vhost_queue *q = kni->vhost_queue; 
-       
+       struct kni_vhost_queue *q = kni->vhost_queue;
+

        if (q == NULL)
                return 0;
 
        if (q == NULL)
                return 0;
 


@@ -776,7 +776,7 @@ kni_vhost_backend_release(struct kni_dev *kni)
        return 0;
 }
 
        return 0;
 }
 

-int 
+int

 kni_vhost_init(struct kni_dev *kni)
 {
        struct net_device *dev = kni->net_dev;
 kni_vhost_init(struct kni_dev *kni)
 {
        struct net_device *dev = kni->net_dev;

diff --git a/lib/librte_eal/linuxapp/xen_dom0/Makefile b/lib/librte_eal/linuxapp/xen_dom0/Makefile
index 42f5478..9d22fb9 100644 (file)
--- a/lib/librte_eal/linuxapp/xen_dom0/Makefile
+++ b/lib/librte_eal/linuxapp/xen_dom0/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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,7 +40,7 @@ MODULE = rte_dom0_mm
 # CFLAGS
 #
 MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50
 # CFLAGS
 #
 MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50

-MODULE_CFLAGS += -I$(RTE_OUTPUT)/include 
+MODULE_CFLAGS += -I$(RTE_OUTPUT)/include

 MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
 MODULE_CFLAGS += -Wall -Werror
 
 MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
 MODULE_CFLAGS += -Wall -Werror
 

diff --git a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_dev.h b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_dev.h
index 9a155a1..a9dd0d2 100644 (file)
--- a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_dev.h
+++ b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_dev.h
@@ -1,38 +1,38 @@
 /*-
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
 /*-
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.

- * 
+ *

  *   GPL LICENSE SUMMARY
  *   GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  *   Contact Information:
  *   Intel Corporation

- * 
+ *

  *   BSD LICENSE
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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


@@ -42,7 +42,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.
  *     * 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
  *   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


@@ -54,7 +54,7 @@
  *   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.
  *   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.

- * 
+ *

  */
 #ifndef _DOM0_MM_DEV_H_
 #define _DOM0_MM_DEV_H_
  */
 #ifndef _DOM0_MM_DEV_H_
 #define _DOM0_MM_DEV_H_

diff --git a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c
index edee86e..dfb271d 100644 (file)
--- a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c
+++ b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c
@@ -1,38 +1,38 @@
 /*-
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
 /*-
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.

- * 
+ *

  *   GPL LICENSE SUMMARY
  *   GPL LICENSE SUMMARY

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.

- * 
+ *

  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
  *   published by the Free Software Foundation.

- * 
+ *

  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.
  *   This program is distributed in the hope that it will be useful, but
  *   WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *   General Public License for more details.

- * 
+ *

  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *   The full GNU General Public License is included in this distribution
  *   in the file called LICENSE.GPL.

- * 
+ *

  *   Contact Information:
  *   Intel Corporation
  *   Contact Information:
  *   Intel Corporation

- * 
+ *

  *   BSD LICENSE
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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


@@ -42,7 +42,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.
  *     * 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
  *   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


@@ -54,7 +54,7 @@
  *   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.
  *   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 <linux/module.h>
  */
 
 #include <linux/module.h>


@@ -65,15 +65,15 @@
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
 #include <linux/version.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
 #include <linux/version.h>

- 
+

 #include <xen/xen.h>
 #include <xen/page.h>
 #include <xen/xen-ops.h>
 #include <xen/interface/memory.h>
 #include <xen/xen.h>
 #include <xen/page.h>
 #include <xen/xen-ops.h>
 #include <xen/interface/memory.h>

- 
+

 #include <rte_config.h>
 #include <exec-env/rte_dom0_common.h>
 #include <rte_config.h>
 #include <exec-env/rte_dom0_common.h>

- 
+

 #include "dom0_mm_dev.h"
 
 MODULE_LICENSE("Dual BSD/GPL");
 #include "dom0_mm_dev.h"
 
 MODULE_LICENSE("Dual BSD/GPL");


@@ -122,8 +122,8 @@ store_memsize(struct device *dev, struct device_attribute *attr,
 {
        int err = 0;
        unsigned long mem_size;
 {
        int err = 0;
        unsigned long mem_size;

-       
-       if (0 != strict_strtoul(buf, 0, &mem_size)) 
+
+       if (0 != strict_strtoul(buf, 0, &mem_size))

                return  -EINVAL;
 
        mutex_lock(&dom0_dev.data_lock);
                return  -EINVAL;
 
        mutex_lock(&dom0_dev.data_lock);


@@ -134,7 +134,7 @@ store_memsize(struct device *dev, struct device_attribute *attr,
                XEN_ERR("configure memory size fail\n");
                err = -EINVAL;
                goto fail;
                XEN_ERR("configure memory size fail\n");
                err = -EINVAL;
                goto fail;

-       } else 
+       } else

                dom0_dev.config_memsize = mem_size;
 
 fail:
                dom0_dev.config_memsize = mem_size;
 
 fail:


@@ -158,16 +158,16 @@ static const struct attribute_group dev_attr_grp = {
 };
 
 
 };
 
 

-static void 
+static void

 sort_viraddr(struct memblock_info *mb, int cnt)
 {
 sort_viraddr(struct memblock_info *mb, int cnt)
 {

-       int i,j; 
+       int i,j;

        uint64_t tmp_pfn;
        uint64_t tmp_viraddr;
 
        /*sort virtual address and pfn */
        uint64_t tmp_pfn;
        uint64_t tmp_viraddr;
 
        /*sort virtual address and pfn */

-       for(i = 0; i < cnt; i ++) {  
-               for(j = cnt - 1; j > i; j--) {  
+       for(i = 0; i < cnt; i ++) {
+               for(j = cnt - 1; j > i; j--) {

                        if(mb[j].pfn < mb[j - 1].pfn) {
                                tmp_pfn = mb[j - 1].pfn;
                                mb[j - 1].pfn = mb[j].pfn;
                        if(mb[j].pfn < mb[j - 1].pfn) {
                                tmp_pfn = mb[j - 1].pfn;
                                mb[j - 1].pfn = mb[j].pfn;


@@ -176,7 +176,7 @@ sort_viraddr(struct memblock_info *mb, int cnt)
                                tmp_viraddr = mb[j - 1].vir_addr;
                                mb[j - 1].vir_addr = mb[j].vir_addr;
                                mb[j].vir_addr = tmp_viraddr;
                                tmp_viraddr = mb[j - 1].vir_addr;
                                mb[j - 1].vir_addr = mb[j].vir_addr;
                                mb[j].vir_addr = tmp_viraddr;

-                       } 
+                       }

                }
        }
 }
                }
        }
 }


@@ -189,10 +189,10 @@ dom0_find_memdata(const char * mem_name)
        for(i = 0; i< NUM_MEM_CTX; i++) {
                if(dom0_dev.mm_data[i] == NULL)
                        continue;
        for(i = 0; i< NUM_MEM_CTX; i++) {
                if(dom0_dev.mm_data[i] == NULL)
                        continue;

-               if (!strncmp(dom0_dev.mm_data[i]->name, mem_name, 
+               if (!strncmp(dom0_dev.mm_data[i]->name, mem_name,

                        sizeof(char) * DOM0_NAME_MAX)) {
                        idx = i;
                        sizeof(char) * DOM0_NAME_MAX)) {
                        idx = i;

-                       break; 
+                       break;

                }
        }
 
                }
        }
 


@@ -298,7 +298,7 @@ dom0_memory_free(uint32_t rsv_size)
                vstart = rsv_mm_info[i].vir_addr;
                if (vstart) {
                        if (rsv_mm_info[i].exchange_flag)
                vstart = rsv_mm_info[i].vir_addr;
                if (vstart) {
                        if (rsv_mm_info[i].exchange_flag)

-                               xen_destroy_contiguous_region(vstart, 
+                               xen_destroy_contiguous_region(vstart,

                                        DOM0_CONTIG_NUM_ORDER);
 
                        size = DOM0_MEMBLOCK_SIZE;
                                        DOM0_CONTIG_NUM_ORDER);
 
                        size = DOM0_MEMBLOCK_SIZE;


@@ -364,12 +364,12 @@ find_memseg(int count, struct dom0_mm_data * mm_data)
                for (j = i + 1; j < count; j++) {
 
                        /* ignore exchange fail memory block */
                for (j = i + 1; j < count; j++) {
 
                        /* ignore exchange fail memory block */

-                       if (mm_data->block_info[j].exchange_flag == 0) 
+                       if (mm_data->block_info[j].exchange_flag == 0)

                                break;
                                break;

-                       
-                       if (mm_data->block_info[j].pfn != 
+
+                       if (mm_data->block_info[j].pfn !=

                                (mm_data->block_info[j - 1].pfn +
                                (mm_data->block_info[j - 1].pfn +

-                                        DOM0_MEMBLOCK_SIZE / PAGE_SIZE)) 
+                                        DOM0_MEMBLOCK_SIZE / PAGE_SIZE))

                            break;
                        ++k;
                        mm_data->seg_info[idx].mfn[k] = mm_data->block_info[j].mfn;
                            break;
                        ++k;
                        mm_data->seg_info[idx].mfn[k] = mm_data->block_info[j].mfn;


@@ -378,7 +378,7 @@ find_memseg(int count, struct dom0_mm_data * mm_data)
                num_block = j - i;
                zone_len = num_block * DOM0_MEMBLOCK_SIZE;
                mm_data->seg_info[idx].size = zone_len;
                num_block = j - i;
                zone_len = num_block * DOM0_MEMBLOCK_SIZE;
                mm_data->seg_info[idx].size = zone_len;

-               
+

                XEN_PRINT("memseg id=%d, size=0x%llx\n", idx, zone_len);
                i = i+ num_block;
                idx++;
                XEN_PRINT("memseg id=%d, size=0x%llx\n", idx, zone_len);
                i = i+ num_block;
                idx++;


@@ -466,8 +466,8 @@ dom0_memory_reserve(uint32_t rsv_size)
        for (i = 0; i< num_block; i++) {
 
                /*
        for (i = 0; i< num_block; i++) {
 
                /*

-                * This API is used to exchage MFN for getting a block of  
-                * contiguous physical addresses, its maximum size is 2M.  
+                * This API is used to exchage MFN for getting a block of
+                * contiguous physical addresses, its maximum size is 2M.

                 */
        #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
                if (xen_create_contiguous_region(rsv_mm_info[i].vir_addr,
                 */
        #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
                if (xen_create_contiguous_region(rsv_mm_info[i].vir_addr,


@@ -480,7 +480,7 @@ dom0_memory_reserve(uint32_t rsv_size)
                        rsv_mm_info[i].mfn =
                                pfn_to_mfn(rsv_mm_info[i].pfn);
                        rsv_mm_info[i].used = 0;
                        rsv_mm_info[i].mfn =
                                pfn_to_mfn(rsv_mm_info[i].pfn);
                        rsv_mm_info[i].used = 0;

-               } else { 
+               } else {

                        XEN_ERR("exchange memeory fail\n");
                        rsv_mm_info[i].exchange_flag = 0;
                        dom0_dev.fail_times++;
                        XEN_ERR("exchange memeory fail\n");
                        rsv_mm_info[i].exchange_flag = 0;
                        dom0_dev.fail_times++;


@@ -490,7 +490,7 @@ dom0_memory_reserve(uint32_t rsv_size)
                        }
                }
        }
                        }
                }
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -535,14 +535,14 @@ dom0_check_memory (struct memory_info *meminfo)
                ++meminfo->size;
 
        mem_size = meminfo->size;
                ++meminfo->size;
 
        mem_size = meminfo->size;

-       if (dom0_dev.num_mem_ctx > NUM_MEM_CTX) { 
+       if (dom0_dev.num_mem_ctx > NUM_MEM_CTX) {

                XEN_ERR("Memory data space is full in Dom0 driver\n");
                return -1;
        }
        idx = dom0_find_memdata(meminfo->name);
                XEN_ERR("Memory data space is full in Dom0 driver\n");
                return -1;
        }
        idx = dom0_find_memdata(meminfo->name);

-       if (idx >= 0) { 
-               XEN_ERR("Memory data name %s has already exsited in Dom0 driver.\n", 
-                       meminfo->name); 
+       if (idx >= 0) {
+               XEN_ERR("Memory data name %s has already exsited in Dom0 driver.\n",
+                       meminfo->name);

                return -1;
        }
        if ((dom0_dev.used_memsize + mem_size) > rsv_memsize) {
                return -1;
        }
        if ((dom0_dev.used_memsize + mem_size) > rsv_memsize) {


@@ -575,13 +575,13 @@ dom0_init(void)
                XEN_ERR("Misc device registration failed\n");
                return -EPERM;
        }
                XEN_ERR("Misc device registration failed\n");
                return -EPERM;
        }

-       
+

        mutex_init(&dom0_dev.data_lock);
        dom0_kobj = kobject_create_and_add("dom0-mm", mm_kobj);
 
        if (!dom0_kobj) {
                XEN_ERR("dom0-mm object creation failed\n");
        mutex_init(&dom0_dev.data_lock);
        dom0_kobj = kobject_create_and_add("dom0-mm", mm_kobj);
 
        if (!dom0_kobj) {
                XEN_ERR("dom0-mm object creation failed\n");

-               misc_deregister(&dom0_dev.miscdev);     
+               misc_deregister(&dom0_dev.miscdev);

                return -ENOMEM;
        }
 
                return -ENOMEM;
        }
 


@@ -597,7 +597,7 @@ dom0_init(void)
                misc_deregister(&dom0_dev.miscdev);
                return -ENOMEM;
        }
                misc_deregister(&dom0_dev.miscdev);
                return -ENOMEM;
        }

-       
+

        XEN_PRINT("####### DPDK Xen Dom0 module loaded  #######\n");
 
        return 0;
        XEN_PRINT("####### DPDK Xen Dom0 module loaded  #######\n");
 
        return 0;


@@ -635,7 +635,7 @@ dom0_release(struct inode *inode, struct file *file)
                return ret;
 
        mutex_lock(&dom0_dev.data_lock);
                return ret;
 
        mutex_lock(&dom0_dev.data_lock);

-       if (--mm_data->refcnt == 0) 
+       if (--mm_data->refcnt == 0)

                ret = dom0_memory_release(mm_data);
        mutex_unlock(&dom0_dev.data_lock);
 
                ret = dom0_memory_release(mm_data);
        mutex_unlock(&dom0_dev.data_lock);
 


@@ -644,7 +644,7 @@ dom0_release(struct inode *inode, struct file *file)
        return ret;
 }
 
        return ret;
 }
 

-static int 
+static int

 dom0_mmap(struct file *file, struct vm_area_struct *vm)
 {
        int status = 0;
 dom0_mmap(struct file *file, struct vm_area_struct *vm)
 {
        int status = 0;


@@ -660,7 +660,7 @@ dom0_mmap(struct file *file, struct vm_area_struct *vm)
                mutex_unlock(&dom0_dev.data_lock);
                return -EINVAL;
        }
                mutex_unlock(&dom0_dev.data_lock);
                return -EINVAL;
        }

-       
+

        if (size > mm_data->seg_info[idx].size){
                mutex_unlock(&dom0_dev.data_lock);
                return -EINVAL;
        if (size > mm_data->seg_info[idx].size){
                mutex_unlock(&dom0_dev.data_lock);
                return -EINVAL;


@@ -694,7 +694,7 @@ dom0_ioctl(struct file *file,
        case _IOC_NR(RTE_DOM0_IOCTL_PREPARE_MEMSEG):
                ret = copy_from_user(&meminfo, (void *)ioctl_param,
                        sizeof(struct memory_info));
        case _IOC_NR(RTE_DOM0_IOCTL_PREPARE_MEMSEG):
                ret = copy_from_user(&meminfo, (void *)ioctl_param,
                        sizeof(struct memory_info));

-               if (ret)  
+               if (ret)

                        return  -EFAULT;
 
                if (mm_data != NULL) {
                        return  -EFAULT;
 
                if (mm_data != NULL) {


@@ -734,7 +734,7 @@ dom0_ioctl(struct file *file,
        case _IOC_NR(RTE_DOM0_IOCTL_ATTACH_TO_MEMSEG):
                ret = copy_from_user(name, (void *)ioctl_param,
                                sizeof(char) * DOM0_NAME_MAX);
        case _IOC_NR(RTE_DOM0_IOCTL_ATTACH_TO_MEMSEG):
                ret = copy_from_user(name, (void *)ioctl_param,
                                sizeof(char) * DOM0_NAME_MAX);

-               if (ret) 
+               if (ret)

                        return -EFAULT;
 
                mutex_lock(&dom0_dev.data_lock);
                        return -EFAULT;
 
                mutex_lock(&dom0_dev.data_lock);


@@ -743,7 +743,7 @@ dom0_ioctl(struct file *file,
                        mutex_unlock(&dom0_dev.data_lock);
                        return -EINVAL;
                }
                        mutex_unlock(&dom0_dev.data_lock);
                        return -EINVAL;
                }

-               
+

                mm_data = dom0_dev.mm_data[idx];
                mm_data->refcnt++;
                file->private_data = mm_data;
                mm_data = dom0_dev.mm_data[idx];
                mm_data->refcnt++;
                file->private_data = mm_data;


@@ -751,7 +751,7 @@ dom0_ioctl(struct file *file,
                break;
 
        case _IOC_NR(RTE_DOM0_IOCTL_GET_NUM_MEMSEG):
                break;
 
        case _IOC_NR(RTE_DOM0_IOCTL_GET_NUM_MEMSEG):

-               ret = copy_to_user((void *)ioctl_param, &mm_data->num_memseg, 
+               ret = copy_to_user((void *)ioctl_param, &mm_data->num_memseg,

                                sizeof(int));
                if (ret)
                        return -EFAULT;
                                sizeof(int));
                if (ret)
                        return -EFAULT;


@@ -759,17 +759,17 @@ dom0_ioctl(struct file *file,
 
        case _IOC_NR(RTE_DOM0_IOCTL_GET_MEMSEG_INFO):
                ret = copy_to_user((void *)ioctl_param,
 
        case _IOC_NR(RTE_DOM0_IOCTL_GET_MEMSEG_INFO):
                ret = copy_to_user((void *)ioctl_param,

-                               &mm_data->seg_info[0], 
-                               sizeof(struct memseg_info) * 
+                               &mm_data->seg_info[0],
+                               sizeof(struct memseg_info) *

                                mm_data->num_memseg);
                                mm_data->num_memseg);

-               if (ret) 
+               if (ret)

                        return -EFAULT;
                break;
        default:
                XEN_PRINT("IOCTL default \n");
                break;
        }
                        return -EFAULT;
                break;
        default:
                XEN_PRINT("IOCTL default \n");
                break;
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 

diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile
index 7715904..b310f8b 100644 (file)
--- a/lib/librte_ether/Makefile
+++ b/lib/librte_ether/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 11e877b..d10982f 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -442,13 +442,13 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
 
        if (RTE_ETH_DEV_SRIOV(dev).active != 0) {
                /* check multi-queue mode */
 
        if (RTE_ETH_DEV_SRIOV(dev).active != 0) {
                /* check multi-queue mode */

-               if ((dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) || 
+               if ((dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ||

                    (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) ||
                    (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB_RSS) ||
                    (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB)) {
                        /* SRIOV only works in VMDq enable mode */
                        PMD_DEBUG_TRACE("ethdev port_id=%hhu SRIOV active, "
                    (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) ||
                    (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB_RSS) ||
                    (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB)) {
                        /* SRIOV only works in VMDq enable mode */
                        PMD_DEBUG_TRACE("ethdev port_id=%hhu SRIOV active, "

-                                       "wrong VMDQ mq_mode rx %u tx %u\n", 
+                                       "wrong VMDQ mq_mode rx %u tx %u\n",

                                        port_id,
                                        dev_conf->rxmode.mq_mode,
                                        dev_conf->txmode.mq_mode);
                                        port_id,
                                        dev_conf->rxmode.mq_mode,
                                        dev_conf->txmode.mq_mode);


@@ -461,7 +461,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                case ETH_MQ_RX_VMDQ_DCB_RSS:
                        /* DCB/RSS VMDQ in SRIOV mode, not implement yet */
                        PMD_DEBUG_TRACE("ethdev port_id=%hhu SRIOV active, "
                case ETH_MQ_RX_VMDQ_DCB_RSS:
                        /* DCB/RSS VMDQ in SRIOV mode, not implement yet */
                        PMD_DEBUG_TRACE("ethdev port_id=%hhu SRIOV active, "

-                                       "unsupported VMDQ mq_mode rx %u\n", 
+                                       "unsupported VMDQ mq_mode rx %u\n",

                                        port_id, dev_conf->rxmode.mq_mode);
                        return (-EINVAL);
                default: /* ETH_MQ_RX_VMDQ_ONLY or ETH_MQ_RX_NONE */
                                        port_id, dev_conf->rxmode.mq_mode);
                        return (-EINVAL);
                default: /* ETH_MQ_RX_VMDQ_ONLY or ETH_MQ_RX_NONE */


@@ -476,7 +476,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                case ETH_MQ_TX_VMDQ_DCB:
                        /* DCB VMDQ in SRIOV mode, not implement yet */
                        PMD_DEBUG_TRACE("ethdev port_id=%hhu SRIOV active, "
                case ETH_MQ_TX_VMDQ_DCB:
                        /* DCB VMDQ in SRIOV mode, not implement yet */
                        PMD_DEBUG_TRACE("ethdev port_id=%hhu SRIOV active, "

-                                       "unsupported VMDQ mq_mode tx %u\n", 
+                                       "unsupported VMDQ mq_mode tx %u\n",

                                        port_id, dev_conf->txmode.mq_mode);
                        return (-EINVAL);
                default: /* ETH_MQ_TX_VMDQ_ONLY or ETH_MQ_TX_NONE */
                                        port_id, dev_conf->txmode.mq_mode);
                        return (-EINVAL);
                default: /* ETH_MQ_TX_VMDQ_ONLY or ETH_MQ_TX_NONE */


@@ -491,7 +491,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                if ((nb_rx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool) ||
                    (nb_tx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool)) {
                        PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
                if ((nb_rx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool) ||
                    (nb_tx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool)) {
                        PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "

-                                   "queue number must less equal to %d\n", 
+                                   "queue number must less equal to %d\n",

                                        port_id, RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool);
                        return (-EINVAL);
                }
                                        port_id, RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool);
                        return (-EINVAL);
                }


@@ -499,7 +499,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                /* For vmdb+dcb mode check our configuration before we go further */
                if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) {
                        const struct rte_eth_vmdq_dcb_conf *conf;
                /* For vmdb+dcb mode check our configuration before we go further */
                if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) {
                        const struct rte_eth_vmdq_dcb_conf *conf;

-                       
+

                        if (nb_rx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q "
                                                "!= %d\n",
                        if (nb_rx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q "
                                                "!= %d\n",


@@ -517,7 +517,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                }
                if (dev_conf->txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) {
                        const struct rte_eth_vmdq_dcb_tx_conf *conf;
                }
                if (dev_conf->txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) {
                        const struct rte_eth_vmdq_dcb_tx_conf *conf;

-                       
+

                        if (nb_tx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q "
                                                "!= %d\n",
                        if (nb_tx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q "
                                                "!= %d\n",


@@ -534,11 +534,11 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                return (-EINVAL);
                        }
                }
                                return (-EINVAL);
                        }
                }

-               
+

                /* For DCB mode check our configuration before we go further */
                if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) {
                        const struct rte_eth_dcb_rx_conf *conf;
                /* For DCB mode check our configuration before we go further */
                if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) {
                        const struct rte_eth_dcb_rx_conf *conf;

-                       
+

                        if (nb_rx_q != ETH_DCB_NUM_QUEUES) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q "
                                                "!= %d\n",
                        if (nb_rx_q != ETH_DCB_NUM_QUEUES) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q "
                                                "!= %d\n",


@@ -555,10 +555,10 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                return (-EINVAL);
                        }
                }
                                return (-EINVAL);
                        }
                }

-               
+

                if (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) {
                        const struct rte_eth_dcb_tx_conf *conf;
                if (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) {
                        const struct rte_eth_dcb_tx_conf *conf;

-                       
+

                        if (nb_tx_q != ETH_DCB_NUM_QUEUES) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q "
                                                "!= %d\n",
                        if (nb_tx_q != ETH_DCB_NUM_QUEUES) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q "
                                                "!= %d\n",


@@ -1233,7 +1233,7 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
        int ret = 0;
        int mask = 0;
        int cur, org = 0;
        int ret = 0;
        int mask = 0;
        int cur, org = 0;

-       
+

        if (port_id >= nb_ports) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        if (port_id >= nb_ports) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);


@@ -1248,7 +1248,7 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
                dev->data->dev_conf.rxmode.hw_vlan_strip = (uint8_t)cur;
                mask |= ETH_VLAN_STRIP_MASK;
        }
                dev->data->dev_conf.rxmode.hw_vlan_strip = (uint8_t)cur;
                mask |= ETH_VLAN_STRIP_MASK;
        }

-       
+

        cur = !!(offload_mask & ETH_VLAN_FILTER_OFFLOAD);
        org = !!(dev->data->dev_conf.rxmode.hw_vlan_filter);
        if (cur != org){
        cur = !!(offload_mask & ETH_VLAN_FILTER_OFFLOAD);
        org = !!(dev->data->dev_conf.rxmode.hw_vlan_filter);
        if (cur != org){


@@ -1266,7 +1266,7 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
        /*no change*/
        if(mask == 0)
                return ret;
        /*no change*/
        if(mask == 0)
                return ret;

-       
+

        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_offload_set, -ENOTSUP);
        (*dev->dev_ops->vlan_offload_set)(dev, mask);
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_offload_set, -ENOTSUP);
        (*dev->dev_ops->vlan_offload_set)(dev, mask);
 


@@ -1631,16 +1631,16 @@ rte_eth_dev_rss_reta_update(uint8_t port_id, struct rte_eth_rss_reta *reta_conf)
                                        "queue=%d\n",port_id,reta_conf->reta[i]);
 
                                return (-EINVAL);
                                        "queue=%d\n",port_id,reta_conf->reta[i]);
 
                                return (-EINVAL);

-                       } 
+                       }

                }
        }
 
        if (reta_conf->mask_hi != 0) {
                }
        }
 
        if (reta_conf->mask_hi != 0) {

-               for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {       
+               for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {

                        j = (uint8_t)(i + ETH_RSS_RETA_NUM_ENTRIES/2);
 
                        /* Check if the max entry >= 128 */
                        j = (uint8_t)(i + ETH_RSS_RETA_NUM_ENTRIES/2);
 
                        /* Check if the max entry >= 128 */

-                       if ((reta_conf->mask_hi & (1ULL << i)) && 
+                       if ((reta_conf->mask_hi & (1ULL << i)) &&

                                (reta_conf->reta[j] >= max_rxq)) {
                                PMD_DEBUG_TRACE("RETA hash index output"
                                        "configration for port=%d,invalid"
                                (reta_conf->reta[j] >= max_rxq)) {
                                PMD_DEBUG_TRACE("RETA hash index output"
                                        "configration for port=%d,invalid"


@@ -1655,11 +1655,11 @@ rte_eth_dev_rss_reta_update(uint8_t port_id, struct rte_eth_rss_reta *reta_conf)
        return (*dev->dev_ops->reta_update)(dev, reta_conf);
 }
 
        return (*dev->dev_ops->reta_update)(dev, reta_conf);
 }
 

-int 
+int

 rte_eth_dev_rss_reta_query(uint8_t port_id, struct rte_eth_rss_reta *reta_conf)
 {
        struct rte_eth_dev *dev;
 rte_eth_dev_rss_reta_query(uint8_t port_id, struct rte_eth_rss_reta *reta_conf)
 {
        struct rte_eth_dev *dev;

-       
+

        if (port_id >= nb_ports) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        if (port_id >= nb_ports) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);


@@ -1780,7 +1780,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP);
 
        if (is_zero_ether_addr(addr)) {
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP);
 
        if (is_zero_ether_addr(addr)) {

-               PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", 
+               PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n",

                        port_id);
                return (-EINVAL);
        }
                        port_id);
                return (-EINVAL);
        }


@@ -1788,7 +1788,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
                PMD_DEBUG_TRACE("pool id must be 0-%d\n",ETH_64_POOLS - 1);
                return (-EINVAL);
        }
                PMD_DEBUG_TRACE("pool id must be 0-%d\n",ETH_64_POOLS - 1);
                return (-EINVAL);
        }

-       
+

        index = get_mac_addr_index(port_id, addr);
        if (index < 0) {
                index = get_mac_addr_index(port_id, &null_mac_addr);
        index = get_mac_addr_index(port_id, addr);
        if (index < 0) {
                index = get_mac_addr_index(port_id, &null_mac_addr);


@@ -1799,7 +1799,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
                }
        } else {
                pool_mask = dev->data->mac_pool_sel[index];
                }
        } else {
                pool_mask = dev->data->mac_pool_sel[index];

-               
+

                /* Check if both MAC address and pool is alread there, and do nothing */
                if (pool_mask & (1ULL << pool))
                        return 0;
                /* Check if both MAC address and pool is alread there, and do nothing */
                if (pool_mask & (1ULL << pool))
                        return 0;


@@ -1810,7 +1810,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
 
        /* Update address in NIC data structure */
        ether_addr_copy(addr, &dev->data->mac_addrs[index]);
 
        /* Update address in NIC data structure */
        ether_addr_copy(addr, &dev->data->mac_addrs[index]);

-       
+

        /* Update pool bitmap in NIC data structure */
        dev->data->mac_pool_sel[index] |= (1ULL << pool);
 
        /* Update pool bitmap in NIC data structure */
        dev->data->mac_pool_sel[index] |= (1ULL << pool);
 


@@ -1846,7 +1846,7 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
        return 0;
 }
 
        return 0;
 }
 

-int 
+int

 rte_eth_dev_set_vf_rxmode(uint8_t port_id,  uint16_t vf,
                                uint16_t rx_mode, uint8_t on)
 {
 rte_eth_dev_set_vf_rxmode(uint8_t port_id,  uint16_t vf,
                                uint16_t rx_mode, uint8_t on)
 {


@@ -1858,8 +1858,8 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id,  uint16_t vf,
                PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n",
                                port_id);
                return (-ENODEV);
                PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n",
                                port_id);
                return (-ENODEV);

-       }       
-       
+       }
+

        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
 
        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
 


@@ -1872,7 +1872,7 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id,  uint16_t vf,
        if (rx_mode == 0)
        {
                PMD_DEBUG_TRACE("set VF RX mode:mode mask ca not be zero\n");
        if (rx_mode == 0)
        {
                PMD_DEBUG_TRACE("set VF RX mode:mode mask ca not be zero\n");

-               return (-EINVAL);       
+               return (-EINVAL);

        }
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx_mode, -ENOTSUP);
        return (*dev->dev_ops->set_vf_rx_mode)(dev, vf, rx_mode, on);
        }
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx_mode, -ENOTSUP);
        return (*dev->dev_ops->set_vf_rx_mode)(dev, vf, rx_mode, on);


@@ -1908,16 +1908,16 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
        int index;
        int ret;
        struct rte_eth_dev *dev;
        int index;
        int ret;
        struct rte_eth_dev *dev;

-       
+

        if (port_id >= nb_ports) {
                PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
                        port_id);
                return (-ENODEV);
        }
        if (port_id >= nb_ports) {
                PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
                        port_id);
                return (-ENODEV);
        }

-       
+

        dev = &rte_eth_devices[port_id];
        if (is_zero_ether_addr(addr)) {
        dev = &rte_eth_devices[port_id];
        if (is_zero_ether_addr(addr)) {

-               PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", 
+               PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n",

                        port_id);
                return (-EINVAL);
        }
                        port_id);
                return (-EINVAL);
        }


@@ -1926,22 +1926,22 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
        /* Check if it's already there, and do nothing */
        if ((index >= 0) && (on))
                return 0;
        /* Check if it's already there, and do nothing */
        if ((index >= 0) && (on))
                return 0;

-       
+

        if (index < 0) {
                if (!on) {
        if (index < 0) {
                if (!on) {

-                       PMD_DEBUG_TRACE("port %d: the MAC address was not" 
+                       PMD_DEBUG_TRACE("port %d: the MAC address was not"

                                "set in UTA\n", port_id);
                        return (-EINVAL);
                }
                                "set in UTA\n", port_id);
                        return (-EINVAL);
                }

-                       
+

                index = get_hash_mac_addr_index(port_id, &null_mac_addr);
                if (index < 0) {
                        PMD_DEBUG_TRACE("port %d: MAC address array full\n",
                                        port_id);
                        return (-ENOSPC);
                }
                index = get_hash_mac_addr_index(port_id, &null_mac_addr);
                if (index < 0) {
                        PMD_DEBUG_TRACE("port %d: MAC address array full\n",
                                        port_id);
                        return (-ENOSPC);
                }

-       } 
-        
+       }
+

        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->uc_hash_table_set, -ENOTSUP);
        ret = (*dev->dev_ops->uc_hash_table_set)(dev, addr, on);
        if (ret == 0) {
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->uc_hash_table_set, -ENOTSUP);
        ret = (*dev->dev_ops->uc_hash_table_set)(dev, addr, on);
        if (ret == 0) {


@@ -1949,11 +1949,11 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
                if (on)
                        ether_addr_copy(addr,
                                        &dev->data->hash_mac_addrs[index]);
                if (on)
                        ether_addr_copy(addr,
                                        &dev->data->hash_mac_addrs[index]);

-               else 
+               else

                        ether_addr_copy(&null_mac_addr,
                                        &dev->data->hash_mac_addrs[index]);
        }
                        ether_addr_copy(&null_mac_addr,
                                        &dev->data->hash_mac_addrs[index]);
        }

-       
+

        return ret;
 }
 
        return ret;
 }
 


@@ -1961,20 +1961,20 @@ int
 rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)
 {
        struct rte_eth_dev *dev;
 rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)
 {
        struct rte_eth_dev *dev;

-       
+

        if (port_id >= nb_ports) {
                PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
                        port_id);
                return (-ENODEV);
        }
        if (port_id >= nb_ports) {
                PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
                        port_id);
                return (-ENODEV);
        }

-       
+

        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->uc_all_hash_table_set, -ENOTSUP);
        return (*dev->dev_ops->uc_all_hash_table_set)(dev, on);
 }
 
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->uc_all_hash_table_set, -ENOTSUP);
        return (*dev->dev_ops->uc_all_hash_table_set)(dev, on);
 }
 

-int 
+int

 rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on)
 {
        uint16_t num_vfs;
 rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on)
 {
        uint16_t num_vfs;


@@ -1985,22 +1985,22 @@ rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on)
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }

-       
+

        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);

-       
+

        num_vfs = dev_info.max_vfs;
        num_vfs = dev_info.max_vfs;

-       if (vf > num_vfs) 
+       if (vf > num_vfs)

        {
                PMD_DEBUG_TRACE("port %d: invalid vf id\n", port_id);
                return (-EINVAL);
        {
                PMD_DEBUG_TRACE("port %d: invalid vf id\n", port_id);
                return (-EINVAL);

-       }       
-       
+       }
+

        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx, -ENOTSUP);
        return (*dev->dev_ops->set_vf_rx)(dev, vf,on);
 }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx, -ENOTSUP);
        return (*dev->dev_ops->set_vf_rx)(dev, vf,on);
 }
 

-int 
+int

 rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on)
 {
        uint16_t num_vfs;
 rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on)
 {
        uint16_t num_vfs;


@@ -2011,23 +2011,23 @@ rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on)
                PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
                PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }

-       
+

        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
 
        num_vfs = dev_info.max_vfs;
        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
 
        num_vfs = dev_info.max_vfs;

-       if (vf > num_vfs) 
+       if (vf > num_vfs)

        {
                PMD_DEBUG_TRACE("set pool tx:invalid pool id=%d\n", vf);
                return (-EINVAL);
        }
        {
                PMD_DEBUG_TRACE("set pool tx:invalid pool id=%d\n", vf);
                return (-EINVAL);
        }

-       
+

        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_tx, -ENOTSUP);
        return (*dev->dev_ops->set_vf_tx)(dev, vf,on);
 }
 
 int
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_tx, -ENOTSUP);
        return (*dev->dev_ops->set_vf_tx)(dev, vf,on);
 }
 
 int

-rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id, 
+rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id,

                                 uint64_t vf_mask,uint8_t vlan_on)
 {
        struct rte_eth_dev *dev;
                                 uint64_t vf_mask,uint8_t vlan_on)
 {
        struct rte_eth_dev *dev;


@@ -2050,14 +2050,14 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id,
                PMD_DEBUG_TRACE("VF VLAN filter:pool_mask can not be 0\n");
                return (-EINVAL);
        }
                PMD_DEBUG_TRACE("VF VLAN filter:pool_mask can not be 0\n");
                return (-EINVAL);
        }

-       
+

        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_vlan_filter, -ENOTSUP);
        return (*dev->dev_ops->set_vf_vlan_filter)(dev, vlan_id,
                                                vf_mask,vlan_on);
 }
 
 int
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_vlan_filter, -ENOTSUP);
        return (*dev->dev_ops->set_vf_vlan_filter)(dev, vlan_id,
                                                vf_mask,vlan_on);
 }
 
 int

-rte_eth_mirror_rule_set(uint8_t port_id, 
+rte_eth_mirror_rule_set(uint8_t port_id,

                        struct rte_eth_vmdq_mirror_conf *mirror_conf,
                        uint8_t rule_id, uint8_t on)
 {
                        struct rte_eth_vmdq_mirror_conf *mirror_conf,
                        uint8_t rule_id, uint8_t on)
 {


@@ -2067,25 +2067,25 @@ rte_eth_mirror_rule_set(uint8_t port_id,
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }

-       
+

        if (mirror_conf->rule_type_mask == 0) {
                PMD_DEBUG_TRACE("mirror rule type can not be 0.\n");
                return (-EINVAL);
        }
        if (mirror_conf->rule_type_mask == 0) {
                PMD_DEBUG_TRACE("mirror rule type can not be 0.\n");
                return (-EINVAL);
        }

-       
+

        if (mirror_conf->dst_pool >= ETH_64_POOLS) {
                PMD_DEBUG_TRACE("Invalid dst pool, pool id must"
                        "be 0-%d\n",ETH_64_POOLS - 1);
                return (-EINVAL);
        }
        if (mirror_conf->dst_pool >= ETH_64_POOLS) {
                PMD_DEBUG_TRACE("Invalid dst pool, pool id must"
                        "be 0-%d\n",ETH_64_POOLS - 1);
                return (-EINVAL);
        }

-       
-       if ((mirror_conf->rule_type_mask & ETH_VMDQ_POOL_MIRROR) && 
+
+       if ((mirror_conf->rule_type_mask & ETH_VMDQ_POOL_MIRROR) &&

                (mirror_conf->pool_mask == 0)) {
                PMD_DEBUG_TRACE("Invalid mirror pool, pool mask can not"
                (mirror_conf->pool_mask == 0)) {
                PMD_DEBUG_TRACE("Invalid mirror pool, pool mask can not"

-                               "be 0.\n");             
+                               "be 0.\n");

                return (-EINVAL);
        }
                return (-EINVAL);
        }

-       
+

        if(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE)
        {
                PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n",
        if(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE)
        {
                PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n",


@@ -2175,7 +2175,7 @@ rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id)
        }
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_count, -ENOTSUP);
        }
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_count, -ENOTSUP);

-       return (*dev->dev_ops->rx_queue_count)(dev, queue_id);  
+       return (*dev->dev_ops->rx_queue_count)(dev, queue_id);

 }
 
 int
 }
 
 int

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 948a2cc..f860601 100644 (file)
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -263,25 +263,25 @@ enum rte_eth_rx_mq_mode {
 };
 
 /**
 };
 
 /**

- * for rx mq mode backward compatible 
+ * for rx mq mode backward compatible

  */
 #define ETH_RSS                       ETH_MQ_RX_RSS
 #define VMDQ_DCB                      ETH_MQ_RX_VMDQ_DCB
 #define ETH_DCB_RX                    ETH_MQ_RX_DCB
 
 /**
  */
 #define ETH_RSS                       ETH_MQ_RX_RSS
 #define VMDQ_DCB                      ETH_MQ_RX_VMDQ_DCB
 #define ETH_DCB_RX                    ETH_MQ_RX_DCB
 
 /**

- * A set of values to identify what method is to be used to transmit 
+ * A set of values to identify what method is to be used to transmit

  * packets using multi-TCs.
  */
 enum rte_eth_tx_mq_mode {
  * packets using multi-TCs.
  */
 enum rte_eth_tx_mq_mode {

-       ETH_MQ_TX_NONE    = 0,  /**< It is in neither DCB nor VT mode. */
-       ETH_MQ_TX_DCB,          /**< For TX side,only DCB is on. */
+       ETH_MQ_TX_NONE    = 0,  /**< It is in neither DCB nor VT mode. */
+       ETH_MQ_TX_DCB,          /**< For TX side,only DCB is on. */

        ETH_MQ_TX_VMDQ_DCB,     /**< For TX side,both DCB and VT is on. */
        ETH_MQ_TX_VMDQ_ONLY,    /**< Only VT on, no DCB */
 };
 
 /**
        ETH_MQ_TX_VMDQ_DCB,     /**< For TX side,both DCB and VT is on. */
        ETH_MQ_TX_VMDQ_ONLY,    /**< Only VT on, no DCB */
 };
 
 /**

- * for tx mq mode backward compatible 
+ * for tx mq mode backward compatible

  */
 #define ETH_DCB_NONE                ETH_MQ_TX_NONE
 #define ETH_VMDQ_DCB_TX             ETH_MQ_TX_VMDQ_DCB
  */
 #define ETH_DCB_NONE                ETH_MQ_TX_NONE
 #define ETH_VMDQ_DCB_TX             ETH_MQ_TX_VMDQ_DCB


@@ -335,7 +335,7 @@ struct rte_eth_rss_conf {
 #define ETH_RSS_PROTO_MASK  0x01FF /**< Mask of valid RSS hash protocols */
 /* Definitions used for redirection table entry size */
 #define ETH_RSS_RETA_NUM_ENTRIES 128
 #define ETH_RSS_PROTO_MASK  0x01FF /**< Mask of valid RSS hash protocols */
 /* Definitions used for redirection table entry size */
 #define ETH_RSS_RETA_NUM_ENTRIES 128

-#define ETH_RSS_RETA_MAX_QUEUE   16  
+#define ETH_RSS_RETA_MAX_QUEUE   16

 
 /* Definitions used for VMDQ and DCB functionality */
 #define ETH_VMDQ_MAX_VLAN_FILTERS   64 /**< Maximum nb. of VMDQ vlan filters. */
 
 /* Definitions used for VMDQ and DCB functionality */
 #define ETH_VMDQ_MAX_VLAN_FILTERS   64 /**< Maximum nb. of VMDQ vlan filters. */


@@ -345,7 +345,7 @@ struct rte_eth_rss_conf {
 
 /* DCB capability defines */
 #define ETH_DCB_PG_SUPPORT      0x00000001 /**< Priority Group(ETS) support. */
 
 /* DCB capability defines */
 #define ETH_DCB_PG_SUPPORT      0x00000001 /**< Priority Group(ETS) support. */

-#define ETH_DCB_PFC_SUPPORT     0x00000002 /**< Priority Flow Control support. */ 
+#define ETH_DCB_PFC_SUPPORT     0x00000002 /**< Priority Flow Control support. */

 
 /* Definitions used for VLAN Offload functionality */
 #define ETH_VLAN_STRIP_OFFLOAD   0x0001 /**< VLAN Strip  On/Off */
 
 /* Definitions used for VLAN Offload functionality */
 #define ETH_VLAN_STRIP_OFFLOAD   0x0001 /**< VLAN Strip  On/Off */


@@ -356,7 +356,7 @@ struct rte_eth_rss_conf {
 #define ETH_VLAN_STRIP_MASK   0x0001 /**< VLAN Strip  setting mask */
 #define ETH_VLAN_FILTER_MASK  0x0002 /**< VLAN Filter  setting mask*/
 #define ETH_VLAN_EXTEND_MASK  0x0004 /**< VLAN Extend  setting mask*/
 #define ETH_VLAN_STRIP_MASK   0x0001 /**< VLAN Strip  setting mask */
 #define ETH_VLAN_FILTER_MASK  0x0002 /**< VLAN Filter  setting mask*/
 #define ETH_VLAN_EXTEND_MASK  0x0004 /**< VLAN Extend  setting mask*/

-#define ETH_VLAN_ID_MAX       0x0FFF /**< VLAN ID is in lower 12 bits*/ 
+#define ETH_VLAN_ID_MAX       0x0FFF /**< VLAN ID is in lower 12 bits*/

 
 /* Definitions used for receive MAC address   */
 #define ETH_NUM_RECEIVE_MAC_ADDR  128 /**< Maximum nb. of receive mac addr. */
 
 /* Definitions used for receive MAC address   */
 #define ETH_NUM_RECEIVE_MAC_ADDR  128 /**< Maximum nb. of receive mac addr. */


@@ -385,7 +385,7 @@ struct rte_eth_rss_conf {
  */
 struct rte_eth_vlan_mirror {
        uint64_t vlan_mask; /**< mask for valid VLAN ID. */
  */
 struct rte_eth_vlan_mirror {
        uint64_t vlan_mask; /**< mask for valid VLAN ID. */

-       uint16_t vlan_id[ETH_VMDQ_MAX_VLAN_FILTERS]; 
+       uint16_t vlan_id[ETH_VMDQ_MAX_VLAN_FILTERS];

        /** VLAN ID list for vlan mirror. */
 };
 
        /** VLAN ID list for vlan mirror. */
 };
 


@@ -405,9 +405,9 @@ struct rte_eth_vmdq_mirror_conf {
  */
 struct rte_eth_rss_reta {
        /** First 64 mask bits indicate which entry(s) need to updated/queried. */
  */
 struct rte_eth_rss_reta {
        /** First 64 mask bits indicate which entry(s) need to updated/queried. */

-       uint64_t mask_lo; 
+       uint64_t mask_lo;

        /** Second 64 mask bits indicate which entry(s) need to updated/queried. */
        /** Second 64 mask bits indicate which entry(s) need to updated/queried. */

-       uint64_t mask_hi; 
+       uint64_t mask_hi;

        uint8_t reta[ETH_RSS_RETA_NUM_ENTRIES];  /**< 128 RETA entries*/
 };
 
        uint8_t reta[ETH_RSS_RETA_NUM_ENTRIES];  /**< 128 RETA entries*/
 };
 


@@ -437,13 +437,13 @@ struct rte_eth_dcb_rx_conf {
        uint8_t dcb_queue[ETH_DCB_NUM_USER_PRIORITIES];
        /**< Possible DCB queue,4 or 8. */
 };
        uint8_t dcb_queue[ETH_DCB_NUM_USER_PRIORITIES];
        /**< Possible DCB queue,4 or 8. */
 };

- 
+

 struct rte_eth_vmdq_dcb_tx_conf {
        enum rte_eth_nb_pools nb_queue_pools; /**< With DCB, 16 or 32 pools. */
        uint8_t dcb_queue[ETH_DCB_NUM_USER_PRIORITIES];
        /**< Possible DCB queue,4 or 8. */
 };
 struct rte_eth_vmdq_dcb_tx_conf {
        enum rte_eth_nb_pools nb_queue_pools; /**< With DCB, 16 or 32 pools. */
        uint8_t dcb_queue[ETH_DCB_NUM_USER_PRIORITIES];
        /**< Possible DCB queue,4 or 8. */
 };

- 
+

 struct rte_eth_dcb_tx_conf {
        enum rte_eth_nb_tcs nb_tcs; /**< Possible DCB TCs, 4 or 8 TCs. */
        uint8_t dcb_queue[ETH_DCB_NUM_USER_PRIORITIES];
 struct rte_eth_dcb_tx_conf {
        enum rte_eth_nb_tcs nb_tcs; /**< Possible DCB TCs, 4 or 8 TCs. */
        uint8_t dcb_queue[ETH_DCB_NUM_USER_PRIORITIES];


@@ -756,9 +756,9 @@ struct rte_eth_conf {
                struct rte_eth_vmdq_tx_conf vmdq_tx_conf;
                /**< Port vmdq TX configuration. */
        } tx_adv_conf; /**< Port TX DCB configuration (union). */
                struct rte_eth_vmdq_tx_conf vmdq_tx_conf;
                /**< Port vmdq TX configuration. */
        } tx_adv_conf; /**< Port TX DCB configuration (union). */

-       /** Currently,Priority Flow Control(PFC) are supported,if DCB with PFC 
-           is needed,and the variable must be set ETH_DCB_PFC_SUPPORT. */ 
-       uint32_t dcb_capability_en; 
+       /** Currently,Priority Flow Control(PFC) are supported,if DCB with PFC
+           is needed,and the variable must be set ETH_DCB_PFC_SUPPORT. */
+       uint32_t dcb_capability_en;

        struct rte_fdir_conf fdir_conf; /**< FDIR configuration. */
        struct rte_intr_conf intr_conf; /**< Interrupt mode configuration. */
 };
        struct rte_fdir_conf fdir_conf; /**< FDIR configuration. */
        struct rte_intr_conf intr_conf; /**< Interrupt mode configuration. */
 };


@@ -799,7 +799,7 @@ struct rte_eth_dev_info {
        uint16_t max_rx_queues; /**< Maximum number of RX queues. */
        uint16_t max_tx_queues; /**< Maximum number of TX queues. */
        uint32_t max_mac_addrs; /**< Maximum number of MAC addresses. */
        uint16_t max_rx_queues; /**< Maximum number of RX queues. */
        uint16_t max_tx_queues; /**< Maximum number of TX queues. */
        uint32_t max_mac_addrs; /**< Maximum number of MAC addresses. */

-       uint32_t max_hash_mac_addrs; 
+       uint32_t max_hash_mac_addrs;

        /** Maximum number of hash MAC addresses for MTA and UTA. */
        uint16_t max_vfs; /**< Maximum number of VFs. */
        uint16_t max_vmdq_pools; /**< Maximum number of VMDq pools. */
        /** Maximum number of hash MAC addresses for MTA and UTA. */
        uint16_t max_vfs; /**< Maximum number of VFs. */
        uint16_t max_vmdq_pools; /**< Maximum number of VMDq pools. */


@@ -1000,7 +1000,7 @@ typedef void (*eth_mac_addr_add_t)(struct rte_eth_dev *dev,
                                  struct ether_addr *mac_addr,
                                  uint32_t index,
                                  uint32_t vmdq);
                                  struct ether_addr *mac_addr,
                                  uint32_t index,
                                  uint32_t vmdq);

-/**< @internal Set a MAC address into Receive Address Address Register */ 
+/**< @internal Set a MAC address into Receive Address Address Register */

 
 typedef int (*eth_uc_hash_table_set_t)(struct rte_eth_dev *dev,
                                  struct ether_addr *mac_addr,
 
 typedef int (*eth_uc_hash_table_set_t)(struct rte_eth_dev *dev,
                                  struct ether_addr *mac_addr,


@@ -1013,7 +1013,7 @@ typedef int (*eth_uc_all_hash_table_set_t)(struct rte_eth_dev *dev,
 
 typedef int (*eth_set_vf_rx_mode_t)(struct rte_eth_dev *dev,
                                  uint16_t vf,
 
 typedef int (*eth_set_vf_rx_mode_t)(struct rte_eth_dev *dev,
                                  uint16_t vf,

-                                 uint16_t rx_mode, 
+                                 uint16_t rx_mode,

                                  uint8_t on);
 /**< @internal Set a VF receive mode */
 
                                  uint8_t on);
 /**< @internal Set a VF receive mode */
 


@@ -1027,15 +1027,15 @@ typedef int (*eth_set_vf_tx_t)(struct rte_eth_dev *dev,
                                uint8_t on);
 /**< @internal Enable or disable a VF transmit   */
 
                                uint8_t on);
 /**< @internal Enable or disable a VF transmit   */
 

-typedef int (*eth_set_vf_vlan_filter_t)(struct rte_eth_dev *dev, 
-                                 uint16_t vlan, 
+typedef int (*eth_set_vf_vlan_filter_t)(struct rte_eth_dev *dev,
+                                 uint16_t vlan,

                                  uint64_t vf_mask,
                                  uint8_t vlan_on);
 /**< @internal Set VF VLAN pool filter */
 
 typedef int (*eth_mirror_rule_set_t)(struct rte_eth_dev *dev,
                                  struct rte_eth_vmdq_mirror_conf *mirror_conf,
                                  uint64_t vf_mask,
                                  uint8_t vlan_on);
 /**< @internal Set VF VLAN pool filter */
 
 typedef int (*eth_mirror_rule_set_t)(struct rte_eth_dev *dev,
                                  struct rte_eth_vmdq_mirror_conf *mirror_conf,

-                                 uint8_t rule_id, 
+                                 uint8_t rule_id,

                                  uint8_t on);
 /**< @internal Add a traffic mirroring rule on an Ethernet device */
 
                                  uint8_t on);
 /**< @internal Add a traffic mirroring rule on an Ethernet device */
 


@@ -1224,7 +1224,7 @@ struct rte_eth_dev_data {
        void **tx_queues; /**< Array of pointers to TX queues. */
        uint16_t nb_rx_queues; /**< Number of RX queues. */
        uint16_t nb_tx_queues; /**< Number of TX queues. */
        void **tx_queues; /**< Array of pointers to TX queues. */
        uint16_t nb_rx_queues; /**< Number of RX queues. */
        uint16_t nb_tx_queues; /**< Number of TX queues. */

-       
+

        struct rte_eth_dev_sriov sriov;    /**< SRIOV data */
 
        void *dev_private;              /**< PMD-specific private data */
        struct rte_eth_dev_sriov sriov;    /**< SRIOV data */
 
        void *dev_private;              /**< PMD-specific private data */


@@ -1237,7 +1237,7 @@ struct rte_eth_dev_data {
 
        uint64_t rx_mbuf_alloc_failed; /**< RX ring mbuf allocation failures. */
        struct ether_addr* mac_addrs;/**< Device Ethernet Link address. */
 
        uint64_t rx_mbuf_alloc_failed; /**< RX ring mbuf allocation failures. */
        struct ether_addr* mac_addrs;/**< Device Ethernet Link address. */

-       uint64_t mac_pool_sel[ETH_NUM_RECEIVE_MAC_ADDR]; 
+       uint64_t mac_pool_sel[ETH_NUM_RECEIVE_MAC_ADDR];

        /** bitmap array of associating Ethernet MAC addresses to pools */
        struct ether_addr* hash_mac_addrs;
        /** Device Ethernet MAC addresses of hash filtering. */
        /** bitmap array of associating Ethernet MAC addresses to pools */
        struct ether_addr* hash_mac_addrs;
        /** Device Ethernet MAC addresses of hash filtering. */


@@ -1958,7 +1958,7 @@ static inline uint32_t
 rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id)
 {
         struct rte_eth_dev *dev;
 rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id)
 {
         struct rte_eth_dev *dev;

- 
+

         dev = &rte_eth_devices[port_id];
         return (*dev->dev_ops->rx_queue_count)(dev, queue_id);
 }
         dev = &rte_eth_devices[port_id];
         return (*dev->dev_ops->rx_queue_count)(dev, queue_id);
 }


@@ -2402,9 +2402,9 @@ int rte_eth_dev_flow_ctrl_set(uint8_t port_id,
                                struct rte_eth_fc_conf *fc_conf);
 
 /**
                                struct rte_eth_fc_conf *fc_conf);
 
 /**

- * Configure the Ethernet priority flow control under DCB environment 
- * for Ethernet device. 
- * 
+ * Configure the Ethernet priority flow control under DCB environment
+ * for Ethernet device.
+ *

  * @param port_id
  * The port identifier of the Ethernet device.
  * @param pfc_conf
  * @param port_id
  * The port identifier of the Ethernet device.
  * @param pfc_conf


@@ -2457,39 +2457,39 @@ int rte_eth_dev_mac_addr_remove(uint8_t port, struct ether_addr *mac_addr);
 
 /**
  * Update Redirection Table(RETA) of Receive Side Scaling of Ethernet device.
 
 /**
  * Update Redirection Table(RETA) of Receive Side Scaling of Ethernet device.

- * 
+ *

  * @param port
  *   The port identifier of the Ethernet device.
  * @param port
  *   The port identifier of the Ethernet device.

- * @param reta_conf 
+ * @param reta_conf

  *    RETA to update.
  * @return
  *    RETA to update.
  * @return

- *   - (0) if successful. 
+ *   - (0) if successful.

  *   - (-ENOTSUP) if hardware doesn't support.
  *   - (-EINVAL) if bad parameter.
  */
  *   - (-ENOTSUP) if hardware doesn't support.
  *   - (-EINVAL) if bad parameter.
  */

-int rte_eth_dev_rss_reta_update(uint8_t port, 
+int rte_eth_dev_rss_reta_update(uint8_t port,

                        struct rte_eth_rss_reta *reta_conf);
 
  /**
  * Query Redirection Table(RETA) of Receive Side Scaling of Ethernet device.
                        struct rte_eth_rss_reta *reta_conf);
 
  /**
  * Query Redirection Table(RETA) of Receive Side Scaling of Ethernet device.

- *  
+ *

  * @param port
  *   The port identifier of the Ethernet device.
  * @param port
  *   The port identifier of the Ethernet device.

- * @param reta_conf 
+ * @param reta_conf

  *   RETA to query.
  * @return
  *   RETA to query.
  * @return

- *   - (0) if successful. 
+ *   - (0) if successful.

  *   - (-ENOTSUP) if hardware doesn't support.
  *   - (-EINVAL) if bad parameter.
  */
  *   - (-ENOTSUP) if hardware doesn't support.
  *   - (-EINVAL) if bad parameter.
  */

-int rte_eth_dev_rss_reta_query(uint8_t port, 
+int rte_eth_dev_rss_reta_query(uint8_t port,

                        struct rte_eth_rss_reta *reta_conf);
                        struct rte_eth_rss_reta *reta_conf);

- 
+

  /**
  * Updates unicast hash table for receiving packet with the given destination
  /**
  * Updates unicast hash table for receiving packet with the given destination

- * MAC address, and the packet is routed to all VFs for which the RX mode is 
+ * MAC address, and the packet is routed to all VFs for which the RX mode is

  * accept packets that match the unicast hash table.
  * accept packets that match the unicast hash table.

- *  
+ *

  * @param port
  *   The port identifier of the Ethernet device.
  * @param addr
  * @param port
  *   The port identifier of the Ethernet device.
  * @param addr


@@ -2498,7 +2498,7 @@ int rte_eth_dev_rss_reta_query(uint8_t port,
  *    1 - Set an unicast hash bit for receiving packets with the MAC address.
  *    0 - Clear an unicast hash bit.
  * @return
  *    1 - Set an unicast hash bit for receiving packets with the MAC address.
  *    0 - Clear an unicast hash bit.
  * @return

- *   - (0) if successful. 
+ *   - (0) if successful.

  *   - (-ENOTSUP) if hardware doesn't support.
   *  - (-ENODEV) if *port_id* invalid.
  *   - (-EINVAL) if bad parameter.
  *   - (-ENOTSUP) if hardware doesn't support.
   *  - (-ENODEV) if *port_id* invalid.
  *   - (-EINVAL) if bad parameter.


@@ -2507,18 +2507,18 @@ int rte_eth_dev_uc_hash_table_set(uint8_t port,struct ether_addr *addr,
                                        uint8_t on);
 
  /**
                                        uint8_t on);
 
  /**

- * Updates all unicast hash bitmaps for receiving packet with any Unicast 
- * Ethernet MAC addresses,the packet is routed to all VFs for which the RX 
+ * Updates all unicast hash bitmaps for receiving packet with any Unicast
+ * Ethernet MAC addresses,the packet is routed to all VFs for which the RX

  * mode is accept packets that match the unicast hash table.
  * mode is accept packets that match the unicast hash table.

- *  
+ *

  * @param port
  *   The port identifier of the Ethernet device.
  * @param on
  * @param port
  *   The port identifier of the Ethernet device.
  * @param on

- *    1 - Set all unicast hash bitmaps for receiving all the Ethernet 
+ *    1 - Set all unicast hash bitmaps for receiving all the Ethernet

  *         MAC addresses
  *    0 - Clear all unicast hash bitmaps
  * @return
  *         MAC addresses
  *    0 - Clear all unicast hash bitmaps
  * @return

- *   - (0) if successful. 
+ *   - (0) if successful.

  *   - (-ENOTSUP) if hardware doesn't support.
   *  - (-ENODEV) if *port_id* invalid.
  *   - (-EINVAL) if bad parameter.
  *   - (-ENOTSUP) if hardware doesn't support.
   *  - (-ENODEV) if *port_id* invalid.
  *   - (-EINVAL) if bad parameter.


@@ -2527,13 +2527,13 @@ int rte_eth_dev_uc_all_hash_table_set(uint8_t port,uint8_t on);
 
  /**
  * Set RX L2 Filtering mode of a VF of an Ethernet device.
 
  /**
  * Set RX L2 Filtering mode of a VF of an Ethernet device.

- *  
+ *

  * @param port
  *   The port identifier of the Ethernet device.
  * @param port
  *   The port identifier of the Ethernet device.

- * @param vf 
+ * @param vf

  *   VF id.
  * @param rx_mode
  *   VF id.
  * @param rx_mode

- *    The RX mode mask, which  is one or more of  accepting Untagged Packets, 
+ *    The RX mode mask, which  is one or more of  accepting Untagged Packets,

  *    packets that match the PFUTA table, Broadcast and Multicast Promiscuous.
  *    ETH_VMDQ_ACCEPT_UNTAG,ETH_VMDQ_ACCEPT_HASH_UC,
  *    ETH_VMDQ_ACCEPT_BROADCAST and ETH_VMDQ_ACCEPT_MULTICAST will be used
  *    packets that match the PFUTA table, Broadcast and Multicast Promiscuous.
  *    ETH_VMDQ_ACCEPT_UNTAG,ETH_VMDQ_ACCEPT_HASH_UC,
  *    ETH_VMDQ_ACCEPT_BROADCAST and ETH_VMDQ_ACCEPT_MULTICAST will be used


@@ -2542,7 +2542,7 @@ int rte_eth_dev_uc_all_hash_table_set(uint8_t port,uint8_t on);
  *    1 - Enable a VF RX mode.
  *    0 - Disable a VF RX mode.
  * @return
  *    1 - Enable a VF RX mode.
  *    0 - Disable a VF RX mode.
  * @return

- *   - (0) if successful. 
+ *   - (0) if successful.

  *   - (-ENOTSUP) if hardware doesn't support.
  *   - (-ENOTSUP) if hardware doesn't support.
  *   - (-EINVAL) if bad parameter.
  *   - (-ENOTSUP) if hardware doesn't support.
  *   - (-ENOTSUP) if hardware doesn't support.
  *   - (-EINVAL) if bad parameter.


@@ -2552,26 +2552,26 @@ int rte_eth_dev_set_vf_rxmode(uint8_t port, uint16_t vf, uint16_t rx_mode,
 
 /**
 * Enable or disable a VF traffic transmit of the Ethernet device.
 
 /**
 * Enable or disable a VF traffic transmit of the Ethernet device.

-*  
+*

 * @param port
 *   The port identifier of the Ethernet device.
 * @param port
 *   The port identifier of the Ethernet device.

-* @param vf 
+* @param vf

 *   VF id.
 * @param on
 *    1 - Enable a VF traffic transmit.
 *    0 - Disable a VF traffic transmit.
 * @return
 *   VF id.
 * @param on
 *    1 - Enable a VF traffic transmit.
 *    0 - Disable a VF traffic transmit.
 * @return

-*   - (0) if successful. 
+*   - (0) if successful.

 *   - (-ENODEV) if *port_id* invalid.
 *   - (-ENOTSUP) if hardware doesn't support.
 *   - (-EINVAL) if bad parameter.
 */
 *   - (-ENODEV) if *port_id* invalid.
 *   - (-ENOTSUP) if hardware doesn't support.
 *   - (-EINVAL) if bad parameter.
 */

-int 
+int

 rte_eth_dev_set_vf_tx(uint8_t port,uint16_t vf, uint8_t on);
 
 /**
 * Enable or disable a VF traffic receive of an Ethernet device.
 rte_eth_dev_set_vf_tx(uint8_t port,uint16_t vf, uint8_t on);
 
 /**
 * Enable or disable a VF traffic receive of an Ethernet device.

-*  
+*

 * @param port
 *   The port identifier of the Ethernet device.
 * @param vf
 * @param port
 *   The port identifier of the Ethernet device.
 * @param vf


@@ -2580,18 +2580,18 @@ rte_eth_dev_set_vf_tx(uint8_t port,uint16_t vf, uint8_t on);
 *    1 - Enable a VF traffic receive.
 *    0 - Disable a VF traffic receive.
 * @return
 *    1 - Enable a VF traffic receive.
 *    0 - Disable a VF traffic receive.
 * @return

-*   - (0) if successful. 
+*   - (0) if successful.

 *   - (-ENOTSUP) if hardware doesn't support.
 *   - (-ENODEV) if *port_id* invalid.
 *   - (-EINVAL) if bad parameter.
 */
 *   - (-ENOTSUP) if hardware doesn't support.
 *   - (-ENODEV) if *port_id* invalid.
 *   - (-EINVAL) if bad parameter.
 */

-int 
+int

 rte_eth_dev_set_vf_rx(uint8_t port,uint16_t vf, uint8_t on);
 
 /**
 * Enable/Disable hardware VF VLAN filtering by an Ethernet device of
 * received VLAN packets tagged with a given VLAN Tag Identifier.
 rte_eth_dev_set_vf_rx(uint8_t port,uint16_t vf, uint8_t on);
 
 /**
 * Enable/Disable hardware VF VLAN filtering by an Ethernet device of
 * received VLAN packets tagged with a given VLAN Tag Identifier.

-* 
+*

 * @param port id
 *   The port identifier of the Ethernet device.
 * @param vlan_id
 * @param port id
 *   The port identifier of the Ethernet device.
 * @param vlan_id


@@ -2602,16 +2602,16 @@ rte_eth_dev_set_vf_rx(uint8_t port,uint16_t vf, uint8_t on);
 *    1 - Enable VFs VLAN filtering.
 *    0 - Disable VFs VLAN filtering.
 * @return
 *    1 - Enable VFs VLAN filtering.
 *    0 - Disable VFs VLAN filtering.
 * @return

-*   - (0) if successful. 
+*   - (0) if successful.

 *   - (-ENOTSUP) if hardware doesn't support.
 *   - (-ENODEV) if *port_id* invalid.
 *   - (-EINVAL) if bad parameter.
 */
 int
 *   - (-ENOTSUP) if hardware doesn't support.
 *   - (-ENODEV) if *port_id* invalid.
 *   - (-EINVAL) if bad parameter.
 */
 int

-rte_eth_dev_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id, 
+rte_eth_dev_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,

                                uint64_t vf_mask,
                                uint8_t vlan_on);
                                uint64_t vf_mask,
                                uint8_t vlan_on);

- 
+

 /**
  * Set a traffic mirroring rule on an Ethernet device
  *
 /**
  * Set a traffic mirroring rule on an Ethernet device
  *


@@ -2634,7 +2634,7 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,
  *   - (-EINVAL) if the mr_conf information is not correct.
  */
 int rte_eth_mirror_rule_set(uint8_t port_id,
  *   - (-EINVAL) if the mr_conf information is not correct.
  */
 int rte_eth_mirror_rule_set(uint8_t port_id,

-                       struct rte_eth_vmdq_mirror_conf *mirror_conf, 
+                       struct rte_eth_vmdq_mirror_conf *mirror_conf,

                        uint8_t rule_id,
                        uint8_t on);
 
                        uint8_t rule_id,
                        uint8_t on);
 

diff --git a/lib/librte_ether/rte_ether.h b/lib/librte_ether/rte_ether.h
index 71dc788..08feb41 100644 (file)
--- a/lib/librte_ether/rte_ether.h
+++ b/lib/librte_ether/rte_ether.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile
index 2de3d55..95e4c09 100644 (file)
--- a/lib/librte_hash/Makefile
+++ b/lib/librte_hash/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_hash/rte_fbk_hash.c b/lib/librte_hash/rte_fbk_hash.c
index a65671e..4d67554 100644 (file)
--- a/lib/librte_hash/rte_fbk_hash.c
+++ b/lib/librte_hash/rte_fbk_hash.c
@@ -1,13 +1,13 @@
 /**
  *   BSD LICENSE
 /**
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -73,7 +73,7 @@ rte_fbk_hash_find_existing(const char *name)
        struct rte_fbk_hash_list *fbk_hash_list;
 
        /* check that we have an initialised tail queue */
        struct rte_fbk_hash_list *fbk_hash_list;
 
        /* check that we have an initialised tail queue */

-       if ((fbk_hash_list = 
+       if ((fbk_hash_list =

             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH, rte_fbk_hash_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
                return NULL;
             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH, rte_fbk_hash_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
                return NULL;


@@ -111,10 +111,10 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
        struct rte_fbk_hash_list *fbk_hash_list;
 
        /* check that we have an initialised tail queue */
        struct rte_fbk_hash_list *fbk_hash_list;
 
        /* check that we have an initialised tail queue */

-       if ((fbk_hash_list = 
+       if ((fbk_hash_list =

             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH, rte_fbk_hash_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH, rte_fbk_hash_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;

-               return NULL;    
+               return NULL;

        }
 
        /* Error checking of parameters. */
        }
 
        /* Error checking of parameters. */


@@ -171,9 +171,9 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
 
        TAILQ_INSERT_TAIL(fbk_hash_list, ht, next);
 
 
        TAILQ_INSERT_TAIL(fbk_hash_list, ht, next);
 

-exit:  
+exit:

        rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
        rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);

-       
+

        return ht;
 }
 
        return ht;
 }
 

diff --git a/lib/librte_hash/rte_fbk_hash.h b/lib/librte_hash/rte_fbk_hash.h
index ac3a604..4d1a316 100644 (file)
--- a/lib/librte_hash/rte_fbk_hash.h
+++ b/lib/librte_hash/rte_fbk_hash.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -139,7 +139,7 @@ rte_fbk_hash_get_bucket(const struct rte_fbk_hash_table *ht, uint32_t key)
 }
 
 /**
 }
 
 /**

- * Add a key to an existing hash table with bucket id. 
+ * Add a key to an existing hash table with bucket id.

  * This operation is not multi-thread safe
  * and should only be called from one thread.
  *
  * This operation is not multi-thread safe
  * and should only be called from one thread.
  *


@@ -183,7 +183,7 @@ rte_fbk_hash_add_key_with_bucket(struct rte_fbk_hash_table *ht,
                }
        }
 
                }
        }
 

-       return -ENOSPC; /* No space in bucket. */       
+       return -ENOSPC; /* No space in bucket. */

 }
 
 /**
 }
 
 /**


@@ -203,12 +203,12 @@ static inline int
 rte_fbk_hash_add_key(struct rte_fbk_hash_table *ht,
                        uint32_t key, uint16_t value)
 {
 rte_fbk_hash_add_key(struct rte_fbk_hash_table *ht,
                        uint32_t key, uint16_t value)
 {

-       return rte_fbk_hash_add_key_with_bucket(ht, 
+       return rte_fbk_hash_add_key_with_bucket(ht,

                                key, value, rte_fbk_hash_get_bucket(ht, key));
 }
 
 /**
                                key, value, rte_fbk_hash_get_bucket(ht, key));
 }
 
 /**

- * Remove a key with a given bucket id from an existing hash table. 
+ * Remove a key with a given bucket id from an existing hash table.

  * This operation is not multi-thread
  * safe and should only be called from one thread.
  *
  * This operation is not multi-thread
  * safe and should only be called from one thread.
  *


@@ -222,7 +222,7 @@ rte_fbk_hash_add_key(struct rte_fbk_hash_table *ht,
  *   0 if ok, or negative value on error.
  */
 static inline int
  *   0 if ok, or negative value on error.
  */
 static inline int

-rte_fbk_hash_delete_key_with_bucket(struct rte_fbk_hash_table *ht, 
+rte_fbk_hash_delete_key_with_bucket(struct rte_fbk_hash_table *ht,

                                        uint32_t key, uint32_t bucket)
 {
        uint32_t last_entry = ht->entries_per_bucket - 1;
                                        uint32_t key, uint32_t bucket)
 {
        uint32_t last_entry = ht->entries_per_bucket - 1;


@@ -267,12 +267,12 @@ rte_fbk_hash_delete_key_with_bucket(struct rte_fbk_hash_table *ht,
 static inline int
 rte_fbk_hash_delete_key(struct rte_fbk_hash_table *ht, uint32_t key)
 {
 static inline int
 rte_fbk_hash_delete_key(struct rte_fbk_hash_table *ht, uint32_t key)
 {

-       return rte_fbk_hash_delete_key_with_bucket(ht, 
+       return rte_fbk_hash_delete_key_with_bucket(ht,

                                key, rte_fbk_hash_get_bucket(ht, key));
 }
 
 /**
                                key, rte_fbk_hash_get_bucket(ht, key));
 }
 
 /**

- * Find a key in the hash table with a given bucketid. 
+ * Find a key in the hash table with a given bucketid.

  * This operation is multi-thread safe.
  *
  * @param ht
  * This operation is multi-thread safe.
  *
  * @param ht


@@ -285,7 +285,7 @@ rte_fbk_hash_delete_key(struct rte_fbk_hash_table *ht, uint32_t key)
  *   The value that was associated with the key, or negative value on error.
  */
 static inline int
  *   The value that was associated with the key, or negative value on error.
  */
 static inline int

-rte_fbk_hash_lookup_with_bucket(const struct rte_fbk_hash_table *ht, 
+rte_fbk_hash_lookup_with_bucket(const struct rte_fbk_hash_table *ht,

                                uint32_t key, uint32_t bucket)
 {
        union rte_fbk_hash_entry current_entry;
                                uint32_t key, uint32_t bucket)
 {
        union rte_fbk_hash_entry current_entry;

diff --git a/lib/librte_hash/rte_hash.c b/lib/librte_hash/rte_hash.c
index fcea41a..d4221a8 100644 (file)
--- a/lib/librte_hash/rte_hash.c
+++ b/lib/librte_hash/rte_hash.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -172,10 +172,10 @@ rte_hash_create(const struct rte_hash_parameters *params)
        struct rte_hash_list *hash_list;
 
        /* check that we have an initialised tail queue */
        struct rte_hash_list *hash_list;
 
        /* check that we have an initialised tail queue */

-       if ((hash_list = 
+       if ((hash_list =

             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_HASH, rte_hash_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_HASH, rte_hash_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;

-               return NULL;    
+               return NULL;

        }
 
        /* Check for valid parameters */
        }
 
        /* Check for valid parameters */


@@ -205,7 +205,7 @@ rte_hash_create(const struct rte_hash_parameters *params)
                                  CACHE_LINE_SIZE);
        key_tbl_size = align_size(num_buckets * key_size *
                                  params->bucket_entries, CACHE_LINE_SIZE);
                                  CACHE_LINE_SIZE);
        key_tbl_size = align_size(num_buckets * key_size *
                                  params->bucket_entries, CACHE_LINE_SIZE);

-       
+

        /* Total memory required for hash context */
        mem_size = hash_tbl_size + sig_tbl_size + key_tbl_size;
 
        /* Total memory required for hash context */
        mem_size = hash_tbl_size + sig_tbl_size + key_tbl_size;
 


@@ -261,7 +261,7 @@ rte_hash_free(struct rte_hash *h)
 }
 
 static inline int32_t
 }
 
 static inline int32_t

-__rte_hash_add_key_with_hash(const struct rte_hash *h, 
+__rte_hash_add_key_with_hash(const struct rte_hash *h,

                                const void *key, hash_sig_t sig)
 {
        hash_sig_t *sig_bucket;
                                const void *key, hash_sig_t sig)
 {
        hash_sig_t *sig_bucket;


@@ -297,7 +297,7 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h,
 }
 
 int32_t
 }
 
 int32_t

-rte_hash_add_key_with_hash(const struct rte_hash *h, 
+rte_hash_add_key_with_hash(const struct rte_hash *h,

                                const void *key, hash_sig_t sig)
 {
        RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
                                const void *key, hash_sig_t sig)
 {
        RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);


@@ -312,7 +312,7 @@ rte_hash_add_key(const struct rte_hash *h, const void *key)
 }
 
 static inline int32_t
 }
 
 static inline int32_t

-__rte_hash_del_key_with_hash(const struct rte_hash *h, 
+__rte_hash_del_key_with_hash(const struct rte_hash *h,

                                const void *key, hash_sig_t sig)
 {
        hash_sig_t *sig_bucket;
                                const void *key, hash_sig_t sig)
 {
        hash_sig_t *sig_bucket;


@@ -339,7 +339,7 @@ __rte_hash_del_key_with_hash(const struct rte_hash *h,
 }
 
 int32_t
 }
 
 int32_t

-rte_hash_del_key_with_hash(const struct rte_hash *h, 
+rte_hash_del_key_with_hash(const struct rte_hash *h,

                                const void *key, hash_sig_t sig)
 {
        RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
                                const void *key, hash_sig_t sig)
 {
        RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);


@@ -354,7 +354,7 @@ rte_hash_del_key(const struct rte_hash *h, const void *key)
 }
 
 static inline int32_t
 }
 
 static inline int32_t

-__rte_hash_lookup_with_hash(const struct rte_hash *h, 
+__rte_hash_lookup_with_hash(const struct rte_hash *h,

                        const void *key, hash_sig_t sig)
 {
        hash_sig_t *sig_bucket;
                        const void *key, hash_sig_t sig)
 {
        hash_sig_t *sig_bucket;


@@ -380,7 +380,7 @@ __rte_hash_lookup_with_hash(const struct rte_hash *h,
 }
 
 int32_t
 }
 
 int32_t

-rte_hash_lookup_with_hash(const struct rte_hash *h, 
+rte_hash_lookup_with_hash(const struct rte_hash *h,

                        const void *key, hash_sig_t sig)
 {
        RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
                        const void *key, hash_sig_t sig)
 {
        RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);

diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h
index dd61e1e..5228e3a 100644 (file)
--- a/lib/librte_hash/rte_hash.h
+++ b/lib/librte_hash/rte_hash.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -185,7 +185,7 @@ rte_hash_add_key(const struct rte_hash *h, const void *key);
  *     array of user data. This value is unique for this key.
  */
 int32_t
  *     array of user data. This value is unique for this key.
  */
 int32_t

-rte_hash_add_key_with_hash(const struct rte_hash *h, 
+rte_hash_add_key_with_hash(const struct rte_hash *h,

                                const void *key, hash_sig_t sig);
 
 /**
                                const void *key, hash_sig_t sig);
 
 /**


@@ -224,7 +224,7 @@ rte_hash_del_key(const struct rte_hash *h, const void *key);
  *     value that was returned when the key was added.
  */
 int32_t
  *     value that was returned when the key was added.
  */
 int32_t

-rte_hash_del_key_with_hash(const struct rte_hash *h, 
+rte_hash_del_key_with_hash(const struct rte_hash *h,

                                const void *key, hash_sig_t sig);
 
 
                                const void *key, hash_sig_t sig);
 
 


@@ -262,7 +262,7 @@ rte_hash_lookup(const struct rte_hash *h, const void *key);
  *     value that was returned when the key was added.
  */
 int32_t
  *     value that was returned when the key was added.
  */
 int32_t

-rte_hash_lookup_with_hash(const struct rte_hash *h, 
+rte_hash_lookup_with_hash(const struct rte_hash *h,

                                const void *key, hash_sig_t sig);
 
 
                                const void *key, hash_sig_t sig);
 
 

diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/librte_hash/rte_hash_crc.h
index a849678..b48b0db 100644 (file)
--- a/lib/librte_hash/rte_hash_crc.h
+++ b/lib/librte_hash/rte_hash_crc.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_hash/rte_jhash.h b/lib/librte_hash/rte_jhash.h
index ae91bf7..a4bf5a1 100644 (file)
--- a/lib/librte_hash/rte_jhash.h
+++ b/lib/librte_hash/rte_jhash.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_ivshmem/Makefile b/lib/librte_ivshmem/Makefile
index c94f926..536814c 100644 (file)
--- a/lib/librte_ivshmem/Makefile
+++ b/lib/librte_ivshmem/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_ivshmem/rte_ivshmem.c b/lib/librte_ivshmem/rte_ivshmem.c
index 4a5e7b0..b3a0b36 100644 (file)
--- a/lib/librte_ivshmem/rte_ivshmem.c
+++ b/lib/librte_ivshmem/rte_ivshmem.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_ivshmem/rte_ivshmem.h b/lib/librte_ivshmem/rte_ivshmem.h
index 0eda545..a5d36d6 100644 (file)
--- a/lib/librte_ivshmem/rte_ivshmem.h
+++ b/lib/librte_ivshmem/rte_ivshmem.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -49,8 +49,8 @@
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

-#define IVSHMEM_MAGIC          0x0BADC0DE
-#define IVSHMEM_NAME_LEN       32
+#define IVSHMEM_MAGIC 0x0BADC0DE
+#define IVSHMEM_NAME_LEN 32

 
 /**
  * Structure that holds IVSHMEM shared metadata entry.
 
 /**
  * Structure that holds IVSHMEM shared metadata entry.

diff --git a/lib/librte_kni/Makefile b/lib/librte_kni/Makefile
index a18bbd7..5267304 100644 (file)
--- a/lib/librte_kni/Makefile
+++ b/lib/librte_kni/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index a0daa23..89088e7 100644 (file)
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -160,7 +160,7 @@ rte_kni_alloc(struct rte_mempool *pktmbuf_pool,
 
        rte_snprintf(intf_name, RTE_KNI_NAMESIZE, conf->name);
        rte_snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "KNI_INFO_%s", intf_name);
 
        rte_snprintf(intf_name, RTE_KNI_NAMESIZE, conf->name);
        rte_snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "KNI_INFO_%s", intf_name);

-       mz = kni_memzone_reserve(mz_name, sizeof(struct rte_kni), 
+       mz = kni_memzone_reserve(mz_name, sizeof(struct rte_kni),

                                SOCKET_ID_ANY, 0);
        KNI_MZ_CHECK(mz == NULL);
        ctx = mz->addr;
                                SOCKET_ID_ANY, 0);
        KNI_MZ_CHECK(mz == NULL);
        ctx = mz->addr;


@@ -478,7 +478,7 @@ kni_check_request_register(struct rte_kni_ops *ops)
        /* check if KNI request ops has been registered*/
        if( NULL == ops )
                return KNI_REQ_NO_REGISTER;
        /* check if KNI request ops has been registered*/
        if( NULL == ops )
                return KNI_REQ_NO_REGISTER;

-                
+

        if((NULL == ops->change_mtu) && (NULL == ops->config_network_if))
                return KNI_REQ_NO_REGISTER;
 
        if((NULL == ops->change_mtu) && (NULL == ops->config_network_if))
                return KNI_REQ_NO_REGISTER;
 


@@ -489,7 +489,7 @@ int
 rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
 {
        enum kni_ops_status req_status;
 rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
 {
        enum kni_ops_status req_status;

-       
+

        if (NULL == ops) {
                RTE_LOG(ERR, KNI, "Invalid KNI request operation.\n");
                return -1;
        if (NULL == ops) {
                RTE_LOG(ERR, KNI, "Invalid KNI request operation.\n");
                return -1;


@@ -507,7 +507,7 @@ rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
                return -1;
        }
 
                return -1;
        }
 

-       memcpy(&kni->ops, ops, sizeof(struct rte_kni_ops));     
+       memcpy(&kni->ops, ops, sizeof(struct rte_kni_ops));

        return 0;
 }
 
        return 0;
 }
 


@@ -518,17 +518,17 @@ rte_kni_unregister_handlers(struct rte_kni *kni)
                RTE_LOG(ERR, KNI, "Invalid kni info.\n");
                return -1;
        }
                RTE_LOG(ERR, KNI, "Invalid kni info.\n");
                return -1;
        }

-       
+

        kni->ops.change_mtu = NULL;
        kni->ops.config_network_if = NULL;
        return 0;
 }
        kni->ops.change_mtu = NULL;
        kni->ops.config_network_if = NULL;
        return 0;
 }

-void 
+void

 rte_kni_close(void)
 {
        if (kni_fd < 0)
                return;
 
        close(kni_fd);
 rte_kni_close(void)
 {
        if (kni_fd < 0)
                return;
 
        close(kni_fd);

-       kni_fd = -1;    
+       kni_fd = -1;

 }
 }

diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index cad877b..1a0b004 100644 (file)
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -149,7 +149,7 @@ extern struct rte_kni *rte_kni_create(uint8_t port_id,
 extern int rte_kni_release(struct rte_kni *kni);
 
 /**
 extern int rte_kni_release(struct rte_kni *kni);
 
 /**

- * It is used to handle the request mbufs sent from kernel space. 
+ * It is used to handle the request mbufs sent from kernel space.

  * Then analyzes it and calls the specific actions for the specific requests.
  * Finally constructs the response mbuf and puts it back to the resp_q.
  *
  * Then analyzes it and calls the specific actions for the specific requests.
  * Finally constructs the response mbuf and puts it back to the resp_q.
  *


@@ -157,7 +157,7 @@ extern int rte_kni_release(struct rte_kni *kni);
  *  The pointer to the context of an existent KNI interface.
  *
  * @return
  *  The pointer to the context of an existent KNI interface.
  *
  * @return

- *  - 0 
+ *  - 0

  *  - negative value indicates failure.
  */
 extern int rte_kni_handle_request(struct rte_kni *kni);
  *  - negative value indicates failure.
  */
 extern int rte_kni_handle_request(struct rte_kni *kni);


@@ -235,7 +235,7 @@ extern struct rte_kni *rte_kni_get(const char *name);
  * @param port_id
  *  the port id.
  *
  * @param port_id
  *  the port id.
  *

- * @return 
+ * @return

  *  On success: Pointer to KNI interface.
  *  On failure: NULL
  */
  *  On success: Pointer to KNI interface.
  *  On failure: NULL
  */


@@ -246,9 +246,9 @@ extern struct rte_kni *rte_kni_info_get(uint8_t port_id) \
  * Register KNI request handling for a specified port,and it can
  * be called by master process or slave process.
  *
  * Register KNI request handling for a specified port,and it can
  * be called by master process or slave process.
  *

- * @param kni 
- *  pointer to struct rte_kni. 
- * @param ops 
+ * @param kni
+ *  pointer to struct rte_kni.
+ * @param ops

  *  ponter to struct rte_kni_ops.
  *
  * @return
  *  ponter to struct rte_kni_ops.
  *
  * @return


@@ -260,9 +260,9 @@ extern int rte_kni_register_handlers(struct rte_kni *kni,
 
 /**
  *  Unregister KNI request handling for a specified port.
 
 /**
  *  Unregister KNI request handling for a specified port.

- * 
- *  @param kni 
- *   pointer to struct rte_kni. 
+ *
+ *  @param kni
+ *   pointer to struct rte_kni.

  *
  *  @return
  *   On success: 0
  *
  *  @return
  *   On success: 0


@@ -272,10 +272,10 @@ extern int rte_kni_unregister_handlers(struct rte_kni *kni);
 
 /**
  *  close KNI device.
 
 /**
  *  close KNI device.

- * 
+ *

  *  @param void
  *
  *  @param void
  *

- *  @return 
+ *  @return

  *   void
  */
 extern void rte_kni_close(void);
  *   void
  */
 extern void rte_kni_close(void);

diff --git a/lib/librte_kni/rte_kni_fifo.h b/lib/librte_kni/rte_kni_fifo.h
index d533af0..8cb8587 100644 (file)
--- a/lib/librte_kni/rte_kni_fifo.h
+++ b/lib/librte_kni/rte_kni_fifo.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile
index 1c9b7cd..fa94163 100644 (file)
--- a/lib/librte_lpm/Makefile
+++ b/lib/librte_lpm/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c
index e915c24..592750e 100644 (file)
--- a/lib/librte_lpm/rte_lpm.c
+++ b/lib/librte_lpm/rte_lpm.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -57,7 +57,7 @@
 #include "rte_lpm.h"
 
 TAILQ_HEAD(rte_lpm_list, rte_lpm);
 #include "rte_lpm.h"
 
 TAILQ_HEAD(rte_lpm_list, rte_lpm);

- 
+

 #define MAX_DEPTH_TBL24 24
 
 enum valid_flag {
 #define MAX_DEPTH_TBL24 24
 
 enum valid_flag {


@@ -153,10 +153,10 @@ rte_lpm_create(const char *name, int socket_id, int max_rules,
        struct rte_lpm_list *lpm_list;
 
        /* check that we have an initialised tail queue */
        struct rte_lpm_list *lpm_list;
 
        /* check that we have an initialised tail queue */

-       if ((lpm_list = 
+       if ((lpm_list =

             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_LPM, rte_lpm_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_LPM, rte_lpm_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;

-               return NULL;    
+               return NULL;

        }
 
        RTE_BUILD_BUG_ON(sizeof(struct rte_lpm_tbl24_entry) != 2);
        }
 
        RTE_BUILD_BUG_ON(sizeof(struct rte_lpm_tbl24_entry) != 2);


@@ -197,7 +197,7 @@ rte_lpm_create(const char *name, int socket_id, int max_rules,
 
        TAILQ_INSERT_TAIL(lpm_list, lpm, next);
 
 
        TAILQ_INSERT_TAIL(lpm_list, lpm, next);
 

-exit:  
+exit:

        rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
 
        return lpm;
        rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
 
        return lpm;


@@ -251,7 +251,7 @@ rule_add(struct rte_lpm *lpm, uint32_t ip_masked, uint8_t depth,
                        /* If rule already exists update its next_hop and return. */
                        if (lpm->rules_tbl[rule_index].ip == ip_masked) {
                                lpm->rules_tbl[rule_index].next_hop = next_hop;
                        /* If rule already exists update its next_hop and return. */
                        if (lpm->rules_tbl[rule_index].ip == ip_masked) {
                                lpm->rules_tbl[rule_index].next_hop = next_hop;

-       
+

                                return rule_index;
                        }
                }
                                return rule_index;
                        }
                }


@@ -415,7 +415,7 @@ add_depth_small(struct rte_lpm *lpm, uint32_t ip, uint8_t depth,
 
                /* If tbl24 entry is valid and extended calculate the index
                 * into tbl8. */
 
                /* If tbl24 entry is valid and extended calculate the index
                 * into tbl8. */

-               tbl8_index = lpm->tbl24[i].tbl8_gindex * 
+               tbl8_index = lpm->tbl24[i].tbl8_gindex *

                                RTE_LPM_TBL8_GROUP_NUM_ENTRIES;
                tbl8_group_end = tbl8_index + RTE_LPM_TBL8_GROUP_NUM_ENTRIES;
 
                                RTE_LPM_TBL8_GROUP_NUM_ENTRIES;
                tbl8_group_end = tbl8_index + RTE_LPM_TBL8_GROUP_NUM_ENTRIES;
 


@@ -660,7 +660,7 @@ delete_depth_small(struct rte_lpm *lpm, uint32_t ip_masked,
                 * associated with this rule.
                 */
                for (i = tbl24_index; i < (tbl24_index + tbl24_range); i++) {
                 * associated with this rule.
                 */
                for (i = tbl24_index; i < (tbl24_index + tbl24_range); i++) {

-                       
+

                        if (lpm->tbl24[i].ext_entry == 0 &&
                                        lpm->tbl24[i].depth <= depth ) {
                                lpm->tbl24[i].valid = INVALID;
                        if (lpm->tbl24[i].ext_entry == 0 &&
                                        lpm->tbl24[i].depth <= depth ) {
                                lpm->tbl24[i].valid = INVALID;


@@ -721,7 +721,7 @@ delete_depth_small(struct rte_lpm *lpm, uint32_t ip_masked,
                                tbl8_group_index = lpm->tbl24[i].tbl8_gindex;
                                tbl8_index = tbl8_group_index *
                                                RTE_LPM_TBL8_GROUP_NUM_ENTRIES;
                                tbl8_group_index = lpm->tbl24[i].tbl8_gindex;
                                tbl8_index = tbl8_group_index *
                                                RTE_LPM_TBL8_GROUP_NUM_ENTRIES;

-                               
+

                                for (j = tbl8_index; j < (tbl8_index +
                                        RTE_LPM_TBL8_GROUP_NUM_ENTRIES); j++) {
 
                                for (j = tbl8_index; j < (tbl8_index +
                                        RTE_LPM_TBL8_GROUP_NUM_ENTRIES); j++) {
 

diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h
index 033f542..047738c 100644 (file)
--- a/lib/librte_lpm/rte_lpm.h
+++ b/lib/librte_lpm/rte_lpm.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c
index 99a4a58..56c74a1 100644 (file)
--- a/lib/librte_lpm/rte_lpm6.c
+++ b/lib/librte_lpm/rte_lpm6.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -83,7 +83,7 @@ TAILQ_HEAD(rte_lpm6_list, rte_lpm6);
 struct rte_lpm6_tbl_entry {
        uint32_t next_hop:      21;  /**< Next hop / next table to be checked. */
        uint32_t depth  :8;      /**< Rule depth. */
 struct rte_lpm6_tbl_entry {
        uint32_t next_hop:      21;  /**< Next hop / next table to be checked. */
        uint32_t depth  :8;      /**< Rule depth. */

-       
+

        /* Flags. */
        uint32_t valid     :1;   /**< Validation flag. */
        uint32_t valid_group :1; /**< Group validation flag. */
        /* Flags. */
        uint32_t valid     :1;   /**< Validation flag. */
        uint32_t valid_group :1; /**< Group validation flag. */


@@ -126,7 +126,7 @@ mask_ip(uint8_t *ip, uint8_t depth)
 {
         int16_t part_depth, mask;
         int i;
 {
         int16_t part_depth, mask;
         int i;

-               
+

                part_depth = depth;
 
                for (i = 0; i < RTE_LPM6_IPV6_ADDR_SIZE; i++) {
                part_depth = depth;
 
                for (i = 0; i < RTE_LPM6_IPV6_ADDR_SIZE; i++) {


@@ -153,10 +153,10 @@ rte_lpm6_create(const char *name, int socket_id,
        struct rte_lpm6_list *lpm_list;
 
        /* Check that we have an initialised tail queue */
        struct rte_lpm6_list *lpm_list;
 
        /* Check that we have an initialised tail queue */

-       if ((lpm_list = 
+       if ((lpm_list =

             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_LPM6, rte_lpm6_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_LPM6, rte_lpm6_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;

-               return NULL;    
+               return NULL;

        }
 
        RTE_BUILD_BUG_ON(sizeof(struct rte_lpm6_tbl_entry) != sizeof(uint32_t));
        }
 
        RTE_BUILD_BUG_ON(sizeof(struct rte_lpm6_tbl_entry) != sizeof(uint32_t));


@@ -189,7 +189,7 @@ rte_lpm6_create(const char *name, int socket_id,
        /* Allocate memory to store the LPM data structures. */
        lpm = (struct rte_lpm6 *)rte_zmalloc_socket(mem_name, (size_t)mem_size,
                        CACHE_LINE_SIZE, socket_id);
        /* Allocate memory to store the LPM data structures. */
        lpm = (struct rte_lpm6 *)rte_zmalloc_socket(mem_name, (size_t)mem_size,
                        CACHE_LINE_SIZE, socket_id);

-                       
+

        if (lpm == NULL) {
                RTE_LOG(ERR, LPM, "LPM memory allocation failed\n");
                goto exit;
        if (lpm == NULL) {
                RTE_LOG(ERR, LPM, "LPM memory allocation failed\n");
                goto exit;


@@ -197,7 +197,7 @@ rte_lpm6_create(const char *name, int socket_id,
 
        lpm->rules_tbl = (struct rte_lpm6_rule *)rte_zmalloc_socket(NULL,
                        (size_t)rules_size, CACHE_LINE_SIZE, socket_id);
 
        lpm->rules_tbl = (struct rte_lpm6_rule *)rte_zmalloc_socket(NULL,
                        (size_t)rules_size, CACHE_LINE_SIZE, socket_id);

-                       
+

        if (lpm->rules_tbl == NULL) {
                RTE_LOG(ERR, LPM, "LPM memory allocation failed\n");
                rte_free(lpm);
        if (lpm->rules_tbl == NULL) {
                RTE_LOG(ERR, LPM, "LPM memory allocation failed\n");
                rte_free(lpm);


@@ -211,7 +211,7 @@ rte_lpm6_create(const char *name, int socket_id,
 
        TAILQ_INSERT_TAIL(lpm_list, lpm, next);
 
 
        TAILQ_INSERT_TAIL(lpm_list, lpm, next);
 

-exit:  
+exit:

        rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
 
        return lpm;
        rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
 
        return lpm;


@@ -269,7 +269,7 @@ static inline int32_t
 rule_add(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t next_hop, uint8_t depth)
 {
        uint32_t rule_index;
 rule_add(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t next_hop, uint8_t depth)
 {
        uint32_t rule_index;

-               
+

        /* Scan through rule list to see if rule already exists. */
        for (rule_index = 0; rule_index < lpm->used_rules; rule_index++) {
 
        /* Scan through rule list to see if rule already exists. */
        for (rule_index = 0; rule_index < lpm->used_rules; rule_index++) {
 


@@ -298,7 +298,7 @@ rule_add(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t next_hop, uint8_t depth)
 
        /* Increment the used rules counter for this rule group. */
        lpm->used_rules++;
 
        /* Increment the used rules counter for this rule group. */
        lpm->used_rules++;

-       
+

        return rule_index;
 }
 
        return rule_index;
 }
 


@@ -352,7 +352,7 @@ add_step(struct rte_lpm6 *lpm, struct rte_lpm6_tbl_entry *tbl,
        int32_t tbl8_gindex;
        int8_t bitshift;
        uint8_t bits_covered;
        int32_t tbl8_gindex;
        int8_t bitshift;
        uint8_t bits_covered;

-       
+

        /*
         * Calculate index to the table based on the number and position
         * of the bytes being inspected in this step.
        /*
         * Calculate index to the table based on the number and position
         * of the bytes being inspected in this step.


@@ -360,16 +360,16 @@ add_step(struct rte_lpm6 *lpm, struct rte_lpm6_tbl_entry *tbl,
        tbl_index = 0;
        for (i = first_byte; i < (uint32_t)(first_byte + bytes); i++) {
                bitshift = (int8_t)((bytes - i)*BYTE_SIZE);
        tbl_index = 0;
        for (i = first_byte; i < (uint32_t)(first_byte + bytes); i++) {
                bitshift = (int8_t)((bytes - i)*BYTE_SIZE);

-               
+

                if (bitshift < 0) bitshift = 0;
                tbl_index = tbl_index | ip[i-1] << bitshift;
        }
 
        /* Number of bits covered in this step */
        bits_covered = (uint8_t)((bytes+first_byte-1)*BYTE_SIZE);
                if (bitshift < 0) bitshift = 0;
                tbl_index = tbl_index | ip[i-1] << bitshift;
        }
 
        /* Number of bits covered in this step */
        bits_covered = (uint8_t)((bytes+first_byte-1)*BYTE_SIZE);

-       
+

        /*
        /*

-        * If depth if smaller than this number (ie this is the last step) 
+        * If depth if smaller than this number (ie this is the last step)

         * expand the rule across the relevant positions in the table.
         */
        if (depth <= bits_covered) {
         * expand the rule across the relevant positions in the table.
         */
        if (depth <= bits_covered) {


@@ -390,17 +390,17 @@ add_step(struct rte_lpm6 *lpm, struct rte_lpm6_tbl_entry *tbl,
                                tbl[i] = new_tbl_entry;
 
                        } else if (tbl[i].ext_entry == 1) {
                                tbl[i] = new_tbl_entry;
 
                        } else if (tbl[i].ext_entry == 1) {

-                       
+

                                /*
                                 * If tbl entry is valid and extended calculate the index
                                 * into next tbl8 and expand the rule across the data structure.
                                 */
                                /*
                                 * If tbl entry is valid and extended calculate the index
                                 * into next tbl8 and expand the rule across the data structure.
                                 */

-                               tbl8_gindex = tbl[i].lpm6_tbl8_gindex * 
+                               tbl8_gindex = tbl[i].lpm6_tbl8_gindex *

                                                RTE_LPM6_TBL8_GROUP_NUM_ENTRIES;
                                expand_rule(lpm, tbl8_gindex, depth, next_hop);
                        }
                                                RTE_LPM6_TBL8_GROUP_NUM_ENTRIES;
                                expand_rule(lpm, tbl8_gindex, depth, next_hop);
                        }

-               }    
-               
+               }
+

                return 0;
        }
        /*
                return 0;
        }
        /*


@@ -414,7 +414,7 @@ add_step(struct rte_lpm6 *lpm, struct rte_lpm6_tbl_entry *tbl,
                                tbl8_gindex = (lpm->next_tbl8)++;
                        else
                                return -ENOSPC;
                                tbl8_gindex = (lpm->next_tbl8)++;
                        else
                                return -ENOSPC;

-                       
+

                        struct rte_lpm6_tbl_entry new_tbl_entry = {
                                .lpm6_tbl8_gindex = tbl8_gindex,
                                .depth = 0,
                        struct rte_lpm6_tbl_entry new_tbl_entry = {
                                .lpm6_tbl8_gindex = tbl8_gindex,
                                .depth = 0,


@@ -464,11 +464,11 @@ add_step(struct rte_lpm6 *lpm, struct rte_lpm6_tbl_entry *tbl,
 
                        tbl[tbl_index] = new_tbl_entry;
                }
 
                        tbl[tbl_index] = new_tbl_entry;
                }

-               
+

                *tbl_next = &(lpm->tbl8[tbl[tbl_index].lpm6_tbl8_gindex *
                                RTE_LPM6_TBL8_GROUP_NUM_ENTRIES]);
        }
                *tbl_next = &(lpm->tbl8[tbl[tbl_index].lpm6_tbl8_gindex *
                                RTE_LPM6_TBL8_GROUP_NUM_ENTRIES]);
        }

-       
+

        return 1;
 }
 
        return 1;
 }
 


@@ -485,11 +485,11 @@ rte_lpm6_add(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth,
        int status;
        uint8_t masked_ip[RTE_LPM6_IPV6_ADDR_SIZE];
        int i;
        int status;
        uint8_t masked_ip[RTE_LPM6_IPV6_ADDR_SIZE];
        int i;

-       
+

        /* Check user arguments. */
        if ((lpm == NULL) || (depth < 1) || (depth > RTE_LPM6_MAX_DEPTH))
                return -EINVAL;
        /* Check user arguments. */
        if ((lpm == NULL) || (depth < 1) || (depth > RTE_LPM6_MAX_DEPTH))
                return -EINVAL;

-               
+

        /* Copy the IP and mask it to avoid modifying user's input data. */
        memcpy(masked_ip, ip, RTE_LPM6_IPV6_ADDR_SIZE);
        mask_ip(masked_ip, depth);
        /* Copy the IP and mask it to avoid modifying user's input data. */
        memcpy(masked_ip, ip, RTE_LPM6_IPV6_ADDR_SIZE);
        mask_ip(masked_ip, depth);


@@ -508,11 +508,11 @@ rte_lpm6_add(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth,
                        depth, next_hop);
        if (status < 0) {
                rte_lpm6_delete(lpm, masked_ip, depth);
                        depth, next_hop);
        if (status < 0) {
                rte_lpm6_delete(lpm, masked_ip, depth);

-               
+

                return status;
        }
 
                return status;
        }
 

-       /* 
+       /*

         * Inspect one by one the rest of the bytes until
         * the process is completed.
         */
         * Inspect one by one the rest of the bytes until
         * the process is completed.
         */


@@ -522,11 +522,11 @@ rte_lpm6_add(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth,
                                depth, next_hop);
                if (status < 0) {
                        rte_lpm6_delete(lpm, masked_ip, depth);
                                depth, next_hop);
                if (status < 0) {
                        rte_lpm6_delete(lpm, masked_ip, depth);

-                       
+

                        return status;
                }
        }
                        return status;
                }
        }

-       
+

        return status;
 }
 
        return status;
 }
 


@@ -541,10 +541,10 @@ lookup_step(const struct rte_lpm6 *lpm, const struct rte_lpm6_tbl_entry *tbl,
                uint8_t first_byte, uint8_t *next_hop)
 {
        uint32_t tbl8_index, tbl_entry;
                uint8_t first_byte, uint8_t *next_hop)
 {
        uint32_t tbl8_index, tbl_entry;

-       
+

        /* Take the integer value from the pointer. */
        tbl_entry = *(const uint32_t *)tbl;
        /* Take the integer value from the pointer. */
        tbl_entry = *(const uint32_t *)tbl;

-       
+

        /* If it is valid and extended we calculate the new pointer to return. */
        if ((tbl_entry & RTE_LPM6_VALID_EXT_ENTRY_BITMASK) ==
                        RTE_LPM6_VALID_EXT_ENTRY_BITMASK) {
        /* If it is valid and extended we calculate the new pointer to return. */
        if ((tbl_entry & RTE_LPM6_VALID_EXT_ENTRY_BITMASK) ==
                        RTE_LPM6_VALID_EXT_ENTRY_BITMASK) {


@@ -574,24 +574,24 @@ rte_lpm6_lookup(const struct rte_lpm6 *lpm, uint8_t *ip, uint8_t *next_hop)
        int status;
        uint8_t first_byte;
        uint32_t tbl24_index;
        int status;
        uint8_t first_byte;
        uint32_t tbl24_index;

-       
+

        /* DEBUG: Check user input arguments. */
        if ((lpm == NULL) || (ip == NULL) || (next_hop == NULL)) {
                return -EINVAL;
        }
        /* DEBUG: Check user input arguments. */
        if ((lpm == NULL) || (ip == NULL) || (next_hop == NULL)) {
                return -EINVAL;
        }

-       
+

        first_byte = LOOKUP_FIRST_BYTE;
        tbl24_index = (ip[0] << BYTES2_SIZE) | (ip[1] << BYTE_SIZE) | ip[2];
 
        /* Calculate pointer to the first entry to be inspected */
        tbl = &lpm->tbl24[tbl24_index];
        first_byte = LOOKUP_FIRST_BYTE;
        tbl24_index = (ip[0] << BYTES2_SIZE) | (ip[1] << BYTE_SIZE) | ip[2];
 
        /* Calculate pointer to the first entry to be inspected */
        tbl = &lpm->tbl24[tbl24_index];

-       
+

        do {
        do {

-               /* Continue inspecting following levels until success or failure */             
+               /* Continue inspecting following levels until success or failure */

                status = lookup_step(lpm, tbl, &tbl_next, ip, first_byte++, next_hop);
                tbl = tbl_next;
        } while (status == 1);
                status = lookup_step(lpm, tbl, &tbl_next, ip, first_byte++, next_hop);
                tbl = tbl_next;
        } while (status == 1);

-       
+

        return status;
 }
 
        return status;
 }
 


@@ -622,20 +622,20 @@ rte_lpm6_lookup_bulk_func(const struct rte_lpm6 *lpm,
 
                /* Calculate pointer to the first entry to be inspected */
                tbl = &lpm->tbl24[tbl24_index];
 
                /* Calculate pointer to the first entry to be inspected */
                tbl = &lpm->tbl24[tbl24_index];

-               
+

                do {
                do {

-                       /* Continue inspecting following levels until success or failure */             
+                       /* Continue inspecting following levels until success or failure */

                        status = lookup_step(lpm, tbl, &tbl_next, ips[i], first_byte++,
                                        &next_hop);
                        tbl = tbl_next;
                } while (status == 1);
                        status = lookup_step(lpm, tbl, &tbl_next, ips[i], first_byte++,
                                        &next_hop);
                        tbl = tbl_next;
                } while (status == 1);

-               
+

                if (status < 0)
                        next_hops[i] = -1;
                else
                        next_hops[i] = next_hop;
        }
                if (status < 0)
                        next_hops[i] = -1;
                else
                        next_hops[i] = next_hop;
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -647,14 +647,14 @@ static inline int32_t
 rule_find(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth)
 {
        uint32_t rule_index;
 rule_find(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth)
 {
        uint32_t rule_index;

-       
+

        /* Scan used rules at given depth to find rule. */
        for (rule_index = 0; rule_index < lpm->used_rules; rule_index++) {
                /* If rule is found return the rule index. */
                if ((memcmp (lpm->rules_tbl[rule_index].ip, ip,
                                RTE_LPM6_IPV6_ADDR_SIZE) == 0) &&
                                lpm->rules_tbl[rule_index].depth == depth) {
        /* Scan used rules at given depth to find rule. */
        for (rule_index = 0; rule_index < lpm->used_rules; rule_index++) {
                /* If rule is found return the rule index. */
                if ((memcmp (lpm->rules_tbl[rule_index].ip, ip,
                                RTE_LPM6_IPV6_ADDR_SIZE) == 0) &&
                                lpm->rules_tbl[rule_index].depth == depth) {

-               
+

                        return rule_index;
                }
        }
                        return rule_index;
                }
        }


@@ -687,7 +687,7 @@ rte_lpm6_delete(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth)
        int32_t rule_to_delete_index;
        uint8_t ip_masked[RTE_LPM6_IPV6_ADDR_SIZE];
        unsigned i;
        int32_t rule_to_delete_index;
        uint8_t ip_masked[RTE_LPM6_IPV6_ADDR_SIZE];
        unsigned i;

-       
+

        /*
         * Check input arguments.
         */
        /*
         * Check input arguments.
         */


@@ -714,8 +714,8 @@ rte_lpm6_delete(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth)
 
        /* Delete the rule from the rule table. */
        rule_delete(lpm, rule_to_delete_index);
 
        /* Delete the rule from the rule table. */
        rule_delete(lpm, rule_to_delete_index);

-               
-       /* 
+
+       /*

         * Set all the table entries to 0 (ie delete every rule
         * from the data structure.
         */
         * Set all the table entries to 0 (ie delete every rule
         * from the data structure.
         */


@@ -723,8 +723,8 @@ rte_lpm6_delete(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth)
        memset(lpm->tbl24, 0, sizeof(lpm->tbl24));
        memset(lpm->tbl8, 0, sizeof(lpm->tbl8[0])
                        * RTE_LPM6_TBL8_GROUP_NUM_ENTRIES * lpm->number_tbl8s);
        memset(lpm->tbl24, 0, sizeof(lpm->tbl24));
        memset(lpm->tbl8, 0, sizeof(lpm->tbl8[0])
                        * RTE_LPM6_TBL8_GROUP_NUM_ENTRIES * lpm->number_tbl8s);

-       
-       /* 
+
+       /*

         * Add every rule again (except for the one that was removed from
         * the rules table).
         */
         * Add every rule again (except for the one that was removed from
         * the rules table).
         */


@@ -732,7 +732,7 @@ rte_lpm6_delete(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth)
                rte_lpm6_add(lpm, lpm->rules_tbl[i].ip, lpm->rules_tbl[i].depth,
                                lpm->rules_tbl[i].next_hop);
        }
                rte_lpm6_add(lpm, lpm->rules_tbl[i].ip, lpm->rules_tbl[i].depth,
                                lpm->rules_tbl[i].next_hop);
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -746,14 +746,14 @@ rte_lpm6_delete_bulk_func(struct rte_lpm6 *lpm,
        int32_t rule_to_delete_index;
        uint8_t ip_masked[RTE_LPM6_IPV6_ADDR_SIZE];
        unsigned i;
        int32_t rule_to_delete_index;
        uint8_t ip_masked[RTE_LPM6_IPV6_ADDR_SIZE];
        unsigned i;

-       
+

        /*
         * Check input arguments.
         */
        if ((lpm == NULL) || (ips == NULL) || (depths == NULL)) {
                return -EINVAL;
        }
        /*
         * Check input arguments.
         */
        if ((lpm == NULL) || (ips == NULL) || (depths == NULL)) {
                return -EINVAL;
        }

-       
+

        for (i = 0; i < n; i++) {
                /* Copy the IP and mask it to avoid modifying user's input data. */
                memcpy(ip_masked, ips[i], RTE_LPM6_IPV6_ADDR_SIZE);
        for (i = 0; i < n; i++) {
                /* Copy the IP and mask it to avoid modifying user's input data. */
                memcpy(ip_masked, ips[i], RTE_LPM6_IPV6_ADDR_SIZE);


@@ -775,8 +775,8 @@ rte_lpm6_delete_bulk_func(struct rte_lpm6 *lpm,
                /* Delete the rule from the rule table. */
                rule_delete(lpm, rule_to_delete_index);
        }
                /* Delete the rule from the rule table. */
                rule_delete(lpm, rule_to_delete_index);
        }

-               
-       /* 
+
+       /*

         * Set all the table entries to 0 (ie delete every rule
         * from the data structure.
         */
         * Set all the table entries to 0 (ie delete every rule
         * from the data structure.
         */


@@ -784,8 +784,8 @@ rte_lpm6_delete_bulk_func(struct rte_lpm6 *lpm,
        memset(lpm->tbl24, 0, sizeof(lpm->tbl24));
        memset(lpm->tbl8, 0, sizeof(lpm->tbl8[0])
                        * RTE_LPM6_TBL8_GROUP_NUM_ENTRIES * lpm->number_tbl8s);
        memset(lpm->tbl24, 0, sizeof(lpm->tbl24));
        memset(lpm->tbl8, 0, sizeof(lpm->tbl8[0])
                        * RTE_LPM6_TBL8_GROUP_NUM_ENTRIES * lpm->number_tbl8s);

-       
-       /* 
+
+       /*

         * Add every rule again (except for the ones that were removed from
         * the rules table).
         */
         * Add every rule again (except for the ones that were removed from
         * the rules table).
         */


@@ -793,7 +793,7 @@ rte_lpm6_delete_bulk_func(struct rte_lpm6 *lpm,
                rte_lpm6_add(lpm, lpm->rules_tbl[i].ip, lpm->rules_tbl[i].depth,
                                lpm->rules_tbl[i].next_hop);
        }
                rte_lpm6_add(lpm, lpm->rules_tbl[i].ip, lpm->rules_tbl[i].depth,
                                lpm->rules_tbl[i].next_hop);
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -805,7 +805,7 @@ rte_lpm6_delete_all(struct rte_lpm6 *lpm)
 {
        /* Zero used rules counter. */
        lpm->used_rules = 0;
 {
        /* Zero used rules counter. */
        lpm->used_rules = 0;

-               
+

        /* Zero next tbl8 index. */
        lpm->next_tbl8 = 0;
 
        /* Zero next tbl8 index. */
        lpm->next_tbl8 = 0;
 

diff --git a/lib/librte_lpm/rte_lpm6.h b/lib/librte_lpm/rte_lpm6.h
index 8c1a293..856e540 100644 (file)
--- a/lib/librte_lpm/rte_lpm6.h
+++ b/lib/librte_lpm/rte_lpm6.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_malloc/Makefile b/lib/librte_malloc/Makefile
index c0c992b..ba87e34 100644 (file)
--- a/lib/librte_malloc/Makefile
+++ b/lib/librte_malloc/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_malloc/malloc_elem.c b/lib/librte_malloc/malloc_elem.c
index f0da640..172da69 100644 (file)
--- a/lib/librte_malloc/malloc_elem.c
+++ b/lib/librte_malloc/malloc_elem.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_malloc/malloc_elem.h b/lib/librte_malloc/malloc_elem.h
index eadecf9..cd25384 100644 (file)
--- a/lib/librte_malloc/malloc_elem.h
+++ b/lib/librte_malloc/malloc_elem.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_malloc/malloc_heap.c b/lib/librte_malloc/malloc_heap.c
index 882749c..6e99251 100644 (file)
--- a/lib/librte_malloc/malloc_heap.c
+++ b/lib/librte_malloc/malloc_heap.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_malloc/malloc_heap.h b/lib/librte_malloc/malloc_heap.h
index 7878840..b4aec45 100644 (file)
--- a/lib/librte_malloc/malloc_heap.h
+++ b/lib/librte_malloc/malloc_heap.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_malloc/rte_malloc.c b/lib/librte_malloc/rte_malloc.c
index e620a4a..ee36357 100644 (file)
--- a/lib/librte_malloc/rte_malloc.c
+++ b/lib/librte_malloc/rte_malloc.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_malloc/rte_malloc.h b/lib/librte_malloc/rte_malloc.h
index ce8a8d7..74bb78c 100644 (file)
--- a/lib/librte_malloc/rte_malloc.h
+++ b/lib/librte_malloc/rte_malloc.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile
index c2b47e3..9b45ba4 100644 (file)
--- a/lib/librte_mbuf/Makefile
+++ b/lib/librte_mbuf/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index a72e9b8..09d8934 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 4a9ab41..7ec6682 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile
index d8bbc16..c79b306 100644 (file)
--- a/lib/librte_mempool/Makefile
+++ b/lib/librte_mempool/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_mempool/rte_dom0_mempool.c b/lib/librte_mempool/rte_dom0_mempool.c
index 0468211..8152b01 100644 (file)
--- a/lib/librte_mempool/rte_dom0_mempool.c
+++ b/lib/librte_mempool/rte_dom0_mempool.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -61,21 +61,21 @@
 #include "rte_mempool.h"
 
 static void
 #include "rte_mempool.h"
 
 static void

-get_phys_map(void *va, phys_addr_t pa[], uint32_t pg_num, 
-            uint32_t pg_sz, uint32_t memseg_id) 
+get_phys_map(void *va, phys_addr_t pa[], uint32_t pg_num,
+            uint32_t pg_sz, uint32_t memseg_id)

 {
     uint32_t i;
     uint64_t virt_addr, mfn_id;
     struct rte_mem_config *mcfg;
     uint32_t page_size = getpagesize();
 {
     uint32_t i;
     uint64_t virt_addr, mfn_id;
     struct rte_mem_config *mcfg;
     uint32_t page_size = getpagesize();

-    
+

     /* get pointer to global configuration */
     mcfg = rte_eal_get_configuration()->mem_config;
     virt_addr =(uintptr_t) mcfg->memseg[memseg_id].addr;
     /* get pointer to global configuration */
     mcfg = rte_eal_get_configuration()->mem_config;
     virt_addr =(uintptr_t) mcfg->memseg[memseg_id].addr;

-     
-    for (i = 0; i != pg_num; i++) { 
-        mfn_id = ((uintptr_t)va + i * pg_sz - virt_addr) / RTE_PGSIZE_2M;    
-        pa[i] = mcfg->memseg[memseg_id].mfn[mfn_id] * page_size; 
+
+    for (i = 0; i != pg_num; i++) {
+        mfn_id = ((uintptr_t)va + i * pg_sz - virt_addr) / RTE_PGSIZE_2M;
+        pa[i] = mcfg->memseg[memseg_id].mfn[mfn_id] * page_size;

     }
 }
 
     }
 }
 


@@ -87,30 +87,30 @@ rte_dom0_mempool_create(const char *name, unsigned elt_num, unsigned elt_size,
            rte_mempool_obj_ctor_t *obj_init, void *obj_init_arg,
            int socket_id, unsigned flags)
 {
            rte_mempool_obj_ctor_t *obj_init, void *obj_init_arg,
            int socket_id, unsigned flags)
 {

-       struct rte_mempool *mp = NULL; 
-       phys_addr_t *pa; 
-       char *va; 
-       size_t sz; 
-       uint32_t pg_num, pg_shift, pg_sz, total_size; 
+       struct rte_mempool *mp = NULL;
+       phys_addr_t *pa;
+       char *va;
+       size_t sz;
+       uint32_t pg_num, pg_shift, pg_sz, total_size;

        const struct rte_memzone *mz;
        char mz_name[RTE_MEMZONE_NAMESIZE];
        int mz_flags = RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY;
        const struct rte_memzone *mz;
        char mz_name[RTE_MEMZONE_NAMESIZE];
        int mz_flags = RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY;

-    
-       pg_sz = RTE_PGSIZE_2M; 
-    
-       pg_shift = rte_bsf32(pg_sz); 
-       total_size = rte_mempool_calc_obj_size(elt_size, flags, NULL); 
-    
-       /* calc max memory size and max number of pages needed. */ 
-       sz = rte_mempool_xmem_size(elt_num, total_size, pg_shift) + 
+
+       pg_sz = RTE_PGSIZE_2M;
+
+       pg_shift = rte_bsf32(pg_sz);
+       total_size = rte_mempool_calc_obj_size(elt_size, flags, NULL);
+
+       /* calc max memory size and max number of pages needed. */
+       sz = rte_mempool_xmem_size(elt_num, total_size, pg_shift) +

                RTE_PGSIZE_2M;
        pg_num = sz >> pg_shift;
 
                RTE_PGSIZE_2M;
        pg_num = sz >> pg_shift;
 

-       /* extract physical mappings of the allocated memory. */    
-       pa = calloc(pg_num, sizeof (*pa));      
+       /* extract physical mappings of the allocated memory. */
+       pa = calloc(pg_num, sizeof (*pa));

        if (pa == NULL)
                return mp;
        if (pa == NULL)
                return mp;

-       
+

        rte_snprintf(mz_name, sizeof(mz_name), RTE_MEMPOOL_OBJ_NAME, name);
        mz = rte_memzone_reserve(mz_name, sz, socket_id, mz_flags);
        if (mz == NULL) {
        rte_snprintf(mz_name, sizeof(mz_name), RTE_MEMPOOL_OBJ_NAME, name);
        mz = rte_memzone_reserve(mz_name, sz, socket_id, mz_flags);
        if (mz == NULL) {


@@ -119,16 +119,16 @@ rte_dom0_mempool_create(const char *name, unsigned elt_num, unsigned elt_size,
        }
 
        va = (char *)RTE_ALIGN_CEIL((uintptr_t)mz->addr, RTE_PGSIZE_2M);
        }
 
        va = (char *)RTE_ALIGN_CEIL((uintptr_t)mz->addr, RTE_PGSIZE_2M);

-       /* extract physical mappings of the allocated memory. */ 
+       /* extract physical mappings of the allocated memory. */

        get_phys_map(va, pa, pg_num, pg_sz, mz->memseg_id);
 
        get_phys_map(va, pa, pg_num, pg_sz, mz->memseg_id);
 

-       mp = rte_mempool_xmem_create(name, elt_num, elt_size, 
-               cache_size, private_data_size, 
-               mp_init, mp_init_arg, 
-               obj_init, obj_init_arg, 
-               socket_id, flags, va, pa, pg_num, pg_shift); 
-   
+       mp = rte_mempool_xmem_create(name, elt_num, elt_size,
+               cache_size, private_data_size,
+               mp_init, mp_init_arg,
+               obj_init, obj_init_arg,
+               socket_id, flags, va, pa, pg_num, pg_shift);
+

        free(pa);
        free(pa);

-  
-       return (mp); 
+
+       return (mp);

 }
 }

diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index 9a297e6..7eebf7f 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -434,9 +434,9 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
        if (RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL,
                        rte_mempool_list) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
        if (RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL,
                        rte_mempool_list) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;

-               return NULL;    
+               return NULL;

        }
        }

-       
+

        /* asked cache too big */
        if (cache_size > RTE_MEMPOOL_CACHE_MAX_SIZE) {
                rte_errno = EINVAL;
        /* asked cache too big */
        if (cache_size > RTE_MEMPOOL_CACHE_MAX_SIZE) {
                rte_errno = EINVAL;


@@ -502,14 +502,14 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
        }
 
        /*
        }
 
        /*

-        * If user provided an external memory buffer, then use it to
-        * store mempool objects. Otherwise reserve memzone big enough to
-        * hold mempool header and metadata plus mempool objects.
-        */
+        * If user provided an external memory buffer, then use it to
+        * store mempool objects. Otherwise reserve memzone big enough to
+        * hold mempool header and metadata plus mempool objects.
+        */

        mempool_size = MEMPOOL_HEADER_SIZE(mp, pg_num) + private_data_size;
        if (vaddr == NULL)
                mempool_size += (size_t)objsz.total_size * n;
        mempool_size = MEMPOOL_HEADER_SIZE(mp, pg_num) + private_data_size;
        if (vaddr == NULL)
                mempool_size += (size_t)objsz.total_size * n;

-                       
+

        if (! rte_eal_has_hugepages()) {
                /*
                 * we want the memory pool to start on a page boundary,
        if (! rte_eal_has_hugepages()) {
                /*
                 * we want the memory pool to start on a page boundary,


@@ -696,7 +696,7 @@ mempool_audit_cookies(const struct rte_mempool *mp)
        } else if (arg.obj_end != mp->elt_va_end || arg.obj_num != mp->size) {
                        rte_panic("rte_mempool_obj_iter(mempool=%p, size=%u) "
                        "last callback va_end: %#tx (%#tx expeceted), "
        } else if (arg.obj_end != mp->elt_va_end || arg.obj_num != mp->size) {
                        rte_panic("rte_mempool_obj_iter(mempool=%p, size=%u) "
                        "last callback va_end: %#tx (%#tx expeceted), "

-                       "num of objects: %u (%u expected)\n", 
+                       "num of objects: %u (%u expected)\n",

                        mp, mp->size,
                        arg.obj_end, mp->elt_va_end,
                        arg.obj_num, mp->size);
                        mp, mp->size,
                        arg.obj_end, mp->elt_va_end,
                        arg.obj_num, mp->size);


@@ -814,10 +814,10 @@ rte_mempool_list_dump(FILE *f)
        const struct rte_mempool *mp = NULL;
        struct rte_mempool_list *mempool_list;
 
        const struct rte_mempool *mp = NULL;
        struct rte_mempool_list *mempool_list;
 

-       if ((mempool_list = 
+       if ((mempool_list =

             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL, rte_mempool_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL, rte_mempool_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;

-               return; 
+               return;

        }
 
        rte_rwlock_read_lock(RTE_EAL_MEMPOOL_RWLOCK);
        }
 
        rte_rwlock_read_lock(RTE_EAL_MEMPOOL_RWLOCK);


@@ -836,7 +836,7 @@ rte_mempool_lookup(const char *name)
        struct rte_mempool *mp = NULL;
        struct rte_mempool_list *mempool_list;
 
        struct rte_mempool *mp = NULL;
        struct rte_mempool_list *mempool_list;
 

-       if ((mempool_list = 
+       if ((mempool_list =

             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL, rte_mempool_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
                return NULL;
             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL, rte_mempool_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
                return NULL;


@@ -848,9 +848,9 @@ rte_mempool_lookup(const char *name)
                if (strncmp(name, mp->name, RTE_MEMPOOL_NAMESIZE) == 0)
                        break;
        }
                if (strncmp(name, mp->name, RTE_MEMPOOL_NAMESIZE) == 0)
                        break;
        }

-       
+

        rte_rwlock_read_unlock(RTE_EAL_MEMPOOL_RWLOCK);
        rte_rwlock_read_unlock(RTE_EAL_MEMPOOL_RWLOCK);

-       
+

        if (mp == NULL)
                rte_errno = ENOENT;
 
        if (mp == NULL)
                rte_errno = ENOENT;
 

diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 3fe5692..e5a0b13 100644 (file)
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -213,7 +213,7 @@ struct rte_mempool {
  * Calculates size of the mempool header.
  * @param mp
  *   Pointer to the memory pool.
  * Calculates size of the mempool header.
  * @param mp
  *   Pointer to the memory pool.

- * @param pgn 
+ * @param pgn

  *   Number of page used to store mempool objects.
  */
 #define        MEMPOOL_HEADER_SIZE(mp, pgn)    (sizeof(*(mp)) + \
  *   Number of page used to store mempool objects.
  */
 #define        MEMPOOL_HEADER_SIZE(mp, pgn)    (sizeof(*(mp)) + \

diff --git a/lib/librte_meter/Makefile b/lib/librte_meter/Makefile
index 08740f5..b25c0cc 100644 (file)
--- a/lib/librte_meter/Makefile
+++ b/lib/librte_meter/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_meter/rte_meter.c b/lib/librte_meter/rte_meter.c
index 94a7b40..5e2dadb 100644 (file)
--- a/lib/librte_meter/rte_meter.c
+++ b/lib/librte_meter/rte_meter.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -49,7 +49,7 @@ static void
 rte_meter_get_tb_params(uint64_t hz, uint64_t rate, uint64_t *tb_period, uint64_t *tb_bytes_per_period)
 {
        double period = ((double) hz) / ((double) rate);
 rte_meter_get_tb_params(uint64_t hz, uint64_t rate, uint64_t *tb_period, uint64_t *tb_bytes_per_period)
 {
        double period = ((double) hz) / ((double) rate);

-       
+

        if (period >= RTE_METER_TB_PERIOD_MIN) {
                *tb_bytes_per_period = 1;
                *tb_period = (uint64_t) period;
        if (period >= RTE_METER_TB_PERIOD_MIN) {
                *tb_bytes_per_period = 1;
                *tb_period = (uint64_t) period;


@@ -63,27 +63,27 @@ int
 rte_meter_srtcm_config(struct rte_meter_srtcm *m, struct rte_meter_srtcm_params *params)
 {
        uint64_t hz;
 rte_meter_srtcm_config(struct rte_meter_srtcm *m, struct rte_meter_srtcm_params *params)
 {
        uint64_t hz;

-       
+

        /* Check input parameters */
        if ((m == NULL) || (params == NULL)) {
                return -1;
        }
        /* Check input parameters */
        if ((m == NULL) || (params == NULL)) {
                return -1;
        }

-               
+

        if ((params->cir == 0) || ((params->cbs == 0) && (params->ebs == 0))) {
                return -2;
        }
        if ((params->cir == 0) || ((params->cbs == 0) && (params->ebs == 0))) {
                return -2;
        }

-       
+

        /* Initialize srTCM run-time structure */
        hz = rte_get_tsc_hz();
        m->time = rte_get_tsc_cycles();
        m->tc = m->cbs = params->cbs;
        m->te = m->ebs = params->ebs;
        rte_meter_get_tb_params(hz, params->cir, &m->cir_period, &m->cir_bytes_per_period);
        /* Initialize srTCM run-time structure */
        hz = rte_get_tsc_hz();
        m->time = rte_get_tsc_cycles();
        m->tc = m->cbs = params->cbs;
        m->te = m->ebs = params->ebs;
        rte_meter_get_tb_params(hz, params->cir, &m->cir_period, &m->cir_bytes_per_period);

-       
+

        RTE_LOG(INFO, METER, "Low level srTCM config: \n"
                "\tCIR period = %" PRIu64 ", CIR bytes per period = %" PRIu64 "\n",
                m->cir_period, m->cir_bytes_per_period);
        RTE_LOG(INFO, METER, "Low level srTCM config: \n"
                "\tCIR period = %" PRIu64 ", CIR bytes per period = %" PRIu64 "\n",
                m->cir_period, m->cir_bytes_per_period);

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -91,17 +91,17 @@ int
 rte_meter_trtcm_config(struct rte_meter_trtcm *m, struct rte_meter_trtcm_params *params)
 {
        uint64_t hz;
 rte_meter_trtcm_config(struct rte_meter_trtcm *m, struct rte_meter_trtcm_params *params)
 {
        uint64_t hz;

-       
+

        /* Check input parameters */
        if ((m == NULL) || (params == NULL)) {
                return -1;
        }
        /* Check input parameters */
        if ((m == NULL) || (params == NULL)) {
                return -1;
        }

-       
+

        if ((params->cir == 0) || (params->pir == 0) || (params->pir < params->cir) ||
                (params->cbs == 0) || (params->pbs == 0)) {
                return -2;
        }
        if ((params->cir == 0) || (params->pir == 0) || (params->pir < params->cir) ||
                (params->cbs == 0) || (params->pbs == 0)) {
                return -2;
        }

-               
+

        /* Initialize trTCM run-time structure */
        hz = rte_get_tsc_hz();
        m->time_tc = m->time_tp = rte_get_tsc_cycles();
        /* Initialize trTCM run-time structure */
        hz = rte_get_tsc_hz();
        m->time_tc = m->time_tp = rte_get_tsc_cycles();


@@ -109,12 +109,12 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, struct rte_meter_trtcm_params
        m->tp = m->pbs = params->pbs;
        rte_meter_get_tb_params(hz, params->cir, &m->cir_period, &m->cir_bytes_per_period);
        rte_meter_get_tb_params(hz, params->pir, &m->pir_period, &m->pir_bytes_per_period);
        m->tp = m->pbs = params->pbs;
        rte_meter_get_tb_params(hz, params->cir, &m->cir_period, &m->cir_bytes_per_period);
        rte_meter_get_tb_params(hz, params->pir, &m->pir_period, &m->pir_bytes_per_period);

-       
+

        RTE_LOG(INFO, METER, "Low level trTCM config: \n"
                "\tCIR period = %" PRIu64 ", CIR bytes per period = %" PRIu64 "\n"
                "\tPIR period = %" PRIu64 ", PIR bytes per period = %" PRIu64 "\n",
                m->cir_period, m->cir_bytes_per_period,
                m->pir_period, m->pir_bytes_per_period);
        RTE_LOG(INFO, METER, "Low level trTCM config: \n"
                "\tCIR period = %" PRIu64 ", CIR bytes per period = %" PRIu64 "\n"
                "\tPIR period = %" PRIu64 ", PIR bytes per period = %" PRIu64 "\n",
                m->cir_period, m->cir_bytes_per_period,
                m->pir_period, m->pir_bytes_per_period);

-       
+

        return 0;
 }
        return 0;
 }

diff --git a/lib/librte_meter/rte_meter.h b/lib/librte_meter/rte_meter.h
index 0abe293..92728a5 100644 (file)
--- a/lib/librte_meter/rte_meter.h
+++ b/lib/librte_meter/rte_meter.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -150,7 +150,7 @@ rte_meter_srtcm_color_blind_check(struct rte_meter_srtcm *m,
 static inline enum rte_meter_color
 rte_meter_srtcm_color_aware_check(struct rte_meter_srtcm *m,
        uint64_t time,
 static inline enum rte_meter_color
 rte_meter_srtcm_color_aware_check(struct rte_meter_srtcm *m,
        uint64_t time,

-       uint32_t pkt_len, 
+       uint32_t pkt_len,

        enum rte_meter_color pkt_color);
 
 /**
        enum rte_meter_color pkt_color);
 
 /**


@@ -194,7 +194,7 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m,
  * Inline implementation of run-time methods
  *
  ***/
  * Inline implementation of run-time methods
  *
  ***/

- 
+

 /* Internal data structure storing the srTCM run-time context per metered traffic flow. */
 struct rte_meter_srtcm {
        uint64_t time; /* Time of latest update of C and E token buckets */
 /* Internal data structure storing the srTCM run-time context per metered traffic flow. */
 struct rte_meter_srtcm {
        uint64_t time; /* Time of latest update of C and E token buckets */


@@ -221,38 +221,38 @@ struct rte_meter_trtcm {
 };
 
 static inline enum rte_meter_color
 };
 
 static inline enum rte_meter_color

-rte_meter_srtcm_color_blind_check(struct rte_meter_srtcm *m, 
+rte_meter_srtcm_color_blind_check(struct rte_meter_srtcm *m,

        uint64_t time,
        uint32_t pkt_len)
 {
        uint64_t time_diff, n_periods, tc, te;
        uint64_t time,
        uint32_t pkt_len)
 {
        uint64_t time_diff, n_periods, tc, te;

-       
+

        /* Bucket update */
        time_diff = time - m->time;
        n_periods = time_diff / m->cir_period;
        m->time += n_periods * m->cir_period;
        /* Bucket update */
        time_diff = time - m->time;
        n_periods = time_diff / m->cir_period;
        m->time += n_periods * m->cir_period;

-       
+

        tc = m->tc + n_periods * m->cir_bytes_per_period;
        if (tc > m->cbs)
                tc = m->cbs;
        tc = m->tc + n_periods * m->cir_bytes_per_period;
        if (tc > m->cbs)
                tc = m->cbs;

-       
+

        te = m->te + n_periods * m->cir_bytes_per_period;
        if (te > m->ebs)
                te = m->ebs;
        te = m->te + n_periods * m->cir_bytes_per_period;
        if (te > m->ebs)
                te = m->ebs;

-       
+

        /* Color logic */
        if (tc >= pkt_len) {
                m->tc = tc - pkt_len;
                m->te = te;
                return e_RTE_METER_GREEN;
        }
        /* Color logic */
        if (tc >= pkt_len) {
                m->tc = tc - pkt_len;
                m->te = te;
                return e_RTE_METER_GREEN;
        }

-       
+

        if (te >= pkt_len) {
                m->tc = tc;
                m->te = te - pkt_len;
                return e_RTE_METER_YELLOW;
        }
        if (te >= pkt_len) {
                m->tc = tc;
                m->te = te - pkt_len;
                return e_RTE_METER_YELLOW;
        }

-       
+

        m->tc = tc;
        m->te = te;
        return e_RTE_METER_RED;
        m->tc = tc;
        m->te = te;
        return e_RTE_METER_RED;


@@ -261,37 +261,37 @@ rte_meter_srtcm_color_blind_check(struct rte_meter_srtcm *m,
 static inline enum rte_meter_color
 rte_meter_srtcm_color_aware_check(struct rte_meter_srtcm *m,
        uint64_t time,
 static inline enum rte_meter_color
 rte_meter_srtcm_color_aware_check(struct rte_meter_srtcm *m,
        uint64_t time,

-       uint32_t pkt_len, 
+       uint32_t pkt_len,

        enum rte_meter_color pkt_color)
 {
        uint64_t time_diff, n_periods, tc, te;
        enum rte_meter_color pkt_color)
 {
        uint64_t time_diff, n_periods, tc, te;

-       
+

        /* Bucket update */
        time_diff = time - m->time;
        n_periods = time_diff / m->cir_period;
        m->time += n_periods * m->cir_period;
        /* Bucket update */
        time_diff = time - m->time;
        n_periods = time_diff / m->cir_period;
        m->time += n_periods * m->cir_period;

-       
+

        tc = m->tc + n_periods * m->cir_bytes_per_period;
        if (tc > m->cbs)
                tc = m->cbs;
        tc = m->tc + n_periods * m->cir_bytes_per_period;
        if (tc > m->cbs)
                tc = m->cbs;

-       
+

        te = m->te + n_periods * m->cir_bytes_per_period;
        if (te > m->ebs)
                te = m->ebs;
        te = m->te + n_periods * m->cir_bytes_per_period;
        if (te > m->ebs)
                te = m->ebs;

-       
+

        /* Color logic */
        if ((pkt_color == e_RTE_METER_GREEN) && (tc >= pkt_len)) {
                m->tc = tc - pkt_len;
                m->te = te;
                return e_RTE_METER_GREEN;
        }
        /* Color logic */
        if ((pkt_color == e_RTE_METER_GREEN) && (tc >= pkt_len)) {
                m->tc = tc - pkt_len;
                m->te = te;
                return e_RTE_METER_GREEN;
        }

-       
+

        if ((pkt_color != e_RTE_METER_RED) && (te >= pkt_len)) {
                m->tc = tc;
                m->te = te - pkt_len;
                return e_RTE_METER_YELLOW;
        }
        if ((pkt_color != e_RTE_METER_RED) && (te >= pkt_len)) {
                m->tc = tc;
                m->te = te - pkt_len;
                return e_RTE_METER_YELLOW;
        }

-       
+

        m->tc = tc;
        m->te = te;
        return e_RTE_METER_RED;
        m->tc = tc;
        m->te = te;
        return e_RTE_METER_RED;


@@ -303,7 +303,7 @@ rte_meter_trtcm_color_blind_check(struct rte_meter_trtcm *m,
        uint32_t pkt_len)
 {
        uint64_t time_diff_tc, time_diff_tp, n_periods_tc, n_periods_tp, tc, tp;
        uint32_t pkt_len)
 {
        uint64_t time_diff_tc, time_diff_tp, n_periods_tc, n_periods_tp, tc, tp;

-       
+

        /* Bucket update */
        time_diff_tc = time - m->time_tc;
        time_diff_tp = time - m->time_tp;
        /* Bucket update */
        time_diff_tc = time - m->time_tc;
        time_diff_tp = time - m->time_tp;


@@ -311,28 +311,28 @@ rte_meter_trtcm_color_blind_check(struct rte_meter_trtcm *m,
        n_periods_tp = time_diff_tp / m->pir_period;
        m->time_tc += n_periods_tc * m->cir_period;
        m->time_tp += n_periods_tp * m->pir_period;
        n_periods_tp = time_diff_tp / m->pir_period;
        m->time_tc += n_periods_tc * m->cir_period;
        m->time_tp += n_periods_tp * m->pir_period;

-       
+

        tc = m->tc + n_periods_tc * m->cir_bytes_per_period;
        if (tc > m->cbs)
                tc = m->cbs;
        tc = m->tc + n_periods_tc * m->cir_bytes_per_period;
        if (tc > m->cbs)
                tc = m->cbs;

-               
+

        tp = m->tp + n_periods_tp * m->pir_bytes_per_period;
        if (tp > m->pbs)
                tp = m->pbs;
        tp = m->tp + n_periods_tp * m->pir_bytes_per_period;
        if (tp > m->pbs)
                tp = m->pbs;

-       
+

        /* Color logic */
        if (tp < pkt_len) {
                m->tc = tc;
                m->tp = tp;
                return e_RTE_METER_RED;
        }
        /* Color logic */
        if (tp < pkt_len) {
                m->tc = tc;
                m->tp = tp;
                return e_RTE_METER_RED;
        }

-       
+

        if (tc < pkt_len) {
                m->tc = tc;
                m->tp = tp - pkt_len;
                return e_RTE_METER_YELLOW;
        }
        if (tc < pkt_len) {
                m->tc = tc;
                m->tp = tp - pkt_len;
                return e_RTE_METER_YELLOW;
        }

-       
+

        m->tc = tc - pkt_len;
        m->tp = tp - pkt_len;
        return e_RTE_METER_GREEN;
        m->tc = tc - pkt_len;
        m->tp = tp - pkt_len;
        return e_RTE_METER_GREEN;


@@ -341,11 +341,11 @@ rte_meter_trtcm_color_blind_check(struct rte_meter_trtcm *m,
 static inline enum rte_meter_color
 rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m,
        uint64_t time,
 static inline enum rte_meter_color
 rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m,
        uint64_t time,

-       uint32_t pkt_len, 
+       uint32_t pkt_len,

        enum rte_meter_color pkt_color)
 {
        uint64_t time_diff_tc, time_diff_tp, n_periods_tc, n_periods_tp, tc, tp;
        enum rte_meter_color pkt_color)
 {
        uint64_t time_diff_tc, time_diff_tp, n_periods_tc, n_periods_tp, tc, tp;

-       
+

        /* Bucket update */
        time_diff_tc = time - m->time_tc;
        time_diff_tp = time - m->time_tp;
        /* Bucket update */
        time_diff_tc = time - m->time_tc;
        time_diff_tp = time - m->time_tp;


@@ -353,28 +353,28 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m,
        n_periods_tp = time_diff_tp / m->pir_period;
        m->time_tc += n_periods_tc * m->cir_period;
        m->time_tp += n_periods_tp * m->pir_period;
        n_periods_tp = time_diff_tp / m->pir_period;
        m->time_tc += n_periods_tc * m->cir_period;
        m->time_tp += n_periods_tp * m->pir_period;

-       
+

        tc = m->tc + n_periods_tc * m->cir_bytes_per_period;
        if (tc > m->cbs)
                tc = m->cbs;
        tc = m->tc + n_periods_tc * m->cir_bytes_per_period;
        if (tc > m->cbs)
                tc = m->cbs;

-               
+

        tp = m->tp + n_periods_tp * m->pir_bytes_per_period;
        if (tp > m->pbs)
                tp = m->pbs;
        tp = m->tp + n_periods_tp * m->pir_bytes_per_period;
        if (tp > m->pbs)
                tp = m->pbs;

-       
+

        /* Color logic */
        if ((pkt_color == e_RTE_METER_RED) || (tp < pkt_len)) {
                m->tc = tc;
                m->tp = tp;
                return e_RTE_METER_RED;
        }
        /* Color logic */
        if ((pkt_color == e_RTE_METER_RED) || (tp < pkt_len)) {
                m->tc = tc;
                m->tp = tp;
                return e_RTE_METER_RED;
        }

-       
+

        if ((pkt_color == e_RTE_METER_YELLOW) || (tc < pkt_len)) {
                m->tc = tc;
                m->tp = tp - pkt_len;
                return e_RTE_METER_YELLOW;
        }
        if ((pkt_color == e_RTE_METER_YELLOW) || (tc < pkt_len)) {
                m->tc = tc;
                m->tp = tp - pkt_len;
                return e_RTE_METER_YELLOW;
        }

-       
+

        m->tc = tc - pkt_len;
        m->tp = tp - pkt_len;
        return e_RTE_METER_GREEN;
        m->tc = tc - pkt_len;
        m->tp = tp - pkt_len;
        return e_RTE_METER_GREEN;

diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile
index a59a4fb..ad2e482 100644 (file)
--- a/lib/librte_net/Makefile
+++ b/lib/librte_net/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 331a01d..e3f65c1 100644 (file)
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_net/rte_sctp.h b/lib/librte_net/rte_sctp.h
index 655de63..688e126 100644 (file)
--- a/lib/librte_net/rte_sctp.h
+++ b/lib/librte_net/rte_sctp.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_net/rte_tcp.h b/lib/librte_net/rte_tcp.h
index 813e029..28b61e6 100644 (file)
--- a/lib/librte_net/rte_tcp.h
+++ b/lib/librte_net/rte_tcp.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_net/rte_udp.h b/lib/librte_net/rte_udp.h
index 78f0cd0..bc5be4a 100644 (file)
--- a/lib/librte_net/rte_udp.h
+++ b/lib/librte_net/rte_udp.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_e1000/Makefile b/lib/librte_pmd_e1000/Makefile
index 76b3c66..3d4e7e5 100644 (file)
--- a/lib/librte_pmd_e1000/Makefile
+++ b/lib/librte_pmd_e1000/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_pmd_e1000/e1000_ethdev.h b/lib/librte_pmd_e1000/e1000_ethdev.h
index 8790601..a287f40 100644 (file)
--- a/lib/librte_pmd_e1000/e1000_ethdev.h
+++ b/lib/librte_pmd_e1000/e1000_ethdev.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -116,7 +116,7 @@ int eth_igb_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
                const struct rte_eth_rxconf *rx_conf,
                struct rte_mempool *mb_pool);
 
                const struct rte_eth_rxconf *rx_conf,
                struct rte_mempool *mb_pool);
 

-uint32_t eth_igb_rx_queue_count(struct rte_eth_dev *dev, 
+uint32_t eth_igb_rx_queue_count(struct rte_eth_dev *dev,

                uint16_t rx_queue_id);
 
 int eth_igb_rx_descriptor_done(void *rx_queue, uint16_t offset);
                uint16_t rx_queue_id);
 
 int eth_igb_rx_descriptor_done(void *rx_queue, uint16_t offset);


@@ -152,9 +152,9 @@ void eth_igbvf_tx_init(struct rte_eth_dev *dev);
  * misc function prototypes
  */
 void igb_pf_host_init(struct rte_eth_dev *eth_dev);
  * misc function prototypes
  */
 void igb_pf_host_init(struct rte_eth_dev *eth_dev);

- 
+

 void igb_pf_mbx_process(struct rte_eth_dev *eth_dev);
 void igb_pf_mbx_process(struct rte_eth_dev *eth_dev);

- 
+

 int igb_pf_host_configure(struct rte_eth_dev *eth_dev);
 
 /*
 int igb_pf_host_configure(struct rte_eth_dev *eth_dev);
 
 /*


@@ -170,7 +170,7 @@ int eth_em_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
                const struct rte_eth_rxconf *rx_conf,
                struct rte_mempool *mb_pool);
 
                const struct rte_eth_rxconf *rx_conf,
                struct rte_mempool *mb_pool);
 

-uint32_t eth_em_rx_queue_count(struct rte_eth_dev *dev, 
+uint32_t eth_em_rx_queue_count(struct rte_eth_dev *dev,

                uint16_t rx_queue_id);
 
 int eth_em_rx_descriptor_done(void *rx_queue, uint16_t offset);
                uint16_t rx_queue_id);
 
 int eth_em_rx_descriptor_done(void *rx_queue, uint16_t offset);

diff --git a/lib/librte_pmd_e1000/e1000_logs.h b/lib/librte_pmd_e1000/e1000_logs.h
index 883705d..b6b3bb7 100644 (file)
--- a/lib/librte_pmd_e1000/e1000_logs.h
+++ b/lib/librte_pmd_e1000/e1000_logs.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_e1000/em_ethdev.c b/lib/librte_pmd_e1000/em_ethdev.c
index 493806c..398838f 100644 (file)
--- a/lib/librte_pmd_e1000/em_ethdev.c
+++ b/lib/librte_pmd_e1000/em_ethdev.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -1182,7 +1182,7 @@ eth_em_vlan_offload_set(struct rte_eth_dev *dev, int mask)
                else
                        em_vlan_hw_strip_disable(dev);
        }
                else
                        em_vlan_hw_strip_disable(dev);
        }

-       
+

        if(mask & ETH_VLAN_FILTER_MASK){
                if (dev->data->dev_conf.rxmode.hw_vlan_filter)
                        em_vlan_hw_filter_enable(dev);
        if(mask & ETH_VLAN_FILTER_MASK){
                if (dev->data->dev_conf.rxmode.hw_vlan_filter)
                        em_vlan_hw_filter_enable(dev);

diff --git a/lib/librte_pmd_e1000/em_rxtx.c b/lib/librte_pmd_e1000/em_rxtx.c
index 4f98a3f..9707d6d 100644 (file)
--- a/lib/librte_pmd_e1000/em_rxtx.c
+++ b/lib/librte_pmd_e1000/em_rxtx.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -1100,7 +1100,7 @@ ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,
        if ((mz = rte_memzone_lookup(z_name)) != 0)
                return (mz);
 
        if ((mz = rte_memzone_lookup(z_name)) != 0)
                return (mz);
 

-#ifdef RTE_LIBRTE_XEN_DOM0 
+#ifdef RTE_LIBRTE_XEN_DOM0

        return rte_memzone_reserve_bounded(z_name, ring_size,
                        socket_id, 0, CACHE_LINE_SIZE, RTE_PGSIZE_2M);
 #else
        return rte_memzone_reserve_bounded(z_name, ring_size,
                        socket_id, 0, CACHE_LINE_SIZE, RTE_PGSIZE_2M);
 #else


@@ -1281,7 +1281,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,
        txq->tdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_TDT(queue_idx));
 #ifndef RTE_LIBRTE_XEN_DOM0
        txq->tx_ring_phys_addr = (uint64_t) tz->phys_addr;
        txq->tdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_TDT(queue_idx));
 #ifndef RTE_LIBRTE_XEN_DOM0
        txq->tx_ring_phys_addr = (uint64_t) tz->phys_addr;

-#else   
+#else

        txq->tx_ring_phys_addr = rte_mem_phy2mch(tz->memseg_id, tz->phys_addr);
 #endif
        txq->tx_ring = (struct e1000_data_desc *) tz->addr;
        txq->tx_ring_phys_addr = rte_mem_phy2mch(tz->memseg_id, tz->phys_addr);
 #endif
        txq->tx_ring = (struct e1000_data_desc *) tz->addr;


@@ -1408,11 +1408,11 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,
 
        rxq->rdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDT(queue_idx));
        rxq->rdh_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDH(queue_idx));
 
        rxq->rdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDT(queue_idx));
        rxq->rdh_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDH(queue_idx));

-#ifndef RTE_LIBRTE_XEN_DOM0    
+#ifndef RTE_LIBRTE_XEN_DOM0

        rxq->rx_ring_phys_addr = (uint64_t) rz->phys_addr;
 #else
        rxq->rx_ring_phys_addr = (uint64_t) rz->phys_addr;
 #else

-       rxq->rx_ring_phys_addr = rte_mem_phy2mch(rz->memseg_id, rz->phys_addr); 
-#endif 
+       rxq->rx_ring_phys_addr = rte_mem_phy2mch(rz->memseg_id, rz->phys_addr);
+#endif

        rxq->rx_ring = (struct e1000_rx_desc *) rz->addr;
 
        PMD_INIT_LOG(DEBUG, "sw_ring=%p hw_ring=%p dma_addr=0x%"PRIx64"\n",
        rxq->rx_ring = (struct e1000_rx_desc *) rz->addr;
 
        PMD_INIT_LOG(DEBUG, "sw_ring=%p hw_ring=%p dma_addr=0x%"PRIx64"\n",


@@ -1424,7 +1424,7 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,
        return (0);
 }
 
        return (0);
 }
 

-uint32_t 
+uint32_t

 eth_em_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 {
 #define EM_RXQ_SCAN_INTERVAL 4
 eth_em_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 {
 #define EM_RXQ_SCAN_INTERVAL 4

diff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/lib/librte_pmd_e1000/igb_ethdev.c
index 5f93bcf..6e835c3 100644 (file)
--- a/lib/librte_pmd_e1000/igb_ethdev.c
+++ b/lib/librte_pmd_e1000/igb_ethdev.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -115,7 +115,7 @@ static void igbvf_dev_close(struct rte_eth_dev *dev);
 static int eth_igbvf_link_update(struct e1000_hw *hw);
 static void eth_igbvf_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats);
 static void eth_igbvf_stats_reset(struct rte_eth_dev *dev);
 static int eth_igbvf_link_update(struct e1000_hw *hw);
 static void eth_igbvf_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats);
 static void eth_igbvf_stats_reset(struct rte_eth_dev *dev);

-static int igbvf_vlan_filter_set(struct rte_eth_dev *dev, 
+static int igbvf_vlan_filter_set(struct rte_eth_dev *dev,

                uint16_t vlan_id, int on);
 static int igbvf_set_vfta(struct e1000_hw *hw, uint16_t vid, bool on);
 static void igbvf_set_vfta_all(struct rte_eth_dev *dev, bool on);
                uint16_t vlan_id, int on);
 static int igbvf_set_vfta(struct e1000_hw *hw, uint16_t vid, bool on);
 static void igbvf_set_vfta_all(struct rte_eth_dev *dev, bool on);


@@ -277,7 +277,7 @@ igb_intr_enable(struct rte_eth_dev *dev)
                E1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
        struct e1000_hw *hw =
                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
                E1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
        struct e1000_hw *hw =
                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

- 
+

        E1000_WRITE_REG(hw, E1000_IMS, intr->mask);
        E1000_WRITE_FLUSH(hw);
 }
        E1000_WRITE_REG(hw, E1000_IMS, intr->mask);
        E1000_WRITE_FLUSH(hw);
 }


@@ -294,18 +294,18 @@ igb_pf_reset_hw(struct e1000_hw *hw)
 {
        uint32_t ctrl_ext;
        int32_t status;
 {
        uint32_t ctrl_ext;
        int32_t status;

- 
+

        status = e1000_reset_hw(hw);
        status = e1000_reset_hw(hw);

- 
+

        ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
        /* Set PF Reset Done bit so PF/VF Mail Ops can work */
        ctrl_ext |= E1000_CTRL_EXT_PFRSTD;
        E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
        E1000_WRITE_FLUSH(hw);
        ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
        /* Set PF Reset Done bit so PF/VF Mail Ops can work */
        ctrl_ext |= E1000_CTRL_EXT_PFRSTD;
        E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
        E1000_WRITE_FLUSH(hw);

- 
+

        return status;
 }
        return status;
 }

- 
+

 static void
 igb_identify_hardware(struct rte_eth_dev *dev)
 {
 static void
 igb_identify_hardware(struct rte_eth_dev *dev)
 {


@@ -498,7 +498,7 @@ eth_igb_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
 
        /* initialize PF if max_vfs not zero */
        igb_pf_host_init(eth_dev);
 
        /* initialize PF if max_vfs not zero */
        igb_pf_host_init(eth_dev);

- 
+

        ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
        /* Set PF Reset Done bit so PF/VF Mail Ops can work */
        ctrl_ext |= E1000_CTRL_EXT_PFRSTD;
        ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
        /* Set PF Reset Done bit so PF/VF Mail Ops can work */
        ctrl_ext |= E1000_CTRL_EXT_PFRSTD;


@@ -514,10 +514,10 @@ eth_igb_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
 
        /* enable uio intr after callback register */
        rte_intr_enable(&(pci_dev->intr_handle));
 
        /* enable uio intr after callback register */
        rte_intr_enable(&(pci_dev->intr_handle));

-        
+

        /* enable support intr */
        igb_intr_enable(eth_dev);
        /* enable support intr */
        igb_intr_enable(eth_dev);

-       
+

        return 0;
 
 err_late:
        return 0;
 
 err_late:


@@ -572,7 +572,7 @@ eth_igbvf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
 
        /* Disable the interrupts for VF */
        igbvf_intr_disable(hw);
 
        /* Disable the interrupts for VF */
        igbvf_intr_disable(hw);

-       
+

        diag = hw->mac.ops.reset_hw(hw);
 
        /* Allocate memory for storing MAC addresses */
        diag = hw->mac.ops.reset_hw(hw);
 
        /* Allocate memory for storing MAC addresses */


@@ -585,7 +585,7 @@ eth_igbvf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
                        ETHER_ADDR_LEN * hw->mac.rar_entry_count);
                return -ENOMEM;
        }
                        ETHER_ADDR_LEN * hw->mac.rar_entry_count);
                return -ENOMEM;
        }

-       
+

        /* Copy the permanent MAC address */
        ether_addr_copy((struct ether_addr *) hw->mac.perm_addr,
                        &eth_dev->data->mac_addrs[0]);
        /* Copy the permanent MAC address */
        ether_addr_copy((struct ether_addr *) hw->mac.perm_addr,
                        &eth_dev->data->mac_addrs[0]);


@@ -740,7 +740,7 @@ eth_igb_start(struct rte_eth_dev *dev)
                /* Enable VLAN filter since VMDq always use VLAN filter */
                igb_vmdq_vlan_hw_filter_enable(dev);
        }
                /* Enable VLAN filter since VMDq always use VLAN filter */
                igb_vmdq_vlan_hw_filter_enable(dev);
        }

-               
+

        /*
         * Configure the Interrupt Moderation register (EITR) with the maximum
         * possible value (0xFFFF) to minimize "System Partial Write" issued by
        /*
         * Configure the Interrupt Moderation register (EITR) with the maximum
         * possible value (0xFFFF) to minimize "System Partial Write" issued by


@@ -1607,14 +1607,14 @@ eth_igb_vlan_offload_set(struct rte_eth_dev *dev, int mask)
                else
                        igb_vlan_hw_strip_disable(dev);
        }
                else
                        igb_vlan_hw_strip_disable(dev);
        }

-       
+

        if(mask & ETH_VLAN_FILTER_MASK){
                if (dev->data->dev_conf.rxmode.hw_vlan_filter)
                        igb_vlan_hw_filter_enable(dev);
                else
                        igb_vlan_hw_filter_disable(dev);
        }
        if(mask & ETH_VLAN_FILTER_MASK){
                if (dev->data->dev_conf.rxmode.hw_vlan_filter)
                        igb_vlan_hw_filter_enable(dev);
                else
                        igb_vlan_hw_filter_disable(dev);
        }

-       
+

        if(mask & ETH_VLAN_EXTEND_MASK){
                if (dev->data->dev_conf.rxmode.hw_vlan_extend)
                        igb_vlan_hw_extend_enable(dev);
        if(mask & ETH_VLAN_EXTEND_MASK){
                if (dev->data->dev_conf.rxmode.hw_vlan_extend)
                        igb_vlan_hw_extend_enable(dev);


@@ -1675,7 +1675,7 @@ eth_igb_interrupt_get_status(struct rte_eth_dev *dev)
                intr->flags |= E1000_FLAG_NEED_LINK_UPDATE;
        }
 
                intr->flags |= E1000_FLAG_NEED_LINK_UPDATE;
        }
 

-       if (icr & E1000_ICR_VMMB) 
+       if (icr & E1000_ICR_VMMB)

                intr->flags |= E1000_FLAG_MAILBOX;
 
        return 0;
                intr->flags |= E1000_FLAG_MAILBOX;
 
        return 0;


@@ -1993,7 +1993,7 @@ igbvf_dev_configure(struct rte_eth_dev *dev)
 static int
 igbvf_dev_start(struct rte_eth_dev *dev)
 {
 static int
 igbvf_dev_start(struct rte_eth_dev *dev)
 {

-       struct e1000_hw *hw = 
+       struct e1000_hw *hw =

                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        int ret;
 
                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        int ret;
 


@@ -2003,7 +2003,7 @@ igbvf_dev_start(struct rte_eth_dev *dev)
 
        /* Set all vfta */
        igbvf_set_vfta_all(dev,1);
 
        /* Set all vfta */
        igbvf_set_vfta_all(dev,1);

-       
+

        eth_igbvf_tx_init(dev);
 
        /* This can fail when allocating mbufs for descriptor rings */
        eth_igbvf_tx_init(dev);
 
        /* This can fail when allocating mbufs for descriptor rings */


@@ -2023,9 +2023,9 @@ igbvf_dev_stop(struct rte_eth_dev *dev)
        PMD_INIT_LOG(DEBUG, "igbvf_dev_stop");
 
        igbvf_stop_adapter(dev);
        PMD_INIT_LOG(DEBUG, "igbvf_dev_stop");
 
        igbvf_stop_adapter(dev);

-       
-       /* 
-         * Clear what we set, but we still keep shadow_vfta to 
+
+       /*
+         * Clear what we set, but we still keep shadow_vfta to

          * restore after device starts
          */
        igbvf_set_vfta_all(dev,0);
          * restore after device starts
          */
        igbvf_set_vfta_all(dev,0);


@@ -2050,7 +2050,7 @@ static int igbvf_set_vfta(struct e1000_hw *hw, uint16_t vid, bool on)
        struct e1000_mbx_info *mbx = &hw->mbx;
        uint32_t msgbuf[2];
 
        struct e1000_mbx_info *mbx = &hw->mbx;
        uint32_t msgbuf[2];
 

-       /* After set vlan, vlan strip will also be enabled in igb driver*/ 
+       /* After set vlan, vlan strip will also be enabled in igb driver*/

        msgbuf[0] = E1000_VF_SET_VLAN;
        msgbuf[1] = vid;
        /* Setting the 8 bit field MSG INFO to TRUE indicates "add" */
        msgbuf[0] = E1000_VF_SET_VLAN;
        msgbuf[1] = vid;
        /* Setting the 8 bit field MSG INFO to TRUE indicates "add" */


@@ -2062,7 +2062,7 @@ static int igbvf_set_vfta(struct e1000_hw *hw, uint16_t vid, bool on)
 
 static void igbvf_set_vfta_all(struct rte_eth_dev *dev, bool on)
 {
 
 static void igbvf_set_vfta_all(struct rte_eth_dev *dev, bool on)
 {

-       struct e1000_hw *hw = 
+       struct e1000_hw *hw =

                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct e1000_vfta * shadow_vfta =
                E1000_DEV_PRIVATE_TO_VFTA(dev->data->dev_private);
                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct e1000_vfta * shadow_vfta =
                E1000_DEV_PRIVATE_TO_VFTA(dev->data->dev_private);


@@ -2086,14 +2086,14 @@ static void igbvf_set_vfta_all(struct rte_eth_dev *dev, bool on)
 static int
 igbvf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 {
 static int
 igbvf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 {

-       struct e1000_hw *hw = 
+       struct e1000_hw *hw =

                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct e1000_vfta * shadow_vfta =
                E1000_DEV_PRIVATE_TO_VFTA(dev->data->dev_private);
        uint32_t vid_idx = 0;
        uint32_t vid_bit = 0;
        int ret = 0;
                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct e1000_vfta * shadow_vfta =
                E1000_DEV_PRIVATE_TO_VFTA(dev->data->dev_private);
        uint32_t vid_idx = 0;
        uint32_t vid_bit = 0;
        int ret = 0;

-       
+

        PMD_INIT_LOG(DEBUG, "igbvf_vlan_filter_set");
 
        /*vind is not used in VF driver, set to 0, check ixgbe_set_vfta_vf*/
        PMD_INIT_LOG(DEBUG, "igbvf_vlan_filter_set");
 
        /*vind is not used in VF driver, set to 0, check ixgbe_set_vfta_vf*/


@@ -2119,16 +2119,16 @@ eth_igb_rss_reta_update(struct rte_eth_dev *dev,
                                 struct rte_eth_rss_reta *reta_conf)
 {
        uint8_t i,j,mask;
                                 struct rte_eth_rss_reta *reta_conf)
 {
        uint8_t i,j,mask;

-       uint32_t reta;  
+       uint32_t reta;

        struct e1000_hw *hw =
        struct e1000_hw *hw =

-                       E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); 
-       
-       /*    
-        * Update Redirection Table RETA[n],n=0...31,The redirection table has 
-        * 128-entries in 32 registers 
-        */ 
-       for(i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i += 4) {  
-               if (i < ETH_RSS_RETA_NUM_ENTRIES/2) 
+                       E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       /*
+        * Update Redirection Table RETA[n],n=0...31,The redirection table has
+        * 128-entries in 32 registers
+        */
+       for(i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i += 4) {
+               if (i < ETH_RSS_RETA_NUM_ENTRIES/2)

                        mask = (uint8_t)((reta_conf->mask_lo >> i) & 0xF);
                else
                        mask = (uint8_t)((reta_conf->mask_hi >>
                        mask = (uint8_t)((reta_conf->mask_lo >> i) & 0xF);
                else
                        mask = (uint8_t)((reta_conf->mask_hi >>


@@ -2136,7 +2136,7 @@ eth_igb_rss_reta_update(struct rte_eth_dev *dev,
                if (mask != 0) {
                        reta = 0;
                        /* If all 4 entries were set,don't need read RETA register */
                if (mask != 0) {
                        reta = 0;
                        /* If all 4 entries were set,don't need read RETA register */

-                       if (mask != 0xF)  
+                       if (mask != 0xF)

                                reta = E1000_READ_REG(hw,E1000_RETA(i >> 2));
 
                        for (j = 0; j < 4; j++) {
                                reta = E1000_READ_REG(hw,E1000_RETA(i >> 2));
 
                        for (j = 0; j < 4; j++) {


@@ -2159,11 +2159,11 @@ eth_igb_rss_reta_query(struct rte_eth_dev *dev,
 {
        uint8_t i,j,mask;
        uint32_t reta;
 {
        uint8_t i,j,mask;
        uint32_t reta;

-       struct e1000_hw *hw = 
+       struct e1000_hw *hw =

                        E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
                        E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 

-       /* 
-        * Read Redirection Table RETA[n],n=0...31,The redirection table has 
+       /*
+        * Read Redirection Table RETA[n],n=0...31,The redirection table has

         * 128-entries in 32 registers
         */
        for(i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i += 4) {
         * 128-entries in 32 registers
         */
        for(i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i += 4) {


@@ -2182,7 +2182,7 @@ eth_igb_rss_reta_query(struct rte_eth_dev *dev,
                        }
                }
        }
                        }
                }
        }

- 
+

        return 0;
 }
 
        return 0;
 }
 

diff --git a/lib/librte_pmd_e1000/igb_pf.c b/lib/librte_pmd_e1000/igb_pf.c
index d82091e..3d405f0 100644 (file)
--- a/lib/librte_pmd_e1000/igb_pf.c
+++ b/lib/librte_pmd_e1000/igb_pf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -60,18 +60,18 @@ dev_num_vf(struct rte_eth_dev *eth_dev)
        return eth_dev->pci_dev->max_vfs;
 }
 
        return eth_dev->pci_dev->max_vfs;
 }
 

-static inline 
+static inline

 int igb_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
 {
        unsigned char vf_mac_addr[ETHER_ADDR_LEN];
 int igb_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
 {
        unsigned char vf_mac_addr[ETHER_ADDR_LEN];

-       struct e1000_vf_info *vfinfo = 
+       struct e1000_vf_info *vfinfo =

                *E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
        uint16_t vfn;
 
        for (vfn = 0; vfn < vf_num; vfn++) {
                eth_random_addr(vf_mac_addr);
                /* keep the random address as default */
                *E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
        uint16_t vfn;
 
        for (vfn = 0; vfn < vf_num; vfn++) {
                eth_random_addr(vf_mac_addr);
                /* keep the random address as default */

-               memcpy(vfinfo[vfn].vf_mac_addresses, vf_mac_addr, 
+               memcpy(vfinfo[vfn].vf_mac_addresses, vf_mac_addr,

                                ETHER_ADDR_LEN);
        }
 
                                ETHER_ADDR_LEN);
        }
 


@@ -91,9 +91,9 @@ igb_mb_intr_setup(struct rte_eth_dev *dev)
 
 void igb_pf_host_init(struct rte_eth_dev *eth_dev)
 {
 
 void igb_pf_host_init(struct rte_eth_dev *eth_dev)
 {

-       struct e1000_vf_info **vfinfo = 
+       struct e1000_vf_info **vfinfo =

                E1000_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
                E1000_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);

-       struct e1000_hw *hw = 
+       struct e1000_hw *hw =

                E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        uint16_t vf_num;
        uint8_t nb_queue;
                E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        uint16_t vf_num;
        uint8_t nb_queue;


@@ -132,7 +132,7 @@ int igb_pf_host_configure(struct rte_eth_dev *eth_dev)
 {
        uint32_t vtctl;
        uint16_t vf_num;
 {
        uint32_t vtctl;
        uint16_t vf_num;

-       struct e1000_hw *hw = 
+       struct e1000_hw *hw =

                E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        uint32_t vlanctrl;
        int i;
                E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        uint32_t vlanctrl;
        int i;


@@ -144,7 +144,7 @@ int igb_pf_host_configure(struct rte_eth_dev *eth_dev)
        /* enable VMDq and set the default pool for PF */
        vtctl = E1000_READ_REG(hw, E1000_VT_CTL);
        vtctl &= ~E1000_VT_CTL_DEFAULT_POOL_MASK;
        /* enable VMDq and set the default pool for PF */
        vtctl = E1000_READ_REG(hw, E1000_VT_CTL);
        vtctl &= ~E1000_VT_CTL_DEFAULT_POOL_MASK;

-       vtctl |= RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx 
+       vtctl |= RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx

                << E1000_VT_CTL_DEFAULT_POOL_SHIFT;
        vtctl |= E1000_VT_CTL_VM_REPL_EN;
        E1000_WRITE_REG(hw, E1000_VT_CTL, vtctl);
                << E1000_VT_CTL_DEFAULT_POOL_SHIFT;
        vtctl |= E1000_VT_CTL_VM_REPL_EN;
        E1000_WRITE_REG(hw, E1000_VT_CTL, vtctl);


@@ -176,7 +176,7 @@ int igb_pf_host_configure(struct rte_eth_dev *eth_dev)
        E1000_WRITE_REG(hw, E1000_RAH(0), rah);
 
        /*
        E1000_WRITE_REG(hw, E1000_RAH(0), rah);
 
        /*

-        * enable vlan filtering and allow all vlan tags through 
+        * enable vlan filtering and allow all vlan tags through

         */
        vlanctrl = E1000_READ_REG(hw, E1000_RCTL);
        vlanctrl |= E1000_RCTL_VFE ; /* enable vlan filters */
         */
        vlanctrl = E1000_READ_REG(hw, E1000_RCTL);
        vlanctrl |= E1000_RCTL_VFE ; /* enable vlan filters */


@@ -186,17 +186,17 @@ int igb_pf_host_configure(struct rte_eth_dev *eth_dev)
        for (i = 0; i < IGB_VFTA_SIZE; i++) {
                E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, i, 0xFFFFFFFF);
        }
        for (i = 0; i < IGB_VFTA_SIZE; i++) {
                E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, i, 0xFFFFFFFF);
        }

-       
+

        /* Enable/Disable MAC Anti-Spoofing */
        e1000_vmdq_set_anti_spoofing_pf(hw, FALSE, vf_num);
 
        return 0;
 }
 
        /* Enable/Disable MAC Anti-Spoofing */
        e1000_vmdq_set_anti_spoofing_pf(hw, FALSE, vf_num);
 
        return 0;
 }
 

-static void 
+static void

 set_rx_mode(struct rte_eth_dev *dev)
 {
 set_rx_mode(struct rte_eth_dev *dev)
 {

-       struct rte_eth_dev_data *dev_data = 
+       struct rte_eth_dev_data *dev_data =

                (struct rte_eth_dev_data*)dev->data->dev_private;
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t fctrl, vmolr = E1000_VMOLR_BAM | E1000_VMOLR_AUPE;
                (struct rte_eth_dev_data*)dev->data->dev_private;
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t fctrl, vmolr = E1000_VMOLR_BAM | E1000_VMOLR_AUPE;


@@ -235,21 +235,21 @@ set_rx_mode(struct rte_eth_dev *dev)
        E1000_WRITE_REG(hw, E1000_RCTL, fctrl);
 }
 
        E1000_WRITE_REG(hw, E1000_RCTL, fctrl);
 }
 

-static inline void 
+static inline void

 igb_vf_reset_event(struct rte_eth_dev *dev, uint16_t vf)
 {
 igb_vf_reset_event(struct rte_eth_dev *dev, uint16_t vf)
 {

-       struct e1000_hw *hw = 
+       struct e1000_hw *hw =

                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct e1000_vf_info *vfinfo = 
+       struct e1000_vf_info *vfinfo =

                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        uint32_t vmolr = E1000_READ_REG(hw, E1000_VMOLR(vf));
 
                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        uint32_t vmolr = E1000_READ_REG(hw, E1000_VMOLR(vf));
 

-       vmolr |= (E1000_VMOLR_ROPE | E1000_VMOLR_ROMPE | 
+       vmolr |= (E1000_VMOLR_ROPE | E1000_VMOLR_ROMPE |

                        E1000_VMOLR_BAM | E1000_VMOLR_AUPE);
        E1000_WRITE_REG(hw, E1000_VMOLR(vf), vmolr);
 
        E1000_WRITE_REG(hw, E1000_VMVIR(vf), 0);
                        E1000_VMOLR_BAM | E1000_VMOLR_AUPE);
        E1000_WRITE_REG(hw, E1000_VMOLR(vf), vmolr);
 
        E1000_WRITE_REG(hw, E1000_VMVIR(vf), 0);

-       
+

        /* reset multicast table array for vf */
        vfinfo[vf].num_vf_mc_hashes = 0;
 
        /* reset multicast table array for vf */
        vfinfo[vf].num_vf_mc_hashes = 0;
 


@@ -257,7 +257,7 @@ igb_vf_reset_event(struct rte_eth_dev *dev, uint16_t vf)
        set_rx_mode(dev);
 }
 
        set_rx_mode(dev);
 }
 

-static inline void 
+static inline void

 igb_vf_reset_msg(struct rte_eth_dev *dev, uint16_t vf)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 igb_vf_reset_msg(struct rte_eth_dev *dev, uint16_t vf)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);


@@ -279,7 +279,7 @@ static int
 igb_vf_reset(struct rte_eth_dev *dev, uint16_t vf, uint32_t *msgbuf)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 igb_vf_reset(struct rte_eth_dev *dev, uint16_t vf, uint32_t *msgbuf)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct e1000_vf_info *vfinfo = 
+       struct e1000_vf_info *vfinfo =

                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        unsigned char *vf_mac = vfinfo[vf].vf_mac_addresses;
        int rar_entry = hw->mac.rar_entry_count - (vf + 1);
                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        unsigned char *vf_mac = vfinfo[vf].vf_mac_addresses;
        int rar_entry = hw->mac.rar_entry_count - (vf + 1);


@@ -305,7 +305,7 @@ static int
 igb_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 igb_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct e1000_vf_info *vfinfo = 
+       struct e1000_vf_info *vfinfo =

                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        int rar_entry = hw->mac.rar_entry_count - (vf + 1);
        uint8_t *new_mac = (uint8_t *)(&msgbuf[1]);
                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        int rar_entry = hw->mac.rar_entry_count - (vf + 1);
        uint8_t *new_mac = (uint8_t *)(&msgbuf[1]);


@@ -325,11 +325,11 @@ igb_vf_set_multicast(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32_t
        uint32_t vector_bit;
        uint32_t vector_reg;
        uint32_t mta_reg;
        uint32_t vector_bit;
        uint32_t vector_reg;
        uint32_t mta_reg;

-       int entries = (msgbuf[0] & E1000_VT_MSGINFO_MASK) >> 
+       int entries = (msgbuf[0] & E1000_VT_MSGINFO_MASK) >>

                E1000_VT_MSGINFO_SHIFT;
        uint16_t *hash_list = (uint16_t *)&msgbuf[1];
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
                E1000_VT_MSGINFO_SHIFT;
        uint16_t *hash_list = (uint16_t *)&msgbuf[1];
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct e1000_vf_info *vfinfo = 
+       struct e1000_vf_info *vfinfo =

                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
 
        /* only so many hash values supported */
                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
 
        /* only so many hash values supported */


@@ -366,7 +366,7 @@ igb_vf_set_vlan(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 {
        int add, vid;
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 {
        int add, vid;
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct e1000_vf_info *vfinfo = 
+       struct e1000_vf_info *vfinfo =

                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        uint32_t vid_idx, vid_bit, vfta;
 
                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        uint32_t vid_idx, vid_bit, vfta;
 


@@ -379,7 +379,7 @@ igb_vf_set_vlan(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
        else if (vfinfo[vf].vlan_count)
                vfinfo[vf].vlan_count--;
 
        else if (vfinfo[vf].vlan_count)
                vfinfo[vf].vlan_count--;
 

-       vid_idx = (uint32_t)((vid >> E1000_VFTA_ENTRY_SHIFT) & 
+       vid_idx = (uint32_t)((vid >> E1000_VFTA_ENTRY_SHIFT) &

                             E1000_VFTA_ENTRY_MASK);
        vid_bit = (uint32_t)(1 << (vid & E1000_VFTA_ENTRY_BIT_SHIFT_MASK));
        vfta = E1000_READ_REG_ARRAY(hw, E1000_VFTA, vid_idx);
                             E1000_VFTA_ENTRY_MASK);
        vid_bit = (uint32_t)(1 << (vid & E1000_VFTA_ENTRY_BIT_SHIFT_MASK));
        vfta = E1000_READ_REG_ARRAY(hw, E1000_VFTA, vid_idx);


@@ -387,14 +387,14 @@ igb_vf_set_vlan(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
                vfta |= vid_bit;
        else
                vfta &= ~vid_bit;
                vfta |= vid_bit;
        else
                vfta &= ~vid_bit;

-       
+

        E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, vid_idx, vfta);
        E1000_WRITE_FLUSH(hw);
 
        return 0;
 }
 
        E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, vid_idx, vfta);
        E1000_WRITE_FLUSH(hw);
 
        return 0;
 }
 

-static int 
+static int

 igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 {
        uint16_t mbx_size = E1000_VFMAILBOX_SIZE;
 igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 {
        uint16_t mbx_size = E1000_VFMAILBOX_SIZE;


@@ -450,11 +450,11 @@ igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
        return retval;
 }
 
        return retval;
 }
 

-static inline void 
+static inline void

 igb_rcv_ack_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 {
        uint32_t msg = E1000_VT_MSGTYPE_NACK;
 igb_rcv_ack_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 {
        uint32_t msg = E1000_VT_MSGTYPE_NACK;

-       struct e1000_hw *hw = 
+       struct e1000_hw *hw =

                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        e1000_write_mbx(hw, &msg, 1, vf);
                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        e1000_write_mbx(hw, &msg, 1, vf);


@@ -463,7 +463,7 @@ igb_rcv_ack_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 void igb_pf_mbx_process(struct rte_eth_dev *eth_dev)
 {
        uint16_t vf;
 void igb_pf_mbx_process(struct rte_eth_dev *eth_dev)
 {
        uint16_t vf;

-       struct e1000_hw *hw = 
+       struct e1000_hw *hw =

                E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
 
        for (vf = 0; vf < dev_num_vf(eth_dev); vf++) {
                E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
 
        for (vf = 0; vf < dev_num_vf(eth_dev); vf++) {

diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c
index ae53428..b53e7f7 100644 (file)
--- a/lib/librte_pmd_e1000/igb_rxtx.c
+++ b/lib/librte_pmd_e1000/igb_rxtx.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -1386,8 +1386,8 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,
 #ifndef RTE_LIBRTE_XEN_DOM0
        rxq->rx_ring_phys_addr = (uint64_t) rz->phys_addr;
 #else
 #ifndef RTE_LIBRTE_XEN_DOM0
        rxq->rx_ring_phys_addr = (uint64_t) rz->phys_addr;
 #else

-       rxq->rx_ring_phys_addr = rte_mem_phy2mch(rz->memseg_id, rz->phys_addr); 
-#endif 
+       rxq->rx_ring_phys_addr = rte_mem_phy2mch(rz->memseg_id, rz->phys_addr);
+#endif

        rxq->rx_ring = (union e1000_adv_rx_desc *) rz->addr;
 
        /* Allocate software ring. */
        rxq->rx_ring = (union e1000_adv_rx_desc *) rz->addr;
 
        /* Allocate software ring. */


@@ -1407,7 +1407,7 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,
        return 0;
 }
 
        return 0;
 }
 

-uint32_t 
+uint32_t

 eth_igb_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 {
 #define IGB_RXQ_SCAN_INTERVAL 4
 eth_igb_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 {
 #define IGB_RXQ_SCAN_INTERVAL 4


@@ -1693,27 +1693,27 @@ static int
 igb_is_vmdq_supported(const struct rte_eth_dev *dev)
 {
        const struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 igb_is_vmdq_supported(const struct rte_eth_dev *dev)
 {
        const struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       
-       switch (hw->mac.type) { 
-       case e1000_82576: 
-       case e1000_82580: 
-       case e1000_i350: 
+
+       switch (hw->mac.type) {
+       case e1000_82576:
+       case e1000_82580:
+       case e1000_i350:

                return 1;
                return 1;

-       case e1000_82540: 
-       case e1000_82541: 
-       case e1000_82542: 
-       case e1000_82543: 
-       case e1000_82544: 
-       case e1000_82545: 
-       case e1000_82546: 
-       case e1000_82547: 
-       case e1000_82571: 
-       case e1000_82572: 
-       case e1000_82573: 
-       case e1000_82574: 
-       case e1000_82583: 
-       case e1000_i210: 
-       case e1000_i211: 
+       case e1000_82540:
+       case e1000_82541:
+       case e1000_82542:
+       case e1000_82543:
+       case e1000_82544:
+       case e1000_82545:
+       case e1000_82546:
+       case e1000_82547:
+       case e1000_82571:
+       case e1000_82572:
+       case e1000_82573:
+       case e1000_82574:
+       case e1000_82583:
+       case e1000_i210:
+       case e1000_i211:

        default:
                PMD_INIT_LOG(ERR, "Cannot support VMDq feature\n");
                return 0;
        default:
                PMD_INIT_LOG(ERR, "Cannot support VMDq feature\n");
                return 0;


@@ -1727,8 +1727,8 @@ igb_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
        struct e1000_hw *hw;
        uint32_t mrqc, vt_ctl, vmolr, rctl;
        int i;
        struct e1000_hw *hw;
        uint32_t mrqc, vt_ctl, vmolr, rctl;
        int i;

- 
-       PMD_INIT_LOG(DEBUG, ">>");
+
+       PMD_INIT_LOG(DEBUG, ">>");

        hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        cfg = &dev->data->dev_conf.rx_adv_conf.vmdq_rx_conf;
 
        hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        cfg = &dev->data->dev_conf.rx_adv_conf.vmdq_rx_conf;
 


@@ -1737,7 +1737,7 @@ igb_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
                return -1;
 
        igb_rss_disable(dev);
                return -1;
 
        igb_rss_disable(dev);

-       
+

        /* RCTL: eanble VLAN filter */
        rctl = E1000_READ_REG(hw, E1000_RCTL);
        rctl |= E1000_RCTL_VFE;
        /* RCTL: eanble VLAN filter */
        rctl = E1000_READ_REG(hw, E1000_RCTL);
        rctl |= E1000_RCTL_VFE;


@@ -1745,20 +1745,20 @@ igb_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
 
        /* MRQC: enable vmdq */
        mrqc = E1000_READ_REG(hw, E1000_MRQC);
 
        /* MRQC: enable vmdq */
        mrqc = E1000_READ_REG(hw, E1000_MRQC);

-       mrqc |= E1000_MRQC_ENABLE_VMDQ; 
+       mrqc |= E1000_MRQC_ENABLE_VMDQ;

        E1000_WRITE_REG(hw, E1000_MRQC, mrqc);
        E1000_WRITE_REG(hw, E1000_MRQC, mrqc);

- 
+

        /* VTCTL:  pool selection according to VLAN tag */
        vt_ctl = E1000_READ_REG(hw, E1000_VT_CTL);
        /* VTCTL:  pool selection according to VLAN tag */
        vt_ctl = E1000_READ_REG(hw, E1000_VT_CTL);

-       if (cfg->enable_default_pool) 
+       if (cfg->enable_default_pool)

                vt_ctl |= (cfg->default_pool << E1000_VT_CTL_DEFAULT_POOL_SHIFT);
        vt_ctl |= E1000_VT_CTL_IGNORE_MAC;
        E1000_WRITE_REG(hw, E1000_VT_CTL, vt_ctl);
                vt_ctl |= (cfg->default_pool << E1000_VT_CTL_DEFAULT_POOL_SHIFT);
        vt_ctl |= E1000_VT_CTL_IGNORE_MAC;
        E1000_WRITE_REG(hw, E1000_VT_CTL, vt_ctl);

-       
-       /* 
+
+       /*

         * VMOLR: set STRVLAN as 1 if IGMAC in VTCTL is set as 1
         * VMOLR: set STRVLAN as 1 if IGMAC in VTCTL is set as 1

-        * Both 82576 and 82580 support it 
-        */
+        * Both 82576 and 82580 support it
+        */

        if (hw->mac.type != e1000_i350) {
                for (i = 0; i < E1000_VMOLR_SIZE; i++) {
                        vmolr = E1000_READ_REG(hw, E1000_VMOLR(i));
        if (hw->mac.type != e1000_i350) {
                for (i = 0; i < E1000_VMOLR_SIZE; i++) {
                        vmolr = E1000_READ_REG(hw, E1000_VMOLR(i));


@@ -1768,13 +1768,13 @@ igb_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
        }
 
        /* VFTA - enable all vlan filters */
        }
 
        /* VFTA - enable all vlan filters */

-       for (i = 0; i < IGB_VFTA_SIZE; i++) 
+       for (i = 0; i < IGB_VFTA_SIZE; i++)

                E1000_WRITE_REG(hw, (E1000_VFTA+(i*4)), UINT32_MAX);
                E1000_WRITE_REG(hw, (E1000_VFTA+(i*4)), UINT32_MAX);

-       
+

        /* VFRE: 8 pools enabling for rx, both 82576 and i350 support it */
        if (hw->mac.type != e1000_82580)
                E1000_WRITE_REG(hw, E1000_VFRE, E1000_MBVFICR_VFREQ_MASK);
        /* VFRE: 8 pools enabling for rx, both 82576 and i350 support it */
        if (hw->mac.type != e1000_82580)
                E1000_WRITE_REG(hw, E1000_VFRE, E1000_MBVFICR_VFREQ_MASK);

- 
+

        /*
         * RAH/RAL - allow pools to read specific mac addresses
         * In this case, all pools should be able to read from mac addr 0
        /*
         * RAH/RAL - allow pools to read specific mac addresses
         * In this case, all pools should be able to read from mac addr 0


@@ -1792,7 +1792,7 @@ igb_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
        }
 
        E1000_WRITE_FLUSH(hw);
        }
 
        E1000_WRITE_FLUSH(hw);

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -1839,39 +1839,39 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
        struct e1000_hw *hw =
                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t mrqc;
        struct e1000_hw *hw =
                E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t mrqc;

- 
+

        if (RTE_ETH_DEV_SRIOV(dev).active == ETH_8_POOLS) {
                /*
        if (RTE_ETH_DEV_SRIOV(dev).active == ETH_8_POOLS) {
                /*

-               * SRIOV active scheme
-               * FIXME if support RSS together with VMDq & SRIOV
-               */
+                * SRIOV active scheme
+                * FIXME if support RSS together with VMDq & SRIOV
+                */

                mrqc = E1000_MRQC_ENABLE_VMDQ;
                /* 011b Def_Q ignore, according to VT_CTL.DEF_PL */
                mrqc |= 0x3 << E1000_MRQC_DEF_Q_SHIFT;
                E1000_WRITE_REG(hw, E1000_MRQC, mrqc);
                mrqc = E1000_MRQC_ENABLE_VMDQ;
                /* 011b Def_Q ignore, according to VT_CTL.DEF_PL */
                mrqc |= 0x3 << E1000_MRQC_DEF_Q_SHIFT;
                E1000_WRITE_REG(hw, E1000_MRQC, mrqc);

-       } else if(RTE_ETH_DEV_SRIOV(dev).active == 0) { 
+       } else if(RTE_ETH_DEV_SRIOV(dev).active == 0) {

                /*
                /*

-               * SRIOV inactive scheme
-               */
+                * SRIOV inactive scheme
+                */

                switch (dev->data->dev_conf.rxmode.mq_mode) {
                        case ETH_MQ_RX_RSS:
                                igb_rss_configure(dev);
                                break;
                        case ETH_MQ_RX_VMDQ_ONLY:
                                /*Configure general VMDQ only RX parameters*/
                switch (dev->data->dev_conf.rxmode.mq_mode) {
                        case ETH_MQ_RX_RSS:
                                igb_rss_configure(dev);
                                break;
                        case ETH_MQ_RX_VMDQ_ONLY:
                                /*Configure general VMDQ only RX parameters*/

-                               igb_vmdq_rx_hw_configure(dev); 
+                               igb_vmdq_rx_hw_configure(dev);

                                break;
                        case ETH_MQ_RX_NONE:
                                /* if mq_mode is none, disable rss mode.*/
                                break;
                        case ETH_MQ_RX_NONE:
                                /* if mq_mode is none, disable rss mode.*/

-                       default: 
+                       default:

                                igb_rss_disable(dev);
                                break;
                }
        }
                                igb_rss_disable(dev);
                                break;
                }
        }

- 
+

        return 0;
 }
        return 0;
 }

- 
+

 int
 eth_igb_rx_init(struct rte_eth_dev *dev)
 {
 int
 eth_igb_rx_init(struct rte_eth_dev *dev)
 {


@@ -2252,9 +2252,9 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)
                rxdctl |= (rxq->pthresh & 0x1F);
                rxdctl |= ((rxq->hthresh & 0x1F) << 8);
                if (hw->mac.type == e1000_vfadapt) {
                rxdctl |= (rxq->pthresh & 0x1F);
                rxdctl |= ((rxq->hthresh & 0x1F) << 8);
                if (hw->mac.type == e1000_vfadapt) {

-                       /* 
+                       /*

                         * Workaround of 82576 VF Erratum
                         * Workaround of 82576 VF Erratum

-                        * force set WTHRESH to 1 
+                        * force set WTHRESH to 1

                         * to avoid Write-Back not triggered sometimes
                         */
                        rxdctl |= 0x10000;
                         * to avoid Write-Back not triggered sometimes
                         */
                        rxdctl |= 0x10000;


@@ -2315,12 +2315,12 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev)
                txdctl |= txq->pthresh & 0x1F;
                txdctl |= ((txq->hthresh & 0x1F) << 8);
                if (hw->mac.type == e1000_82576) {
                txdctl |= txq->pthresh & 0x1F;
                txdctl |= ((txq->hthresh & 0x1F) << 8);
                if (hw->mac.type == e1000_82576) {

-                       /* 
+                       /*

                         * Workaround of 82576 VF Erratum
                         * Workaround of 82576 VF Erratum

-                        * force set WTHRESH to 1 
+                        * force set WTHRESH to 1

                         * to avoid Write-Back not triggered sometimes
                         */
                         * to avoid Write-Back not triggered sometimes
                         */

-                       txdctl |= 0x10000; 
+                       txdctl |= 0x10000;

                        PMD_INIT_LOG(DEBUG, "Force set TX WTHRESH to 1 !\n");
                }
                else
                        PMD_INIT_LOG(DEBUG, "Force set TX WTHRESH to 1 !\n");
                }
                else

diff --git a/lib/librte_pmd_ixgbe/Makefile b/lib/librte_pmd_ixgbe/Makefile
index 4754e00..b48d0b7 100644 (file)
--- a/lib/librte_pmd_ixgbe/Makefile
+++ b/lib/librte_pmd_ixgbe/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -44,7 +44,7 @@ ifeq ($(CC), icc)
 # CFLAGS for icc
 #
 CFLAGS_LAD = -wd174 -wd593 -wd869 -wd981 -wd2259
 # CFLAGS for icc
 #
 CFLAGS_LAD = -wd174 -wd593 -wd869 -wd981 -wd2259

-else 
+else

 #
 # CFLAGS for gcc
 #
 #
 # CFLAGS for gcc
 #

diff --git a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c b/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
index c4aeb0c..71177dc 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -157,7 +157,7 @@ ixgbe_setup_mac_link_multispeed_fixed_fiber(struct ixgbe_hw *hw,
                        goto out;
                /* Set the module link speed */
                ixgbe_set_fiber_fixed_speed(hw, IXGBE_LINK_SPEED_10GB_FULL);
                        goto out;
                /* Set the module link speed */
                ixgbe_set_fiber_fixed_speed(hw, IXGBE_LINK_SPEED_10GB_FULL);

-                                           
+

                /* Set the module link speed */
                esdp_reg |= (IXGBE_ESDP_SDP5_DIR | IXGBE_ESDP_SDP5);
                IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
                /* Set the module link speed */
                esdp_reg |= (IXGBE_ESDP_SDP5_DIR | IXGBE_ESDP_SDP5);
                IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);


@@ -211,7 +211,7 @@ ixgbe_setup_mac_link_multispeed_fixed_fiber(struct ixgbe_hw *hw,
 
                /* Set the module link speed */
                ixgbe_set_fiber_fixed_speed(hw, IXGBE_LINK_SPEED_1GB_FULL);
 
                /* Set the module link speed */
                ixgbe_set_fiber_fixed_speed(hw, IXGBE_LINK_SPEED_1GB_FULL);

-                                                   
+

                /* Allow module to change analog characteristics (10G->1G) */
                msec_delay(40);
 
                /* Allow module to change analog characteristics (10G->1G) */
                msec_delay(40);
 


@@ -291,7 +291,7 @@ s32
 ixgbe_bypass_init_hw(struct ixgbe_hw *hw)
 {
        int rc;
 ixgbe_bypass_init_hw(struct ixgbe_hw *hw)
 {
        int rc;

-       
+

        if ((rc  = ixgbe_init_hw(hw)) == 0 &&
                        hw->device_id == IXGBE_DEV_ID_82599_BYPASS) {
 
        if ((rc  = ixgbe_init_hw(hw)) == 0 &&
                        hw->device_id == IXGBE_DEV_ID_82599_BYPASS) {
 

diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass.c b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
index 6b022d5..1d21dc0 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_bypass.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass.h b/lib/librte_pmd_ixgbe/ixgbe_bypass.h
index 34f375f..fcd9774 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_bypass.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_bypass.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass_api.h b/lib/librte_pmd_ixgbe/ixgbe_bypass_api.h
index 3975be4..6af370a 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_bypass_api.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_bypass_api.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass_defines.h b/lib/librte_pmd_ixgbe/ixgbe_bypass_defines.h
index 63f4da8..22570ac 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_bypass_defines.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_bypass_defines.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
index b38235c..eb31bd9 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -117,7 +117,7 @@ static void ixgbe_dev_info_get(struct rte_eth_dev *dev,
 static int ixgbe_vlan_filter_set(struct rte_eth_dev *dev,
                uint16_t vlan_id, int on);
 static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id);
 static int ixgbe_vlan_filter_set(struct rte_eth_dev *dev,
                uint16_t vlan_id, int on);
 static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id);

-static void ixgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, 
+static void ixgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev,

                uint16_t queue, bool on);
 static void ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue,
                int on);
                uint16_t queue, bool on);
 static void ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue,
                int on);


@@ -136,7 +136,7 @@ static int ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev,
 static int ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
                struct rte_eth_rss_reta *reta_conf);
 static int ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev,
 static int ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
                struct rte_eth_rss_reta *reta_conf);
 static int ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev,

-               struct rte_eth_rss_reta *reta_conf);    
+               struct rte_eth_rss_reta *reta_conf);

 static void ixgbe_dev_link_status_print(struct rte_eth_dev *dev);
 static int ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev);
 static int ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev);
 static void ixgbe_dev_link_status_print(struct rte_eth_dev *dev);
 static int ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev);
 static int ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev);


@@ -160,7 +160,7 @@ static void ixgbevf_intr_disable(struct ixgbe_hw *hw);
 static void ixgbevf_dev_stats_get(struct rte_eth_dev *dev,
                struct rte_eth_stats *stats);
 static void ixgbevf_dev_stats_reset(struct rte_eth_dev *dev);
 static void ixgbevf_dev_stats_get(struct rte_eth_dev *dev,
                struct rte_eth_stats *stats);
 static void ixgbevf_dev_stats_reset(struct rte_eth_dev *dev);

-static int ixgbevf_vlan_filter_set(struct rte_eth_dev *dev, 
+static int ixgbevf_vlan_filter_set(struct rte_eth_dev *dev,

                uint16_t vlan_id, int on);
 static void ixgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev,
                uint16_t queue, int on);
                uint16_t vlan_id, int on);
 static void ixgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev,
                uint16_t queue, int on);


@@ -171,14 +171,14 @@ static void ixgbevf_set_vfta_all(struct rte_eth_dev *dev, bool on);
 static int ixgbe_uc_hash_table_set(struct rte_eth_dev *dev, struct
                ether_addr* mac_addr,uint8_t on);
 static int ixgbe_uc_all_hash_table_set(struct rte_eth_dev *dev,uint8_t on);
 static int ixgbe_uc_hash_table_set(struct rte_eth_dev *dev, struct
                ether_addr* mac_addr,uint8_t on);
 static int ixgbe_uc_all_hash_table_set(struct rte_eth_dev *dev,uint8_t on);

-static int  ixgbe_set_pool_rx_mode(struct rte_eth_dev *dev,  uint16_t pool, 
+static int  ixgbe_set_pool_rx_mode(struct rte_eth_dev *dev,  uint16_t pool,

                uint16_t rx_mask, uint8_t on);
 static int ixgbe_set_pool_rx(struct rte_eth_dev *dev,uint16_t pool,uint8_t on);
 static int ixgbe_set_pool_tx(struct rte_eth_dev *dev,uint16_t pool,uint8_t on);
                uint16_t rx_mask, uint8_t on);
 static int ixgbe_set_pool_rx(struct rte_eth_dev *dev,uint16_t pool,uint8_t on);
 static int ixgbe_set_pool_tx(struct rte_eth_dev *dev,uint16_t pool,uint8_t on);

-static int ixgbe_set_pool_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan, 
+static int ixgbe_set_pool_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan,

                uint64_t pool_mask,uint8_t vlan_on);
                uint64_t pool_mask,uint8_t vlan_on);

-static int ixgbe_mirror_rule_set(struct rte_eth_dev *dev, 
-               struct rte_eth_vmdq_mirror_conf *mirror_conf, 
+static int ixgbe_mirror_rule_set(struct rte_eth_dev *dev,
+               struct rte_eth_vmdq_mirror_conf *mirror_conf,

                uint8_t rule_id, uint8_t on);
 static int ixgbe_mirror_rule_reset(struct rte_eth_dev *dev,
                uint8_t rule_id);
                uint8_t rule_id, uint8_t on);
 static int ixgbe_mirror_rule_reset(struct rte_eth_dev *dev,
                uint8_t rule_id);


@@ -212,13 +212,13 @@ static void ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index);
                uint32_t bit = (q) % (sizeof ((h)->bitmap[0]) * NBBY); \
                (h)->bitmap[idx] |= 1 << bit;\
        }while(0)
                uint32_t bit = (q) % (sizeof ((h)->bitmap[0]) * NBBY); \
                (h)->bitmap[idx] |= 1 << bit;\
        }while(0)

-       
+

 #define IXGBE_CLEAR_HWSTRIP(h, q) do{\
                uint32_t idx = (q) / (sizeof ((h)->bitmap[0]) * NBBY); \
                uint32_t bit = (q) % (sizeof ((h)->bitmap[0]) * NBBY); \
                (h)->bitmap[idx] &= ~(1 << bit);\
        }while(0)
 #define IXGBE_CLEAR_HWSTRIP(h, q) do{\
                uint32_t idx = (q) / (sizeof ((h)->bitmap[0]) * NBBY); \
                uint32_t bit = (q) % (sizeof ((h)->bitmap[0]) * NBBY); \
                (h)->bitmap[idx] &= ~(1 << bit);\
        }while(0)

- 
+

 #define IXGBE_GET_HWSTRIP(h, q, r) do{\
                uint32_t idx = (q) / (sizeof ((h)->bitmap[0]) * NBBY); \
                uint32_t bit = (q) % (sizeof ((h)->bitmap[0]) * NBBY); \
 #define IXGBE_GET_HWSTRIP(h, q, r) do{\
                uint32_t idx = (q) / (sizeof ((h)->bitmap[0]) * NBBY); \
                uint32_t bit = (q) % (sizeof ((h)->bitmap[0]) * NBBY); \


@@ -284,8 +284,8 @@ static struct eth_dev_ops ixgbe_eth_dev_ops = {
        .mac_addr_remove      = ixgbe_remove_rar,
        .uc_hash_table_set    = ixgbe_uc_hash_table_set,
        .uc_all_hash_table_set  = ixgbe_uc_all_hash_table_set,
        .mac_addr_remove      = ixgbe_remove_rar,
        .uc_hash_table_set    = ixgbe_uc_hash_table_set,
        .uc_all_hash_table_set  = ixgbe_uc_all_hash_table_set,

-       .mirror_rule_set        = ixgbe_mirror_rule_set,
-       .mirror_rule_reset      = ixgbe_mirror_rule_reset,
+       .mirror_rule_set      = ixgbe_mirror_rule_set,
+       .mirror_rule_reset    = ixgbe_mirror_rule_reset,

        .set_vf_rx_mode       = ixgbe_set_pool_rx_mode,
        .set_vf_rx            = ixgbe_set_pool_rx,
        .set_vf_tx            = ixgbe_set_pool_tx,
        .set_vf_rx_mode       = ixgbe_set_pool_rx_mode,
        .set_vf_rx            = ixgbe_set_pool_rx,
        .set_vf_tx            = ixgbe_set_pool_tx,


@@ -433,9 +433,9 @@ ixgbe_enable_intr(struct rte_eth_dev *dev)
 {
        struct ixgbe_interrupt *intr =
                IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
 {
        struct ixgbe_interrupt *intr =
                IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private);

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       
+

        IXGBE_WRITE_REG(hw, IXGBE_EIMS, intr->mask);
        IXGBE_WRITE_FLUSH(hw);
 }
        IXGBE_WRITE_REG(hw, IXGBE_EIMS, intr->mask);
        IXGBE_WRITE_FLUSH(hw);
 }


@@ -574,7 +574,7 @@ ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_config)
                tc->path[IXGBE_DCB_TX_CONFIG].bwg_percent =
                                 (uint8_t)(100/dcb_max_tc + (i & 1));
                tc->path[IXGBE_DCB_RX_CONFIG].bwg_id = i;
                tc->path[IXGBE_DCB_TX_CONFIG].bwg_percent =
                                 (uint8_t)(100/dcb_max_tc + (i & 1));
                tc->path[IXGBE_DCB_RX_CONFIG].bwg_id = i;

-               tc->path[IXGBE_DCB_RX_CONFIG].bwg_percent = 
+               tc->path[IXGBE_DCB_RX_CONFIG].bwg_percent =

                                 (uint8_t)(100/dcb_max_tc + (i & 1));
                tc->pfc = ixgbe_dcb_pfc_disabled;
        }
                                 (uint8_t)(100/dcb_max_tc + (i & 1));
                tc->pfc = ixgbe_dcb_pfc_disabled;
        }


@@ -594,12 +594,12 @@ ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_config)
        /* support all DCB capabilities in 82599 */
        dcb_config->support.capabilities = 0xFF;
 
        /* support all DCB capabilities in 82599 */
        dcb_config->support.capabilities = 0xFF;
 

-       /*we only support 4 Tcs for X540*/              
+       /*we only support 4 Tcs for X540*/

        if (hw->mac.type == ixgbe_mac_X540) {
                dcb_config->num_tcs.pg_tcs = 4;
                dcb_config->num_tcs.pfc_tcs = 4;
        }
        if (hw->mac.type == ixgbe_mac_X540) {
                dcb_config->num_tcs.pg_tcs = 4;
                dcb_config->num_tcs.pfc_tcs = 4;
        }

-} 
+}

 
 /*
  * Ensure that all locks are released before first NVM or PHY access
 
 /*
  * Ensure that all locks are released before first NVM or PHY access


@@ -647,7 +647,7 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
                IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        struct ixgbe_vfta * shadow_vfta =
                IXGBE_DEV_PRIVATE_TO_VFTA(eth_dev->data->dev_private);
                IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        struct ixgbe_vfta * shadow_vfta =
                IXGBE_DEV_PRIVATE_TO_VFTA(eth_dev->data->dev_private);

-       struct ixgbe_hwstrip *hwstrip = 
+       struct ixgbe_hwstrip *hwstrip =

                IXGBE_DEV_PRIVATE_TO_HWSTRIP_BITMAP(eth_dev->data->dev_private);
        struct ixgbe_dcb_config *dcb_config =
                IXGBE_DEV_PRIVATE_TO_DCB_CFG(eth_dev->data->dev_private);
                IXGBE_DEV_PRIVATE_TO_HWSTRIP_BITMAP(eth_dev->data->dev_private);
        struct ixgbe_dcb_config *dcb_config =
                IXGBE_DEV_PRIVATE_TO_DCB_CFG(eth_dev->data->dev_private);


@@ -770,7 +770,7 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
        /* Copy the permanent MAC address */
        ether_addr_copy((struct ether_addr *) hw->mac.perm_addr,
                        &eth_dev->data->mac_addrs[0]);
        /* Copy the permanent MAC address */
        ether_addr_copy((struct ether_addr *) hw->mac.perm_addr,
                        &eth_dev->data->mac_addrs[0]);

-       
+

        /* Allocate memory for storing hash filter MAC addresses */
        eth_dev->data->hash_mac_addrs = rte_zmalloc("ixgbe", ETHER_ADDR_LEN *
                        IXGBE_VMDQ_NUM_UC_MAC, 0);
        /* Allocate memory for storing hash filter MAC addresses */
        eth_dev->data->hash_mac_addrs = rte_zmalloc("ixgbe", ETHER_ADDR_LEN *
                        IXGBE_VMDQ_NUM_UC_MAC, 0);


@@ -879,7 +879,7 @@ eth_ixgbevf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
                IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        struct ixgbe_vfta * shadow_vfta =
                IXGBE_DEV_PRIVATE_TO_VFTA(eth_dev->data->dev_private);
                IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        struct ixgbe_vfta * shadow_vfta =
                IXGBE_DEV_PRIVATE_TO_VFTA(eth_dev->data->dev_private);

-       struct ixgbe_hwstrip *hwstrip = 
+       struct ixgbe_hwstrip *hwstrip =

                IXGBE_DEV_PRIVATE_TO_HWSTRIP_BITMAP(eth_dev->data->dev_private);
        struct ether_addr *perm_addr = (struct ether_addr *) hw->mac.perm_addr;
 
                IXGBE_DEV_PRIVATE_TO_HWSTRIP_BITMAP(eth_dev->data->dev_private);
        struct ether_addr *perm_addr = (struct ether_addr *) hw->mac.perm_addr;
 


@@ -1131,10 +1131,10 @@ ixgbe_vlan_hw_filter_enable(struct rte_eth_dev *dev)
                IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), shadow_vfta->vfta[i]);
 }
 
                IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), shadow_vfta->vfta[i]);
 }
 

-static void 
+static void

 ixgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on)
 {
 ixgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on)
 {

-       struct ixgbe_hwstrip *hwstrip = 
+       struct ixgbe_hwstrip *hwstrip =

                IXGBE_DEV_PRIVATE_TO_HWSTRIP_BITMAP(dev->data->dev_private);
 
        if(queue >= IXGBE_MAX_RX_QUEUE_NUM)
                IXGBE_DEV_PRIVATE_TO_HWSTRIP_BITMAP(dev->data->dev_private);
 
        if(queue >= IXGBE_MAX_RX_QUEUE_NUM)


@@ -1245,7 +1245,7 @@ ixgbe_vlan_hw_strip_enable_all(struct rte_eth_dev *dev)
                        IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), ctrl);
 
                        /* record those setting for HW strip per queue */
                        IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), ctrl);
 
                        /* record those setting for HW strip per queue */

-                       ixgbe_vlan_hw_strip_bitmap_set(dev, i, 1);                      
+                       ixgbe_vlan_hw_strip_bitmap_set(dev, i, 1);

                }
        }
 }
                }
        }
 }


@@ -1359,7 +1359,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
        uint32_t speed = 0;
        int mask = 0;
        int status;
        uint32_t speed = 0;
        int mask = 0;
        int status;

-       
+

        PMD_INIT_FUNC_TRACE();
 
        /* IXGBE devices don't support half duplex */
        PMD_INIT_FUNC_TRACE();
 
        /* IXGBE devices don't support half duplex */


@@ -1387,7 +1387,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 
        /* initialize transmission unit */
        ixgbe_dev_tx_init(dev);
 
        /* initialize transmission unit */
        ixgbe_dev_tx_init(dev);

-      
+

        /* This can fail when allocating mbufs for descriptor rings */
        err = ixgbe_dev_rx_init(dev);
        if (err) {
        /* This can fail when allocating mbufs for descriptor rings */
        err = ixgbe_dev_rx_init(dev);
        if (err) {


@@ -1464,10 +1464,10 @@ skip_link_setup:
        if (dev->data->dev_conf.rxmode.mq_mode == ETH_MQ_RX_VMDQ_ONLY) {
                /* Enable vlan filtering for VMDq */
                ixgbe_vmdq_vlan_hw_filter_enable(dev);
        if (dev->data->dev_conf.rxmode.mq_mode == ETH_MQ_RX_VMDQ_ONLY) {
                /* Enable vlan filtering for VMDq */
                ixgbe_vmdq_vlan_hw_filter_enable(dev);

-       }       
+       }

 
        /* Configure DCB hw */
 
        /* Configure DCB hw */

-       ixgbe_configure_dcb(dev); 
+       ixgbe_configure_dcb(dev);

 
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_NONE) {
                err = ixgbe_fdir_configure(dev);
 
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_NONE) {
                err = ixgbe_fdir_configure(dev);


@@ -1494,7 +1494,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
        struct rte_eth_link link;
        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct rte_eth_link link;
        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct ixgbe_vf_info *vfinfo = 
+       struct ixgbe_vf_info *vfinfo =

                *IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
        int vf;
 
                *IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
        int vf;
 


@@ -1510,7 +1510,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
        /* stop adapter */
        ixgbe_stop_adapter(hw);
 
        /* stop adapter */
        ixgbe_stop_adapter(hw);
 

-       for (vf = 0; vfinfo != NULL && 
+       for (vf = 0; vfinfo != NULL &&

                     vf < dev->pci_dev->max_vfs; vf++)
                vfinfo[vf].clear_to_send = false;
 
                     vf < dev->pci_dev->max_vfs; vf++)
                vfinfo[vf].clear_to_send = false;
 


@@ -1986,7 +1986,7 @@ ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev)
        /* read-on-clear nic registers here */
        eicr = IXGBE_READ_REG(hw, IXGBE_EICR);
        PMD_DRV_LOG(INFO, "eicr %x", eicr);
        /* read-on-clear nic registers here */
        eicr = IXGBE_READ_REG(hw, IXGBE_EICR);
        PMD_DRV_LOG(INFO, "eicr %x", eicr);

-       
+

        intr->flags = 0;
        if (eicr & IXGBE_EICR_LSC) {
                /* set flag for async link update */
        intr->flags = 0;
        if (eicr & IXGBE_EICR_LSC) {
                /* set flag for async link update */


@@ -2050,14 +2050,14 @@ ixgbe_dev_interrupt_action(struct rte_eth_dev *dev)
                IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
        int64_t timeout;
        struct rte_eth_link link;
                IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
        int64_t timeout;
        struct rte_eth_link link;

-       int intr_enable_delay = false;  
+       int intr_enable_delay = false;

 
        PMD_DRV_LOG(DEBUG, "intr action type %d\n", intr->flags);
 
        if (intr->flags & IXGBE_FLAG_MAILBOX) {
                ixgbe_pf_mbx_process(dev);
                intr->flags &= ~IXGBE_FLAG_MAILBOX;
 
        PMD_DRV_LOG(DEBUG, "intr action type %d\n", intr->flags);
 
        if (intr->flags & IXGBE_FLAG_MAILBOX) {
                ixgbe_pf_mbx_process(dev);
                intr->flags &= ~IXGBE_FLAG_MAILBOX;

-       } 
+       }

 
        if (intr->flags & IXGBE_FLAG_NEED_LINK_UPDATE) {
                /* get the link status before link update, for predicting later */
 
        if (intr->flags & IXGBE_FLAG_NEED_LINK_UPDATE) {
                /* get the link status before link update, for predicting later */


@@ -2074,11 +2074,11 @@ ixgbe_dev_interrupt_action(struct rte_eth_dev *dev)
                else
                        /* handle it 4 sec later, wait it being stable */
                        timeout = IXGBE_LINK_DOWN_CHECK_TIMEOUT;
                else
                        /* handle it 4 sec later, wait it being stable */
                        timeout = IXGBE_LINK_DOWN_CHECK_TIMEOUT;

-               
+

                ixgbe_dev_link_status_print(dev);
 
                intr_enable_delay = true;
                ixgbe_dev_link_status_print(dev);
 
                intr_enable_delay = true;

-       } 
+       }

 
        if (intr_enable_delay) {
                if (rte_eal_alarm_set(timeout * 1000,
 
        if (intr_enable_delay) {
                if (rte_eal_alarm_set(timeout * 1000,


@@ -2089,7 +2089,7 @@ ixgbe_dev_interrupt_action(struct rte_eth_dev *dev)
                ixgbe_enable_intr(dev);
                rte_intr_enable(&(dev->pci_dev->intr_handle));
        }
                ixgbe_enable_intr(dev);
                rte_intr_enable(&(dev->pci_dev->intr_handle));
        }

-                       
+

 
        return 0;
 }
 
        return 0;
 }


@@ -2244,7 +2244,7 @@ ixgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
  *  @tc_num: traffic class number
  *  Enable flow control according to the current settings.
  */
  *  @tc_num: traffic class number
  *  Enable flow control according to the current settings.
  */

-static int 
+static int

 ixgbe_dcb_pfc_enable_generic(struct ixgbe_hw *hw,uint8_t tc_num)
 {
        int ret_val = 0;
 ixgbe_dcb_pfc_enable_generic(struct ixgbe_hw *hw,uint8_t tc_num)
 {
        int ret_val = 0;


@@ -2253,7 +2253,7 @@ ixgbe_dcb_pfc_enable_generic(struct ixgbe_hw *hw,uint8_t tc_num)
        uint32_t fcrtl, fcrth;
        uint8_t i;
        uint8_t nb_rx_en;
        uint32_t fcrtl, fcrth;
        uint8_t i;
        uint8_t nb_rx_en;

-       
+

        /* Validate the water mark configuration */
        if (!hw->fc.pause_time) {
                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
        /* Validate the water mark configuration */
        if (!hw->fc.pause_time) {
                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;


@@ -2268,7 +2268,7 @@ ixgbe_dcb_pfc_enable_generic(struct ixgbe_hw *hw,uint8_t tc_num)
                        ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
                        goto out;
                }
                        ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
                        goto out;
                }

- 
+

                if(hw->fc.low_water[tc_num] >= hw->fc.high_water[tc_num]) {
                        PMD_INIT_LOG(ERR,"Invalid water mark configuration\n");
                        ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
                if(hw->fc.low_water[tc_num] >= hw->fc.high_water[tc_num]) {
                        PMD_INIT_LOG(ERR,"Invalid water mark configuration\n");
                        ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;


@@ -2289,7 +2289,7 @@ ixgbe_dcb_pfc_enable_generic(struct ixgbe_hw *hw,uint8_t tc_num)
        case ixgbe_fc_none:
                /*
                 * If the count of enabled RX Priority Flow control >1,
        case ixgbe_fc_none:
                /*
                 * If the count of enabled RX Priority Flow control >1,

-                * and the TX pause can not be disabled 
+                * and the TX pause can not be disabled

                 */
                nb_rx_en = 0;
                for (i =0; i < IXGBE_DCB_MAX_TRAFFIC_CLASS; i++) {
                 */
                nb_rx_en = 0;
                for (i =0; i < IXGBE_DCB_MAX_TRAFFIC_CLASS; i++) {


@@ -2377,7 +2377,7 @@ out:
        return ret_val;
 }
 
        return ret_val;
 }
 

-static int 
+static int

 ixgbe_dcb_pfc_enable(struct rte_eth_dev *dev,uint8_t tc_num)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 ixgbe_dcb_pfc_enable(struct rte_eth_dev *dev,uint8_t tc_num)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);


@@ -2389,7 +2389,7 @@ ixgbe_dcb_pfc_enable(struct rte_eth_dev *dev,uint8_t tc_num)
        return ret_val;
 }
 
        return ret_val;
 }
 

-static int 
+static int

 ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf)
 {
        int err;
 ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf)
 {
        int err;


@@ -2401,16 +2401,16 @@ ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *p
                 IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ixgbe_dcb_config *dcb_config =
                 IXGBE_DEV_PRIVATE_TO_DCB_CFG(dev->data->dev_private);
                 IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ixgbe_dcb_config *dcb_config =
                 IXGBE_DEV_PRIVATE_TO_DCB_CFG(dev->data->dev_private);

-       
+

        enum ixgbe_fc_mode rte_fcmode_2_ixgbe_fcmode[] = {
                ixgbe_fc_none,
                ixgbe_fc_rx_pause,
                ixgbe_fc_tx_pause,
                ixgbe_fc_full
        };
        enum ixgbe_fc_mode rte_fcmode_2_ixgbe_fcmode[] = {
                ixgbe_fc_none,
                ixgbe_fc_rx_pause,
                ixgbe_fc_tx_pause,
                ixgbe_fc_full
        };

-       
+

        PMD_INIT_FUNC_TRACE();
        PMD_INIT_FUNC_TRACE();

-       
+

        ixgbe_dcb_unpack_map_cee(dcb_config, IXGBE_DCB_RX_CONFIG, map);
        tc_num = map[pfc_conf->priority];
        rx_buf_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(tc_num));
        ixgbe_dcb_unpack_map_cee(dcb_config, IXGBE_DCB_RX_CONFIG, map);
        tc_num = map[pfc_conf->priority];
        rx_buf_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(tc_num));


@@ -2432,36 +2432,36 @@ ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *p
        hw->fc.send_xon = pfc_conf->fc.send_xon;
        hw->fc.low_water[tc_num] =  pfc_conf->fc.low_water;
        hw->fc.high_water[tc_num] = pfc_conf->fc.high_water;
        hw->fc.send_xon = pfc_conf->fc.send_xon;
        hw->fc.low_water[tc_num] =  pfc_conf->fc.low_water;
        hw->fc.high_water[tc_num] = pfc_conf->fc.high_water;

-               
+

        err = ixgbe_dcb_pfc_enable(dev,tc_num);
        err = ixgbe_dcb_pfc_enable(dev,tc_num);

-       
+

        /* Not negotiated is not an error case */
        /* Not negotiated is not an error case */

-       if ((err == IXGBE_SUCCESS) || (err == IXGBE_ERR_FC_NOT_NEGOTIATED)) 
+       if ((err == IXGBE_SUCCESS) || (err == IXGBE_ERR_FC_NOT_NEGOTIATED))

                return 0;
 
        PMD_INIT_LOG(ERR, "ixgbe_dcb_pfc_enable = 0x%x \n", err);
        return -EIO;
                return 0;
 
        PMD_INIT_LOG(ERR, "ixgbe_dcb_pfc_enable = 0x%x \n", err);
        return -EIO;

-}      
+}

 
 

-static int 
+static int

 ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
                                struct rte_eth_rss_reta *reta_conf)
 ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
                                struct rte_eth_rss_reta *reta_conf)

-{      
+{

        uint8_t i,j,mask;
        uint32_t reta;
        uint8_t i,j,mask;
        uint32_t reta;

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                        IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        PMD_INIT_FUNC_TRACE();
                        IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        PMD_INIT_FUNC_TRACE();

-       /*  
-       * Update Redirection Table RETA[n],n=0...31,The redirection table has 
+       /*
+       * Update Redirection Table RETA[n],n=0...31,The redirection table has

        * 128-entries in 32 registers
        * 128-entries in 32 registers

-        */ 
+        */

        for(i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i += 4) {
        for(i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i += 4) {

-               if (i < ETH_RSS_RETA_NUM_ENTRIES/2) 
+               if (i < ETH_RSS_RETA_NUM_ENTRIES/2)

                        mask = (uint8_t)((reta_conf->mask_lo >> i) & 0xF);
                else
                        mask = (uint8_t)((reta_conf->mask_lo >> i) & 0xF);
                else

-                       mask = (uint8_t)((reta_conf->mask_hi >> 
+                       mask = (uint8_t)((reta_conf->mask_hi >>

                                (i - ETH_RSS_RETA_NUM_ENTRIES/2)) & 0xF);
                if (mask != 0) {
                        reta = 0;
                                (i - ETH_RSS_RETA_NUM_ENTRIES/2)) & 0xF);
                if (mask != 0) {
                        reta = 0;


@@ -2490,30 +2490,30 @@ ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev,
        uint32_t reta;
        struct ixgbe_hw *hw =
                        IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t reta;
        struct ixgbe_hw *hw =
                        IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       
+

        PMD_INIT_FUNC_TRACE();
        PMD_INIT_FUNC_TRACE();

-       /* 
-        * Read Redirection Table RETA[n],n=0...31,The redirection table has 
+       /*
+        * Read Redirection Table RETA[n],n=0...31,The redirection table has

         * 128-entries in 32 registers
         */
        for(i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i += 4) {
                if (i < ETH_RSS_RETA_NUM_ENTRIES/2)
                        mask = (uint8_t)((reta_conf->mask_lo >> i) & 0xF);
                else
         * 128-entries in 32 registers
         */
        for(i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i += 4) {
                if (i < ETH_RSS_RETA_NUM_ENTRIES/2)
                        mask = (uint8_t)((reta_conf->mask_lo >> i) & 0xF);
                else

-                       mask = (uint8_t)((reta_conf->mask_hi >> 
+                       mask = (uint8_t)((reta_conf->mask_hi >>

                                (i - ETH_RSS_RETA_NUM_ENTRIES/2)) & 0xF);
 
                if (mask != 0) {
                        reta = IXGBE_READ_REG(hw,IXGBE_RETA(i >> 2));
                        for (j = 0; j < 4; j++) {
                                if (mask & (0x1 << j))
                                (i - ETH_RSS_RETA_NUM_ENTRIES/2)) & 0xF);
 
                if (mask != 0) {
                        reta = IXGBE_READ_REG(hw,IXGBE_RETA(i >> 2));
                        for (j = 0; j < 4; j++) {
                                if (mask & (0x1 << j))

-                                       reta_conf->reta[i + j] = 
+                                       reta_conf->reta[i + j] =

                                                (uint8_t)((reta >> 8 * j) & 0xFF);
                                                (uint8_t)((reta >> 8 * j) & 0xFF);

-                       } 
+                       }

                }
        }
 
                }
        }
 

-       return 0;               
+       return 0;

 }
 
 static void
 }
 
 static void


@@ -2578,10 +2578,10 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev)
 static int
 ixgbevf_dev_start(struct rte_eth_dev *dev)
 {
 static int
 ixgbevf_dev_start(struct rte_eth_dev *dev)
 {

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        int err, mask = 0;
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        int err, mask = 0;

-       
+

        PMD_INIT_LOG(DEBUG, "ixgbevf_dev_start");
 
        hw->mac.ops.reset_hw(hw);
        PMD_INIT_LOG(DEBUG, "ixgbevf_dev_start");
 
        hw->mac.ops.reset_hw(hw);


@@ -2598,7 +2598,7 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
                ixgbe_dev_clear_queues(dev);
                return err;
        }
                ixgbe_dev_clear_queues(dev);
                return err;
        }

-       
+

        /* Set vfta */
        ixgbevf_set_vfta_all(dev,1);
 
        /* Set vfta */
        ixgbevf_set_vfta_all(dev,1);
 


@@ -2618,12 +2618,12 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        PMD_INIT_LOG(DEBUG, "ixgbevf_dev_stop");
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        PMD_INIT_LOG(DEBUG, "ixgbevf_dev_stop");

-               
+

        hw->adapter_stopped = TRUE;
        ixgbe_stop_adapter(hw);
 
        hw->adapter_stopped = TRUE;
        ixgbe_stop_adapter(hw);
 

-       /* 
-         * Clear what we set, but we still keep shadow_vfta to 
+       /*
+         * Clear what we set, but we still keep shadow_vfta to

          * restore after device starts
          */
        ixgbevf_set_vfta_all(dev,0);
          * restore after device starts
          */
        ixgbevf_set_vfta_all(dev,0);


@@ -2677,7 +2677,7 @@ ixgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
        uint32_t vid_idx = 0;
        uint32_t vid_bit = 0;
        int ret = 0;
        uint32_t vid_idx = 0;
        uint32_t vid_bit = 0;
        int ret = 0;

-       
+

        PMD_INIT_FUNC_TRACE();
 
        /* vind is not used in VF driver, set to 0, check ixgbe_set_vfta_vf */
        PMD_INIT_FUNC_TRACE();
 
        /* vind is not used in VF driver, set to 0, check ixgbe_set_vfta_vf */


@@ -2706,14 +2706,14 @@ ixgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
        uint32_t ctrl;
 
        PMD_INIT_FUNC_TRACE();
        uint32_t ctrl;
 
        PMD_INIT_FUNC_TRACE();

-       
+

        if(queue >= hw->mac.max_rx_queues)
                return;
 
        ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(queue));
        if(on)
                ctrl |= IXGBE_RXDCTL_VME;
        if(queue >= hw->mac.max_rx_queues)
                return;
 
        ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(queue));
        if(on)
                ctrl |= IXGBE_RXDCTL_VME;

-       else 
+       else

                ctrl &= ~IXGBE_RXDCTL_VME;
        IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(queue), ctrl);
 
                ctrl &= ~IXGBE_RXDCTL_VME;
        IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(queue), ctrl);
 


@@ -2741,36 +2741,36 @@ static int
 ixgbe_vmdq_mode_check(struct ixgbe_hw *hw)
 {
        uint32_t reg_val;
 ixgbe_vmdq_mode_check(struct ixgbe_hw *hw)
 {
        uint32_t reg_val;

-       
+

        /* we only need to do this if VMDq is enabled */
        reg_val = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
        if (!(reg_val & IXGBE_VT_CTL_VT_ENABLE)) {
                PMD_INIT_LOG(ERR, "VMDq must be enabled for this setting\n");
                return (-1);
        }
        /* we only need to do this if VMDq is enabled */
        reg_val = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
        if (!(reg_val & IXGBE_VT_CTL_VT_ENABLE)) {
                PMD_INIT_LOG(ERR, "VMDq must be enabled for this setting\n");
                return (-1);
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 

-static uint32_t 
+static uint32_t

 ixgbe_uta_vector(struct ixgbe_hw *hw, struct ether_addr* uc_addr)
 {
        uint32_t vector = 0;
        switch (hw->mac.mc_filter_type) {
        case 0:   /* use bits [47:36] of the address */
 ixgbe_uta_vector(struct ixgbe_hw *hw, struct ether_addr* uc_addr)
 {
        uint32_t vector = 0;
        switch (hw->mac.mc_filter_type) {
        case 0:   /* use bits [47:36] of the address */

-               vector = ((uc_addr->addr_bytes[4] >> 4) | 
+               vector = ((uc_addr->addr_bytes[4] >> 4) |

                        (((uint16_t)uc_addr->addr_bytes[5]) << 4));
                break;
        case 1:   /* use bits [46:35] of the address */
                        (((uint16_t)uc_addr->addr_bytes[5]) << 4));
                break;
        case 1:   /* use bits [46:35] of the address */

-               vector = ((uc_addr->addr_bytes[4] >> 3) | 
+               vector = ((uc_addr->addr_bytes[4] >> 3) |

                        (((uint16_t)uc_addr->addr_bytes[5]) << 5));
                break;
        case 2:   /* use bits [45:34] of the address */
                        (((uint16_t)uc_addr->addr_bytes[5]) << 5));
                break;
        case 2:   /* use bits [45:34] of the address */

-               vector = ((uc_addr->addr_bytes[4] >> 2) | 
+               vector = ((uc_addr->addr_bytes[4] >> 2) |

                        (((uint16_t)uc_addr->addr_bytes[5]) << 6));
                break;
        case 3:   /* use bits [43:32] of the address */
                        (((uint16_t)uc_addr->addr_bytes[5]) << 6));
                break;
        case 3:   /* use bits [43:32] of the address */

-               vector = ((uc_addr->addr_bytes[4]) | 
+               vector = ((uc_addr->addr_bytes[4]) |

                        (((uint16_t)uc_addr->addr_bytes[5]) << 8));
                break;
        default:  /* Invalid mc_filter_type */
                        (((uint16_t)uc_addr->addr_bytes[5]) << 8));
                break;
        default:  /* Invalid mc_filter_type */


@@ -2782,7 +2782,7 @@ ixgbe_uta_vector(struct ixgbe_hw *hw, struct ether_addr* uc_addr)
        return vector;
 }
 
        return vector;
 }
 

-static int 
+static int

 ixgbe_uc_hash_table_set(struct rte_eth_dev *dev,struct ether_addr* mac_addr,
                               uint8_t on)
 {
 ixgbe_uc_hash_table_set(struct rte_eth_dev *dev,struct ether_addr* mac_addr,
                               uint8_t on)
 {


@@ -2795,24 +2795,24 @@ ixgbe_uc_hash_table_set(struct rte_eth_dev *dev,struct ether_addr* mac_addr,
        const uint32_t ixgbe_uta_bit_shift = 5;
        const uint32_t ixgbe_uta_bit_mask = (0x1 << ixgbe_uta_bit_shift) - 1;
        const uint32_t bit1 = 0x1;
        const uint32_t ixgbe_uta_bit_shift = 5;
        const uint32_t ixgbe_uta_bit_mask = (0x1 << ixgbe_uta_bit_shift) - 1;
        const uint32_t bit1 = 0x1;

-       
+

        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ixgbe_uta_info *uta_info =
                IXGBE_DEV_PRIVATE_TO_UTA(dev->data->dev_private);
        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ixgbe_uta_info *uta_info =
                IXGBE_DEV_PRIVATE_TO_UTA(dev->data->dev_private);

-       
+

        /* The UTA table only exists on 82599 hardware and newer */
        if (hw->mac.type < ixgbe_mac_82599EB)
                return (-ENOTSUP);
        /* The UTA table only exists on 82599 hardware and newer */
        if (hw->mac.type < ixgbe_mac_82599EB)
                return (-ENOTSUP);

-       
+

        vector = ixgbe_uta_vector(hw,mac_addr);
        uta_idx = (vector >> ixgbe_uta_bit_shift) & ixgbe_uta_idx_mask;
        uta_shift = vector & ixgbe_uta_bit_mask;
        vector = ixgbe_uta_vector(hw,mac_addr);
        uta_idx = (vector >> ixgbe_uta_bit_shift) & ixgbe_uta_idx_mask;
        uta_shift = vector & ixgbe_uta_bit_mask;

-       
+

        rc = ((uta_info->uta_shadow[uta_idx] >> uta_shift & bit1) != 0);
        if(rc == on)
                return 0;
        rc = ((uta_info->uta_shadow[uta_idx] >> uta_shift & bit1) != 0);
        if(rc == on)
                return 0;

-       
+

        reg_val = IXGBE_READ_REG(hw, IXGBE_UTA(uta_idx));
        if (on) {
                uta_info->uta_in_use++;
        reg_val = IXGBE_READ_REG(hw, IXGBE_UTA(uta_idx));
        if (on) {
                uta_info->uta_in_use++;


@@ -2823,15 +2823,15 @@ ixgbe_uc_hash_table_set(struct rte_eth_dev *dev,struct ether_addr* mac_addr,
                reg_val &= ~(bit1 << uta_shift);
                uta_info->uta_shadow[uta_idx] &= ~(bit1 << uta_shift);
        }
                reg_val &= ~(bit1 << uta_shift);
                uta_info->uta_shadow[uta_idx] &= ~(bit1 << uta_shift);
        }

-       
+

        IXGBE_WRITE_REG(hw, IXGBE_UTA(uta_idx), reg_val);
        IXGBE_WRITE_REG(hw, IXGBE_UTA(uta_idx), reg_val);

-       
+

        if (uta_info->uta_in_use > 0)
                IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL,
                                IXGBE_MCSTCTRL_MFE | hw->mac.mc_filter_type);
        else
                IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL,hw->mac.mc_filter_type);
        if (uta_info->uta_in_use > 0)
                IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL,
                                IXGBE_MCSTCTRL_MFE | hw->mac.mc_filter_type);
        else
                IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL,hw->mac.mc_filter_type);

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -2847,7 +2847,7 @@ ixgbe_uc_all_hash_table_set(struct rte_eth_dev *dev, uint8_t on)
        /* The UTA table only exists on 82599 hardware and newer */
        if (hw->mac.type < ixgbe_mac_82599EB)
                return (-ENOTSUP);
        /* The UTA table only exists on 82599 hardware and newer */
        if (hw->mac.type < ixgbe_mac_82599EB)
                return (-ENOTSUP);

-       
+

        if(on) {
                for (i = 0; i < ETH_VMDQ_NUM_UC_HASH_ARRAY; i++) {
                        uta_info->uta_shadow[i] = ~0;
        if(on) {
                for (i = 0; i < ETH_VMDQ_NUM_UC_HASH_ARRAY; i++) {
                        uta_info->uta_shadow[i] = ~0;


@@ -2860,18 +2860,18 @@ ixgbe_uc_all_hash_table_set(struct rte_eth_dev *dev, uint8_t on)
                }
        }
        return 0;
                }
        }
        return 0;

-       
+

 }
 static int
 ixgbe_set_pool_rx_mode(struct rte_eth_dev *dev, uint16_t pool,
                               uint16_t rx_mask, uint8_t on)
 {
        int val = 0;
 }
 static int
 ixgbe_set_pool_rx_mode(struct rte_eth_dev *dev, uint16_t pool,
                               uint16_t rx_mask, uint8_t on)
 {
        int val = 0;

-       
+

        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(pool));
        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(pool));

-       
+

        if (hw->mac.type == ixgbe_mac_82598EB) {
                PMD_INIT_LOG(ERR, "setting VF receive mode set should be done"
                        " on 82599 hardware and newer\n");
        if (hw->mac.type == ixgbe_mac_82598EB) {
                PMD_INIT_LOG(ERR, "setting VF receive mode set should be done"
                        " on 82599 hardware and newer\n");


@@ -2893,11 +2893,11 @@ ixgbe_set_pool_rx_mode(struct rte_eth_dev *dev, uint16_t pool,
 
        if (on)
                vmolr |= val;
 
        if (on)
                vmolr |= val;

-       else 
+       else

                vmolr &= ~val;
 
        IXGBE_WRITE_REG(hw, IXGBE_VMOLR(pool), vmolr);
                vmolr &= ~val;
 
        IXGBE_WRITE_REG(hw, IXGBE_VMOLR(pool), vmolr);

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -2907,13 +2907,13 @@ ixgbe_set_pool_rx(struct rte_eth_dev *dev, uint16_t pool, uint8_t on)
        uint32_t reg,addr;
        uint32_t val;
        const uint8_t bit1 = 0x1;
        uint32_t reg,addr;
        uint32_t val;
        const uint8_t bit1 = 0x1;

-       
+

        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if (ixgbe_vmdq_mode_check(hw) < 0)
                return (-ENOTSUP);
        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if (ixgbe_vmdq_mode_check(hw) < 0)
                return (-ENOTSUP);

-       
+

        addr = IXGBE_VFRE(pool >= ETH_64_POOLS/2);
        reg = IXGBE_READ_REG(hw, addr);
        val = bit1 << pool;
        addr = IXGBE_VFRE(pool >= ETH_64_POOLS/2);
        reg = IXGBE_READ_REG(hw, addr);
        val = bit1 << pool;


@@ -2922,9 +2922,9 @@ ixgbe_set_pool_rx(struct rte_eth_dev *dev, uint16_t pool, uint8_t on)
                reg |= val;
        else
                reg &= ~val;
                reg |= val;
        else
                reg &= ~val;

-       
+

        IXGBE_WRITE_REG(hw, addr,reg);
        IXGBE_WRITE_REG(hw, addr,reg);

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -2934,13 +2934,13 @@ ixgbe_set_pool_tx(struct rte_eth_dev *dev, uint16_t pool, uint8_t on)
        uint32_t reg,addr;
        uint32_t val;
        const uint8_t bit1 = 0x1;
        uint32_t reg,addr;
        uint32_t val;
        const uint8_t bit1 = 0x1;

-       
+

        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if (ixgbe_vmdq_mode_check(hw) < 0)
                return (-ENOTSUP);
        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if (ixgbe_vmdq_mode_check(hw) < 0)
                return (-ENOTSUP);

-       
+

        addr = IXGBE_VFTE(pool >= ETH_64_POOLS/2);
        reg = IXGBE_READ_REG(hw, addr);
        val = bit1 << pool;
        addr = IXGBE_VFTE(pool >= ETH_64_POOLS/2);
        reg = IXGBE_READ_REG(hw, addr);
        val = bit1 << pool;


@@ -2949,13 +2949,13 @@ ixgbe_set_pool_tx(struct rte_eth_dev *dev, uint16_t pool, uint8_t on)
                reg |= val;
        else
                reg &= ~val;
                reg |= val;
        else
                reg &= ~val;

-       
+

        IXGBE_WRITE_REG(hw, addr,reg);
        IXGBE_WRITE_REG(hw, addr,reg);

-       
+

        return 0;
 }
 
        return 0;
 }
 

-static int 
+static int

 ixgbe_set_pool_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan,
                        uint64_t pool_mask, uint8_t vlan_on)
 {
 ixgbe_set_pool_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan,
                        uint64_t pool_mask, uint8_t vlan_on)
 {


@@ -2963,14 +2963,14 @@ ixgbe_set_pool_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan,
        uint16_t pool_idx;
        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint16_t pool_idx;
        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       
+

        if (ixgbe_vmdq_mode_check(hw) < 0)
                return (-ENOTSUP);
        for (pool_idx = 0; pool_idx < ETH_64_POOLS; pool_idx++) {
        if (ixgbe_vmdq_mode_check(hw) < 0)
                return (-ENOTSUP);
        for (pool_idx = 0; pool_idx < ETH_64_POOLS; pool_idx++) {

-               if (pool_mask & ((uint64_t)(1ULL << pool_idx))) 
+               if (pool_mask & ((uint64_t)(1ULL << pool_idx)))

                        ret = hw->mac.ops.set_vfta(hw,vlan,pool_idx,vlan_on);
                        ret = hw->mac.ops.set_vfta(hw,vlan,pool_idx,vlan_on);

-                       if (ret < 0) 
-                               return ret;     
+                       if (ret < 0)
+                               return ret;

        }
 
        return ret;
        }
 
        return ret;


@@ -2978,7 +2978,7 @@ ixgbe_set_pool_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan,
 
 static int
 ixgbe_mirror_rule_set(struct rte_eth_dev *dev,
 
 static int
 ixgbe_mirror_rule_set(struct rte_eth_dev *dev,

-                       struct rte_eth_vmdq_mirror_conf *mirror_conf, 
+                       struct rte_eth_vmdq_mirror_conf *mirror_conf,

                        uint8_t rule_id, uint8_t on)
 {
        uint32_t mr_ctl,vlvf;
                        uint8_t rule_id, uint8_t on)
 {
        uint32_t mr_ctl,vlvf;


@@ -2989,7 +2989,7 @@ ixgbe_mirror_rule_set(struct rte_eth_dev *dev,
        uint8_t i = 0;
        int reg_index = 0;
        uint64_t vlan_mask = 0;
        uint8_t i = 0;
        int reg_index = 0;
        uint64_t vlan_mask = 0;

-       
+

        const uint8_t pool_mask_offset = 32;
        const uint8_t vlan_mask_offset = 32;
        const uint8_t dst_pool_offset = 8;
        const uint8_t pool_mask_offset = 32;
        const uint8_t vlan_mask_offset = 32;
        const uint8_t dst_pool_offset = 8;


@@ -3032,7 +3032,7 @@ ixgbe_mirror_rule_set(struct rte_eth_dev *dev,
                if (on) {
                        mv_lsb = vlan_mask & 0xFFFFFFFF;
                        mv_msb = vlan_mask >> vlan_mask_offset;
                if (on) {
                        mv_lsb = vlan_mask & 0xFFFFFFFF;
                        mv_msb = vlan_mask >> vlan_mask_offset;

-                       
+

                        mr_info->mr_conf[rule_id].vlan.vlan_mask =
                                                mirror_conf->vlan.vlan_mask;
                        for(i = 0 ;i < ETH_VMDQ_MAX_VLAN_FILTERS; i++) {
                        mr_info->mr_conf[rule_id].vlan.vlan_mask =
                                                mirror_conf->vlan.vlan_mask;
                        for(i = 0 ;i < ETH_VMDQ_MAX_VLAN_FILTERS; i++) {


@@ -3050,23 +3050,23 @@ ixgbe_mirror_rule_set(struct rte_eth_dev *dev,
        }
 
        /*
        }
 
        /*

-        * if enable pool mirror, write related pool mask register,if disable 
+        * if enable pool mirror, write related pool mask register,if disable

         * pool mirror, clear PFMRVM register
         */
        if (mirror_conf->rule_type_mask & ETH_VMDQ_POOL_MIRROR) {
         * pool mirror, clear PFMRVM register
         */
        if (mirror_conf->rule_type_mask & ETH_VMDQ_POOL_MIRROR) {

-               if (on) { 
+               if (on) {

                        mp_lsb = mirror_conf->pool_mask & 0xFFFFFFFF;
                        mp_msb = mirror_conf->pool_mask >> pool_mask_offset;
                        mp_lsb = mirror_conf->pool_mask & 0xFFFFFFFF;
                        mp_msb = mirror_conf->pool_mask >> pool_mask_offset;

-                       mr_info->mr_conf[rule_id].pool_mask = 
+                       mr_info->mr_conf[rule_id].pool_mask =

                                        mirror_conf->pool_mask;
                                        mirror_conf->pool_mask;

-                       
+

                } else {
                        mp_lsb = 0;
                        mp_msb = 0;
                        mr_info->mr_conf[rule_id].pool_mask = 0;
                }
        }
                } else {
                        mp_lsb = 0;
                        mp_msb = 0;
                        mr_info->mr_conf[rule_id].pool_mask = 0;
                }
        }

-       
+

        /* read  mirror control register and recalculate it */
        mr_ctl = IXGBE_READ_REG(hw,IXGBE_MRCTL(rule_id));
 
        /* read  mirror control register and recalculate it */
        mr_ctl = IXGBE_READ_REG(hw,IXGBE_MRCTL(rule_id));
 


@@ -3082,7 +3082,7 @@ ixgbe_mirror_rule_set(struct rte_eth_dev *dev,
 
        /* write mirrror control  register */
        IXGBE_WRITE_REG(hw, IXGBE_MRCTL(rule_id), mr_ctl);
 
        /* write mirrror control  register */
        IXGBE_WRITE_REG(hw, IXGBE_MRCTL(rule_id), mr_ctl);

-       
+

         /* write pool mirrror control  register */
        if (mirror_conf->rule_type_mask & ETH_VMDQ_POOL_MIRROR) {
                IXGBE_WRITE_REG(hw, IXGBE_VMRVM(rule_id), mp_lsb);
         /* write pool mirrror control  register */
        if (mirror_conf->rule_type_mask & ETH_VMDQ_POOL_MIRROR) {
                IXGBE_WRITE_REG(hw, IXGBE_VMRVM(rule_id), mp_lsb);


@@ -3099,19 +3099,19 @@ ixgbe_mirror_rule_set(struct rte_eth_dev *dev,
        return 0;
 }
 
        return 0;
 }
 

-static int 
+static int

 ixgbe_mirror_rule_reset(struct rte_eth_dev *dev, uint8_t rule_id)
 {
        int mr_ctl = 0;
        uint32_t lsb_val = 0;
        uint32_t msb_val = 0;
        const uint8_t rule_mr_offset = 4;
 ixgbe_mirror_rule_reset(struct rte_eth_dev *dev, uint8_t rule_id)
 {
        int mr_ctl = 0;
        uint32_t lsb_val = 0;
        uint32_t msb_val = 0;
        const uint8_t rule_mr_offset = 4;

-       
+

        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ixgbe_hw *hw =
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct ixgbe_mirror_info *mr_info = 
+       struct ixgbe_mirror_info *mr_info =

                (IXGBE_DEV_PRIVATE_TO_PFDATA(dev->data->dev_private));
                (IXGBE_DEV_PRIVATE_TO_PFDATA(dev->data->dev_private));

-       
+

        if (ixgbe_vmdq_mode_check(hw) < 0)
                return (-ENOTSUP);
 
        if (ixgbe_vmdq_mode_check(hw) < 0)
                return (-ENOTSUP);
 

diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.h b/lib/librte_pmd_ixgbe/ixgbe_ethdev.h
index 47e22a3..69d536f 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -105,7 +105,7 @@ struct ixgbe_hwstrip {
  */
 #define IXGBE_MAX_VF_MC_ENTRIES                30
 #define IXGBE_MAX_MR_RULE_ENTRIES      4 /* number of mirroring rules supported */
  */
 #define IXGBE_MAX_VF_MC_ENTRIES                30
 #define IXGBE_MAX_MR_RULE_ENTRIES      4 /* number of mirroring rules supported */

-#define IXGBE_MAX_UTA                   128    
+#define IXGBE_MAX_UTA                   128

 
 struct ixgbe_uta_info {
        uint8_t  uc_filter_type;
 
 struct ixgbe_uta_info {
        uint8_t  uc_filter_type;


@@ -114,7 +114,7 @@ struct ixgbe_uta_info {
 };
 
 struct ixgbe_mirror_info {
 };
 
 struct ixgbe_mirror_info {

-       struct rte_eth_vmdq_mirror_conf mr_conf[ETH_VMDQ_NUM_MIRROR_RULE]; 
+       struct rte_eth_vmdq_mirror_conf mr_conf[ETH_VMDQ_NUM_MIRROR_RULE];

        /**< store PF mirror rules configuration*/
 };
 
        /**< store PF mirror rules configuration*/
 };
 


@@ -201,7 +201,7 @@ int  ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
                uint16_t nb_tx_desc, unsigned int socket_id,
                const struct rte_eth_txconf *tx_conf);
 
                uint16_t nb_tx_desc, unsigned int socket_id,
                const struct rte_eth_txconf *tx_conf);
 

-uint32_t ixgbe_dev_rx_queue_count(struct rte_eth_dev *dev, 
+uint32_t ixgbe_dev_rx_queue_count(struct rte_eth_dev *dev,

                uint16_t rx_queue_id);
 
 int ixgbe_dev_rx_descriptor_done(void *rx_queue, uint16_t offset);
                uint16_t rx_queue_id);
 
 int ixgbe_dev_rx_descriptor_done(void *rx_queue, uint16_t offset);

diff --git a/lib/librte_pmd_ixgbe/ixgbe_fdir.c b/lib/librte_pmd_ixgbe/ixgbe_fdir.c
index 0d91ff9..bf9fe69 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_fdir.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_fdir.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_ixgbe/ixgbe_logs.h b/lib/librte_pmd_ixgbe/ixgbe_logs.h
index 4e3c59e..9f0a684 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_logs.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_logs.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_ixgbe/ixgbe_pf.c b/lib/librte_pmd_ixgbe/ixgbe_pf.c
index 1ae1a4a..170944d 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_pf.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_pf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -60,18 +60,18 @@ dev_num_vf(struct rte_eth_dev *eth_dev)
        return eth_dev->pci_dev->max_vfs;
 }
 
        return eth_dev->pci_dev->max_vfs;
 }
 

-static inline 
+static inline

 int ixgbe_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
 {
        unsigned char vf_mac_addr[ETHER_ADDR_LEN];
 int ixgbe_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
 {
        unsigned char vf_mac_addr[ETHER_ADDR_LEN];

-       struct ixgbe_vf_info *vfinfo = 
+       struct ixgbe_vf_info *vfinfo =

                *IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
        uint16_t vfn;
 
        for (vfn = 0; vfn < vf_num; vfn++) {
                eth_random_addr(vf_mac_addr);
                /* keep the random address as default */
                *IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
        uint16_t vfn;
 
        for (vfn = 0; vfn < vf_num; vfn++) {
                eth_random_addr(vf_mac_addr);
                /* keep the random address as default */

-               memcpy(vfinfo[vfn].vf_mac_addresses, vf_mac_addr, 
+               memcpy(vfinfo[vfn].vf_mac_addresses, vf_mac_addr,

                           ETHER_ADDR_LEN);
        }
 
                           ETHER_ADDR_LEN);
        }
 


@@ -91,13 +91,13 @@ ixgbe_mb_intr_setup(struct rte_eth_dev *dev)
 
 void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
 {
 
 void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
 {

-       struct ixgbe_vf_info **vfinfo = 
+       struct ixgbe_vf_info **vfinfo =

                IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
        struct ixgbe_mirror_info *mirror_info =
         IXGBE_DEV_PRIVATE_TO_PFDATA(eth_dev->data->dev_private);
        struct ixgbe_uta_info *uta_info =
         IXGBE_DEV_PRIVATE_TO_UTA(eth_dev->data->dev_private);
                IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
        struct ixgbe_mirror_info *mirror_info =
         IXGBE_DEV_PRIVATE_TO_PFDATA(eth_dev->data->dev_private);
        struct ixgbe_uta_info *uta_info =
         IXGBE_DEV_PRIVATE_TO_UTA(eth_dev->data->dev_private);

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        uint16_t vf_num;
        uint8_t nb_queue;
                IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        uint16_t vf_num;
        uint8_t nb_queue;


@@ -161,14 +161,14 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
        vtctl = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
        vtctl |= IXGBE_VMD_CTL_VMDQ_EN;
        vtctl &= ~IXGBE_VT_CTL_POOL_MASK;
        vtctl = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
        vtctl |= IXGBE_VMD_CTL_VMDQ_EN;
        vtctl &= ~IXGBE_VT_CTL_POOL_MASK;

-       vtctl |= RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx 
+       vtctl |= RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx

                << IXGBE_VT_CTL_POOL_SHIFT;
        vtctl |= IXGBE_VT_CTL_REPLEN;
        IXGBE_WRITE_REG(hw, IXGBE_VT_CTL, vtctl);
 
                << IXGBE_VT_CTL_POOL_SHIFT;
        vtctl |= IXGBE_VT_CTL_REPLEN;
        IXGBE_WRITE_REG(hw, IXGBE_VT_CTL, vtctl);
 

-       vfre_offset = vf_num & VFRE_MASK; 
+       vfre_offset = vf_num & VFRE_MASK;

        vfre_slot = (vf_num >> VFRE_SHIFT) > 0 ? 1 : 0;
        vfre_slot = (vf_num >> VFRE_SHIFT) > 0 ? 1 : 0;

-       
+

        /* Enable pools reserved to PF only */
        IXGBE_WRITE_REG(hw, IXGBE_VFRE(vfre_slot), (~0) << vfre_offset);
        IXGBE_WRITE_REG(hw, IXGBE_VFRE(vfre_slot ^ 1), vfre_slot - 1);
        /* Enable pools reserved to PF only */
        IXGBE_WRITE_REG(hw, IXGBE_VFRE(vfre_slot), (~0) << vfre_offset);
        IXGBE_WRITE_REG(hw, IXGBE_VFRE(vfre_slot ^ 1), vfre_slot - 1);


@@ -193,11 +193,11 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
         */
        gcr_ext = IXGBE_READ_REG(hw, IXGBE_GCR_EXT);
        gcr_ext &= ~IXGBE_GCR_EXT_VT_MODE_MASK;
         */
        gcr_ext = IXGBE_READ_REG(hw, IXGBE_GCR_EXT);
        gcr_ext &= ~IXGBE_GCR_EXT_VT_MODE_MASK;

-       
+

        gpie = IXGBE_READ_REG(hw, IXGBE_GPIE);
        gpie &= ~IXGBE_GPIE_VTMODE_MASK;
        gpie |= IXGBE_GPIE_MSIX_MODE;
        gpie = IXGBE_READ_REG(hw, IXGBE_GPIE);
        gpie &= ~IXGBE_GPIE_VTMODE_MASK;
        gpie |= IXGBE_GPIE_MSIX_MODE;

-       
+

        switch (RTE_ETH_DEV_SRIOV(eth_dev).active) {
        case ETH_64_POOLS:
                gcr_ext |= IXGBE_GCR_EXT_VT_MODE_64;
        switch (RTE_ETH_DEV_SRIOV(eth_dev).active) {
        case ETH_64_POOLS:
                gcr_ext |= IXGBE_GCR_EXT_VT_MODE_64;


@@ -216,8 +216,8 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
        IXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr_ext);
         IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
 
        IXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr_ext);
         IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
 

-        /* 
-        * enable vlan filtering and allow all vlan tags through 
+        /*
+        * enable vlan filtering and allow all vlan tags through

         */
         vlanctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
         vlanctrl |= IXGBE_VLNCTRL_VFE ; /* enable vlan filters */
         */
         vlanctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
         vlanctrl |= IXGBE_VLNCTRL_VFE ; /* enable vlan filters */


@@ -227,11 +227,11 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
         for (i = 0; i < IXGBE_MAX_VFTA; i++) {
                 IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), 0xFFFFFFFF);
         }
         for (i = 0; i < IXGBE_MAX_VFTA; i++) {
                 IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), 0xFFFFFFFF);
         }

-       
+

        /* Enable MAC Anti-Spoofing */
        hw->mac.ops.set_mac_anti_spoofing(hw, FALSE, vf_num);
 
        /* Enable MAC Anti-Spoofing */
        hw->mac.ops.set_mac_anti_spoofing(hw, FALSE, vf_num);
 

-       /* set flow control threshold to max to avoid tx switch hang */ 
+       /* set flow control threshold to max to avoid tx switch hang */

        for (i = 0; i < IXGBE_DCB_MAX_TRAFFIC_CLASS; i++) {
                IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), 0);
                fcrth = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)) - 32;
        for (i = 0; i < IXGBE_DCB_MAX_TRAFFIC_CLASS; i++) {
                IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), 0);
                fcrth = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)) - 32;


@@ -241,10 +241,10 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
        return 0;
 }
 
        return 0;
 }
 

-static void 
+static void

 set_rx_mode(struct rte_eth_dev *dev)
 {
 set_rx_mode(struct rte_eth_dev *dev)
 {

-       struct rte_eth_dev_data *dev_data = 
+       struct rte_eth_dev_data *dev_data =

                (struct rte_eth_dev_data*)dev->data->dev_private;
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        u32 fctrl, vmolr = IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE;
                (struct rte_eth_dev_data*)dev->data->dev_private;
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        u32 fctrl, vmolr = IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE;


@@ -287,32 +287,32 @@ set_rx_mode(struct rte_eth_dev *dev)
                ixgbe_vlan_hw_strip_disable_all(dev);
 }
 
                ixgbe_vlan_hw_strip_disable_all(dev);
 }
 

-static inline void 
+static inline void

 ixgbe_vf_reset_event(struct rte_eth_dev *dev, uint16_t vf)
 {
 ixgbe_vf_reset_event(struct rte_eth_dev *dev, uint16_t vf)
 {

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct ixgbe_vf_info *vfinfo = 
+       struct ixgbe_vf_info *vfinfo =

                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
        uint32_t vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
 
                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
        uint32_t vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
 

-       vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_ROMPE | 
+       vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_ROMPE |

                        IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE);
        IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
 
        IXGBE_WRITE_REG(hw, IXGBE_VMVIR(vf), 0);
                        IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE);
        IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
 
        IXGBE_WRITE_REG(hw, IXGBE_VMVIR(vf), 0);

-       
+

        /* reset multicast table array for vf */
        vfinfo[vf].num_vf_mc_hashes = 0;
 
        /* reset rx mode */
        set_rx_mode(dev);
        /* reset multicast table array for vf */
        vfinfo[vf].num_vf_mc_hashes = 0;
 
        /* reset rx mode */
        set_rx_mode(dev);

-       
+

        hw->mac.ops.clear_rar(hw, rar_entry);
 }
 
        hw->mac.ops.clear_rar(hw, rar_entry);
 }
 

-static inline void 
+static inline void

 ixgbe_vf_reset_msg(struct rte_eth_dev *dev, uint16_t vf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 ixgbe_vf_reset_msg(struct rte_eth_dev *dev, uint16_t vf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);


@@ -345,7 +345,7 @@ static int
 ixgbe_vf_reset(struct rte_eth_dev *dev, uint16_t vf, uint32_t *msgbuf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 ixgbe_vf_reset(struct rte_eth_dev *dev, uint16_t vf, uint32_t *msgbuf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct ixgbe_vf_info *vfinfo = 
+       struct ixgbe_vf_info *vfinfo =

                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        unsigned char *vf_mac = vfinfo[vf].vf_mac_addresses;
        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        unsigned char *vf_mac = vfinfo[vf].vf_mac_addresses;
        int rar_entry = hw->mac.num_rar_entries - (vf + 1);


@@ -372,7 +372,7 @@ static int
 ixgbe_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 ixgbe_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct ixgbe_vf_info *vfinfo = 
+       struct ixgbe_vf_info *vfinfo =

                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
        uint8_t *new_mac = (uint8_t *)(&msgbuf[1]);
                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
        uint8_t *new_mac = (uint8_t *)(&msgbuf[1]);


@@ -388,9 +388,9 @@ static int
 ixgbe_vf_set_multicast(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32_t *msgbuf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 ixgbe_vf_set_multicast(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32_t *msgbuf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct ixgbe_vf_info *vfinfo = 
+       struct ixgbe_vf_info *vfinfo =

                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));

-       int nb_entries = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK) >> 
+       int nb_entries = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK) >>

                IXGBE_VT_MSGINFO_SHIFT;
        uint16_t *hash_list = (uint16_t *)&msgbuf[1];
        uint32_t mta_idx;
                IXGBE_VT_MSGINFO_SHIFT;
        uint16_t *hash_list = (uint16_t *)&msgbuf[1];
        uint32_t mta_idx;


@@ -400,7 +400,7 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32
        const uint32_t IXGBE_MTA_BIT_MASK = (0x1 << IXGBE_MTA_BIT_SHIFT) - 1;
        uint32_t reg_val;
        int i;
        const uint32_t IXGBE_MTA_BIT_MASK = (0x1 << IXGBE_MTA_BIT_SHIFT) - 1;
        uint32_t reg_val;
        int i;

-               
+

        /* only so many hash values supported */
        nb_entries = RTE_MIN(nb_entries, IXGBE_MAX_VF_MC_ENTRIES);
 
        /* only so many hash values supported */
        nb_entries = RTE_MIN(nb_entries, IXGBE_MAX_VF_MC_ENTRIES);
 


@@ -411,7 +411,7 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32
        }
 
        for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
        }
 
        for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {

-               mta_idx = (vfinfo->vf_mc_hashes[i] >> IXGBE_MTA_BIT_SHIFT) 
+               mta_idx = (vfinfo->vf_mc_hashes[i] >> IXGBE_MTA_BIT_SHIFT)

                                & IXGBE_MTA_INDEX_MASK;
                mta_shift = vfinfo->vf_mc_hashes[i] & IXGBE_MTA_BIT_MASK;
                reg_val = IXGBE_READ_REG(hw, IXGBE_MTA(mta_idx));
                                & IXGBE_MTA_INDEX_MASK;
                mta_shift = vfinfo->vf_mc_hashes[i] & IXGBE_MTA_BIT_MASK;
                reg_val = IXGBE_READ_REG(hw, IXGBE_MTA(mta_idx));


@@ -427,7 +427,7 @@ ixgbe_vf_set_vlan(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 {
        int add, vid;
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 {
        int add, vid;
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct ixgbe_vf_info *vfinfo = 
+       struct ixgbe_vf_info *vfinfo =

                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
 
        add = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK)
                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
 
        add = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK)


@@ -441,7 +441,7 @@ ixgbe_vf_set_vlan(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
        return hw->mac.ops.set_vfta(hw, vid, vf, (bool)add);
 }
 
        return hw->mac.ops.set_vfta(hw, vid, vf, (bool)add);
 }
 

-static int 
+static int

 ixgbe_set_vf_lpe(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32_t *msgbuf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 ixgbe_set_vf_lpe(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32_t *msgbuf)
 {
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);


@@ -453,7 +453,7 @@ ixgbe_set_vf_lpe(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32_t *ms
        if (hw->mac.type != ixgbe_mac_X540)
                return -1;
 
        if (hw->mac.type != ixgbe_mac_X540)
                return -1;
 

-       if ((max_frame < ETHER_MIN_LEN) || (max_frame > ETHER_MAX_JUMBO_FRAME_LEN)) 
+       if ((max_frame < ETHER_MIN_LEN) || (max_frame > ETHER_MAX_JUMBO_FRAME_LEN))

                return -1;
 
        max_frs = (IXGBE_READ_REG(hw, IXGBE_MAXFRS) &
                return -1;
 
        max_frs = (IXGBE_READ_REG(hw, IXGBE_MAXFRS) &


@@ -466,14 +466,14 @@ ixgbe_set_vf_lpe(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32_t *ms
        return 0;
 }
 
        return 0;
 }
 

-static int 
+static int

 ixgbe_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 {
        uint16_t mbx_size = IXGBE_VFMAILBOX_SIZE;
        uint32_t msgbuf[IXGBE_VFMAILBOX_SIZE];
        int32_t retval;
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 ixgbe_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 {
        uint16_t mbx_size = IXGBE_VFMAILBOX_SIZE;
        uint32_t msgbuf[IXGBE_VFMAILBOX_SIZE];
        int32_t retval;
        struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct ixgbe_vf_info *vfinfo = 
+       struct ixgbe_vf_info *vfinfo =

                *IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
 
        retval = ixgbe_read_mbx(hw, msgbuf, mbx_size, vf);
                *IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
 
        retval = ixgbe_read_mbx(hw, msgbuf, mbx_size, vf);


@@ -529,13 +529,13 @@ ixgbe_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
        return retval;
 }
 
        return retval;
 }
 

-static inline void 
+static inline void

 ixgbe_rcv_ack_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 {
        uint32_t msg = IXGBE_VT_MSGTYPE_NACK;
 ixgbe_rcv_ack_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 {
        uint32_t msg = IXGBE_VT_MSGTYPE_NACK;

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       struct ixgbe_vf_info *vfinfo = 
+       struct ixgbe_vf_info *vfinfo =

                *IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
 
        if (!vfinfo[vf].clear_to_send)
                *IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
 
        if (!vfinfo[vf].clear_to_send)


@@ -545,7 +545,7 @@ ixgbe_rcv_ack_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 void ixgbe_pf_mbx_process(struct rte_eth_dev *eth_dev)
 {
        uint16_t vf;
 void ixgbe_pf_mbx_process(struct rte_eth_dev *eth_dev)
 {
        uint16_t vf;

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
 
        for (vf = 0; vf < dev_num_vf(eth_dev); vf++) {
                IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
 
        for (vf = 0; vf < dev_num_vf(eth_dev); vf++) {

diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
index dc79c4b..d424732 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -878,7 +878,7 @@ rx_desc_error_to_pkt_flags(uint32_t rx_status)
 #ifdef RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC
 /*
  * LOOK_AHEAD defines how many desc statuses to check beyond the
 #ifdef RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC
 /*
  * LOOK_AHEAD defines how many desc statuses to check beyond the

- * current descriptor. 
+ * current descriptor.

  * It must be a pound define for optimal performance.
  * Do not change the value of LOOK_AHEAD, as the ixgbe_rx_scan_hw_ring
  * function only works with LOOK_AHEAD=8.
  * It must be a pound define for optimal performance.
  * Do not change the value of LOOK_AHEAD, as the ixgbe_rx_scan_hw_ring
  * function only works with LOOK_AHEAD=8.


@@ -1613,7 +1613,7 @@ ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,
 
 #ifdef RTE_LIBRTE_XEN_DOM0
        return rte_memzone_reserve_bounded(z_name, ring_size,
 
 #ifdef RTE_LIBRTE_XEN_DOM0
        return rte_memzone_reserve_bounded(z_name, ring_size,

-               socket_id, 0, IXGBE_ALIGN, RTE_PGSIZE_2M);
+               socket_id, 0, IXGBE_ALIGN, RTE_PGSIZE_2M);

 #else
        return rte_memzone_reserve_aligned(z_name, ring_size,
                socket_id, 0, IXGBE_ALIGN);
 #else
        return rte_memzone_reserve_aligned(z_name, ring_size,
                socket_id, 0, IXGBE_ALIGN);


@@ -1638,7 +1638,7 @@ ixgbe_tx_queue_release_mbufs(struct igb_tx_queue *txq)
 static void
 ixgbe_tx_free_swring(struct igb_tx_queue *txq)
 {
 static void
 ixgbe_tx_free_swring(struct igb_tx_queue *txq)
 {

-       if (txq != NULL && 
+       if (txq != NULL &&

            txq->sw_ring != NULL)
                rte_free(txq->sw_ring);
 }
            txq->sw_ring != NULL)
                rte_free(txq->sw_ring);
 }


@@ -1831,7 +1831,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
        txq->hthresh = tx_conf->tx_thresh.hthresh;
        txq->wthresh = tx_conf->tx_thresh.wthresh;
        txq->queue_id = queue_idx;
        txq->hthresh = tx_conf->tx_thresh.hthresh;
        txq->wthresh = tx_conf->tx_thresh.wthresh;
        txq->queue_id = queue_idx;

-       txq->reg_idx = (uint16_t)((RTE_ETH_DEV_SRIOV(dev).active == 0) ? 
+       txq->reg_idx = (uint16_t)((RTE_ETH_DEV_SRIOV(dev).active == 0) ?

                queue_idx : RTE_ETH_DEV_SRIOV(dev).def_pool_q_idx + queue_idx);
        txq->port_id = dev->data->port_id;
        txq->txq_flags = tx_conf->txq_flags;
                queue_idx : RTE_ETH_DEV_SRIOV(dev).def_pool_q_idx + queue_idx);
        txq->port_id = dev->data->port_id;
        txq->txq_flags = tx_conf->txq_flags;


@@ -1845,7 +1845,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
                txq->tdt_reg_addr = IXGBE_PCI_REG_ADDR(hw, IXGBE_VFTDT(queue_idx));
        else
                txq->tdt_reg_addr = IXGBE_PCI_REG_ADDR(hw, IXGBE_TDT(txq->reg_idx));
                txq->tdt_reg_addr = IXGBE_PCI_REG_ADDR(hw, IXGBE_VFTDT(queue_idx));
        else
                txq->tdt_reg_addr = IXGBE_PCI_REG_ADDR(hw, IXGBE_TDT(txq->reg_idx));

-#ifndef        RTE_LIBRTE_XEN_DOM0 
+#ifndef        RTE_LIBRTE_XEN_DOM0

        txq->tx_ring_phys_addr = (uint64_t) tz->phys_addr;
 #else
        txq->tx_ring_phys_addr = rte_mem_phy2mch(tz->memseg_id, tz->phys_addr);
        txq->tx_ring_phys_addr = (uint64_t) tz->phys_addr;
 #else
        txq->tx_ring_phys_addr = rte_mem_phy2mch(tz->memseg_id, tz->phys_addr);


@@ -2073,7 +2073,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
        rxq->nb_rx_desc = nb_desc;
        rxq->rx_free_thresh = rx_conf->rx_free_thresh;
        rxq->queue_id = queue_idx;
        rxq->nb_rx_desc = nb_desc;
        rxq->rx_free_thresh = rx_conf->rx_free_thresh;
        rxq->queue_id = queue_idx;

-       rxq->reg_idx = (uint16_t)((RTE_ETH_DEV_SRIOV(dev).active == 0) ? 
+       rxq->reg_idx = (uint16_t)((RTE_ETH_DEV_SRIOV(dev).active == 0) ?

                queue_idx : RTE_ETH_DEV_SRIOV(dev).def_pool_q_idx + queue_idx);
        rxq->port_id = dev->data->port_id;
        rxq->crc_len = (uint8_t) ((dev->data->dev_conf.rxmode.hw_strip_crc) ?
                queue_idx : RTE_ETH_DEV_SRIOV(dev).def_pool_q_idx + queue_idx);
        rxq->port_id = dev->data->port_id;
        rxq->crc_len = (uint8_t) ((dev->data->dev_conf.rxmode.hw_strip_crc) ?


@@ -2094,7 +2094,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
        }
 
        /*
        }
 
        /*

-        * Zero init all the descriptors in the ring. 
+        * Zero init all the descriptors in the ring.

         */
        memset (rz->addr, 0, RX_RING_SZ);
 
         */
        memset (rz->addr, 0, RX_RING_SZ);
 


@@ -2121,7 +2121,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
        rxq->rx_ring = (union ixgbe_adv_rx_desc *) rz->addr;
 
        /*
        rxq->rx_ring = (union ixgbe_adv_rx_desc *) rz->addr;
 
        /*

-        * Allocate software ring. Allow for space at the end of the 
+        * Allocate software ring. Allow for space at the end of the

         * S/W ring to make sure look-ahead logic in bulk alloc Rx burst
         * function does not access an invalid memory region.
         */
         * S/W ring to make sure look-ahead logic in bulk alloc Rx burst
         * function does not access an invalid memory region.
         */


@@ -2580,13 +2580,13 @@ ixgbe_vmdq_dcb_configure(struct rte_eth_dev *dev)
  * @hw: pointer to hardware structure
  * @dcb_config: pointer to ixgbe_dcb_config structure
  */
  * @hw: pointer to hardware structure
  * @dcb_config: pointer to ixgbe_dcb_config structure
  */

-static void 
+static void

 ixgbe_dcb_tx_hw_config(struct ixgbe_hw *hw,
                struct ixgbe_dcb_config *dcb_config)
 {
        uint32_t reg;
        uint32_t q;
 ixgbe_dcb_tx_hw_config(struct ixgbe_hw *hw,
                struct ixgbe_dcb_config *dcb_config)
 {
        uint32_t reg;
        uint32_t q;

-       
+

        PMD_INIT_FUNC_TRACE();
        if (hw->mac.type != ixgbe_mac_82598EB) {
                /* Disable the Tx desc arbiter so that MTQC can be changed */
        PMD_INIT_FUNC_TRACE();
        if (hw->mac.type != ixgbe_mac_82598EB) {
                /* Disable the Tx desc arbiter so that MTQC can be changed */


@@ -2634,21 +2634,21 @@ ixgbe_vmdq_dcb_hw_tx_config(struct rte_eth_dev *dev,
 {
        struct rte_eth_vmdq_dcb_tx_conf *vmdq_tx_conf =
                        &dev->data->dev_conf.tx_adv_conf.vmdq_dcb_tx_conf;
 {
        struct rte_eth_vmdq_dcb_tx_conf *vmdq_tx_conf =
                        &dev->data->dev_conf.tx_adv_conf.vmdq_dcb_tx_conf;

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                        IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
                        IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);

-       
+

        PMD_INIT_FUNC_TRACE();
        PMD_INIT_FUNC_TRACE();

-       if (hw->mac.type != ixgbe_mac_82598EB)  
+       if (hw->mac.type != ixgbe_mac_82598EB)

                /*PF VF Transmit Enable*/
                IXGBE_WRITE_REG(hw, IXGBE_VFTE(0),
                        vmdq_tx_conf->nb_queue_pools == ETH_16_POOLS ? 0xFFFF : 0xFFFFFFFF);
                /*PF VF Transmit Enable*/
                IXGBE_WRITE_REG(hw, IXGBE_VFTE(0),
                        vmdq_tx_conf->nb_queue_pools == ETH_16_POOLS ? 0xFFFF : 0xFFFFFFFF);

-    
+

        /*Configure general DCB TX parameters*/
        ixgbe_dcb_tx_hw_config(hw,dcb_config);
        return;
 }
 
        /*Configure general DCB TX parameters*/
        ixgbe_dcb_tx_hw_config(hw,dcb_config);
        return;
 }
 

-static void 
+static void

 ixgbe_vmdq_dcb_rx_config(struct rte_eth_dev *dev,
                         struct ixgbe_dcb_config *dcb_config)
 {
 ixgbe_vmdq_dcb_rx_config(struct rte_eth_dev *dev,
                         struct ixgbe_dcb_config *dcb_config)
 {


@@ -2675,15 +2675,15 @@ ixgbe_vmdq_dcb_rx_config(struct rte_eth_dev *dev,
        }
 }
 
        }
 }
 

-static void 
+static void

 ixgbe_dcb_vt_tx_config(struct rte_eth_dev *dev,
                         struct ixgbe_dcb_config *dcb_config)
 ixgbe_dcb_vt_tx_config(struct rte_eth_dev *dev,
                         struct ixgbe_dcb_config *dcb_config)

-{ 
+{

        struct rte_eth_vmdq_dcb_tx_conf *vmdq_tx_conf =
                        &dev->data->dev_conf.tx_adv_conf.vmdq_dcb_tx_conf;
        struct ixgbe_dcb_tc_config *tc;
        uint8_t i,j;
        struct rte_eth_vmdq_dcb_tx_conf *vmdq_tx_conf =
                        &dev->data->dev_conf.tx_adv_conf.vmdq_dcb_tx_conf;
        struct ixgbe_dcb_tc_config *tc;
        uint8_t i,j;

-       
+

        /* convert rte_eth_conf.rx_adv_conf to struct ixgbe_dcb_config */
        if (vmdq_tx_conf->nb_queue_pools == ETH_16_POOLS ) {
                dcb_config->num_tcs.pg_tcs = ETH_8_TCS;
        /* convert rte_eth_conf.rx_adv_conf to struct ixgbe_dcb_config */
        if (vmdq_tx_conf->nb_queue_pools == ETH_16_POOLS ) {
                dcb_config->num_tcs.pg_tcs = ETH_8_TCS;


@@ -2704,7 +2704,7 @@ ixgbe_dcb_vt_tx_config(struct rte_eth_dev *dev,
        return;
 }
 
        return;
 }
 

-static void 
+static void

 ixgbe_dcb_rx_config(struct rte_eth_dev *dev,
                struct ixgbe_dcb_config *dcb_config)
 {
 ixgbe_dcb_rx_config(struct rte_eth_dev *dev,
                struct ixgbe_dcb_config *dcb_config)
 {


@@ -2715,8 +2715,8 @@ ixgbe_dcb_rx_config(struct rte_eth_dev *dev,
 
        dcb_config->num_tcs.pg_tcs = (uint8_t)rx_conf->nb_tcs;
        dcb_config->num_tcs.pfc_tcs = (uint8_t)rx_conf->nb_tcs;
 
        dcb_config->num_tcs.pg_tcs = (uint8_t)rx_conf->nb_tcs;
        dcb_config->num_tcs.pfc_tcs = (uint8_t)rx_conf->nb_tcs;

-       
-       /* User Priority to Traffic Class mapping */ 
+
+       /* User Priority to Traffic Class mapping */

        for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
                j = rx_conf->dcb_queue[i];
                tc = &dcb_config->tc_config[j];
        for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
                j = rx_conf->dcb_queue[i];
                tc = &dcb_config->tc_config[j];


@@ -2725,7 +2725,7 @@ ixgbe_dcb_rx_config(struct rte_eth_dev *dev,
        }
 }
 
        }
 }
 

-static void 
+static void

 ixgbe_dcb_tx_config(struct rte_eth_dev *dev,
                struct ixgbe_dcb_config *dcb_config)
 {
 ixgbe_dcb_tx_config(struct rte_eth_dev *dev,
                struct ixgbe_dcb_config *dcb_config)
 {


@@ -2736,8 +2736,8 @@ ixgbe_dcb_tx_config(struct rte_eth_dev *dev,
 
        dcb_config->num_tcs.pg_tcs = (uint8_t)tx_conf->nb_tcs;
        dcb_config->num_tcs.pfc_tcs = (uint8_t)tx_conf->nb_tcs;
 
        dcb_config->num_tcs.pg_tcs = (uint8_t)tx_conf->nb_tcs;
        dcb_config->num_tcs.pfc_tcs = (uint8_t)tx_conf->nb_tcs;

-    
-       /* User Priority to Traffic Class mapping */ 
+
+       /* User Priority to Traffic Class mapping */

        for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
                j = tx_conf->dcb_queue[i];
                tc = &dcb_config->tc_config[j];
        for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
                j = tx_conf->dcb_queue[i];
                tc = &dcb_config->tc_config[j];


@@ -2797,7 +2797,7 @@ ixgbe_dcb_rx_hw_config(struct ixgbe_hw *hw,
        vlanctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
        vlanctrl |= IXGBE_VLNCTRL_VFE ; /* enable vlan filters */
        IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlanctrl);
        vlanctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
        vlanctrl |= IXGBE_VLNCTRL_VFE ; /* enable vlan filters */
        IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlanctrl);

- 
+

        /* VFTA - enable all vlan filters */
        for (i = 0; i < NUM_VFTA_REGISTERS; i++) {
                IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), 0xFFFFFFFF);
        /* VFTA - enable all vlan filters */
        for (i = 0; i < NUM_VFTA_REGISTERS; i++) {
                IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), 0xFFFFFFFF);


@@ -2809,11 +2809,11 @@ ixgbe_dcb_rx_hw_config(struct ixgbe_hw *hw,
         */
        reg = IXGBE_RTRPCS_RRM | IXGBE_RTRPCS_RAC;
        IXGBE_WRITE_REG(hw, IXGBE_RTRPCS, reg);
         */
        reg = IXGBE_RTRPCS_RRM | IXGBE_RTRPCS_RAC;
        IXGBE_WRITE_REG(hw, IXGBE_RTRPCS, reg);

- 
+

        return;
 }
 
        return;
 }
 

-static void 
+static void

 ixgbe_dcb_hw_arbite_rx_config(struct ixgbe_hw *hw, uint16_t *refill,
                        uint16_t *max,uint8_t *bwg_id, uint8_t *tsa, uint8_t *map)
 {
 ixgbe_dcb_hw_arbite_rx_config(struct ixgbe_hw *hw, uint16_t *refill,
                        uint16_t *max,uint8_t *bwg_id, uint8_t *tsa, uint8_t *map)
 {


@@ -2831,7 +2831,7 @@ ixgbe_dcb_hw_arbite_rx_config(struct ixgbe_hw *hw, uint16_t *refill,
        }
 }
 
        }
 }
 

-static void 
+static void

 ixgbe_dcb_hw_arbite_tx_config(struct ixgbe_hw *hw, uint16_t *refill, uint16_t *max,
                            uint8_t *bwg_id, uint8_t *tsa, uint8_t *map)
 {
 ixgbe_dcb_hw_arbite_tx_config(struct ixgbe_hw *hw, uint16_t *refill, uint16_t *max,
                            uint8_t *bwg_id, uint8_t *tsa, uint8_t *map)
 {


@@ -2854,7 +2854,7 @@ ixgbe_dcb_hw_arbite_tx_config(struct ixgbe_hw *hw, uint16_t *refill, uint16_t *m
 #define DCB_TX_CONFIG  1
 #define DCB_TX_PB      1024
 /**
 #define DCB_TX_CONFIG  1
 #define DCB_TX_PB      1024
 /**

- * ixgbe_dcb_hw_configure - Enable DCB and configure 
+ * ixgbe_dcb_hw_configure - Enable DCB and configure

  * general DCB in VT mode and non-VT mode parameters
  * @dev: pointer to rte_eth_dev structure
  * @dcb_config: pointer to ixgbe_dcb_config structure
  * general DCB in VT mode and non-VT mode parameters
  * @dev: pointer to rte_eth_dev structure
  * @dcb_config: pointer to ixgbe_dcb_config structure


@@ -2875,7 +2875,7 @@ ixgbe_dcb_hw_configure(struct rte_eth_dev *dev,
        uint8_t map[IXGBE_DCB_MAX_TRAFFIC_CLASS] = {0};
        struct ixgbe_dcb_tc_config *tc;
        uint32_t max_frame = dev->data->max_frame_size;
        uint8_t map[IXGBE_DCB_MAX_TRAFFIC_CLASS] = {0};
        struct ixgbe_dcb_tc_config *tc;
        uint32_t max_frame = dev->data->max_frame_size;

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                        IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        switch(dev->data->dev_conf.rxmode.mq_mode){
                        IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        switch(dev->data->dev_conf.rxmode.mq_mode){


@@ -2884,7 +2884,7 @@ ixgbe_dcb_hw_configure(struct rte_eth_dev *dev,
                if (hw->mac.type != ixgbe_mac_82598EB) {
                        config_dcb_rx = DCB_RX_CONFIG;
                        /*
                if (hw->mac.type != ixgbe_mac_82598EB) {
                        config_dcb_rx = DCB_RX_CONFIG;
                        /*

-                        *get dcb and VT rx configuration parameters 
+                        *get dcb and VT rx configuration parameters

                         *from rte_eth_conf
                         */
                        ixgbe_vmdq_dcb_rx_config(dev,dcb_config);
                         *from rte_eth_conf
                         */
                        ixgbe_vmdq_dcb_rx_config(dev,dcb_config);


@@ -2934,7 +2934,7 @@ ixgbe_dcb_hw_configure(struct rte_eth_dev *dev,
                /* Avoid un-configured priority mapping to TC0 */
                uint8_t j = 4;
                uint8_t mask = 0xFF;
                /* Avoid un-configured priority mapping to TC0 */
                uint8_t j = 4;
                uint8_t mask = 0xFF;

-               for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES - 4; i++) 
+               for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES - 4; i++)

                        mask = (uint8_t)(mask & (~ (1 << map[i])));
                for (i = 0; mask && (i < IXGBE_DCB_MAX_TRAFFIC_CLASS); i++) {
                        if ((mask & 0x1) && (j < ETH_DCB_NUM_USER_PRIORITIES))
                        mask = (uint8_t)(mask & (~ (1 << map[i])));
                for (i = 0; mask && (i < IXGBE_DCB_MAX_TRAFFIC_CLASS); i++) {
                        if ((mask & 0x1) && (j < ETH_DCB_NUM_USER_PRIORITIES))


@@ -3042,14 +3042,14 @@ ixgbe_dcb_hw_configure(struct rte_eth_dev *dev,
 void ixgbe_configure_dcb(struct rte_eth_dev *dev)
 {
        struct ixgbe_dcb_config *dcb_cfg =
 void ixgbe_configure_dcb(struct rte_eth_dev *dev)
 {
        struct ixgbe_dcb_config *dcb_cfg =

-                       IXGBE_DEV_PRIVATE_TO_DCB_CFG(dev->data->dev_private); 
+                       IXGBE_DEV_PRIVATE_TO_DCB_CFG(dev->data->dev_private);

        struct rte_eth_conf *dev_conf = &(dev->data->dev_conf);
        struct rte_eth_conf *dev_conf = &(dev->data->dev_conf);

-       
-       PMD_INIT_FUNC_TRACE();  
-       
+
+       PMD_INIT_FUNC_TRACE();
+

        /* check support mq_mode for DCB */
        /* check support mq_mode for DCB */

-       if ((dev_conf->rxmode.mq_mode != ETH_MQ_RX_VMDQ_DCB) && 
-           (dev_conf->rxmode.mq_mode != ETH_MQ_RX_DCB)) 
+       if ((dev_conf->rxmode.mq_mode != ETH_MQ_RX_VMDQ_DCB) &&
+           (dev_conf->rxmode.mq_mode != ETH_MQ_RX_DCB))

                return;
 
        if (dev->data->nb_rx_queues != ETH_DCB_NUM_QUEUES)
                return;
 
        if (dev->data->nb_rx_queues != ETH_DCB_NUM_QUEUES)


@@ -3057,7 +3057,7 @@ void ixgbe_configure_dcb(struct rte_eth_dev *dev)
 
        /** Configure DCB hardware **/
        ixgbe_dcb_hw_configure(dev,dcb_cfg);
 
        /** Configure DCB hardware **/
        ixgbe_dcb_hw_configure(dev,dcb_cfg);

-       
+

        return;
 }
 
        return;
 }
 


@@ -3099,7 +3099,7 @@ ixgbe_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
        IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlanctrl);
 
        /* VFTA - enable all vlan filters */
        IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlanctrl);
 
        /* VFTA - enable all vlan filters */

-       for (i = 0; i < NUM_VFTA_REGISTERS; i++) 
+       for (i = 0; i < NUM_VFTA_REGISTERS; i++)

                IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), UINT32_MAX);
 
        /* VFRE: pool enabling for receive - 64 */
                IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), UINT32_MAX);
 
        /* VFRE: pool enabling for receive - 64 */


@@ -3124,7 +3124,7 @@ ixgbe_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
                 * pools, we only need to use the first half of the register
                 * i.e. bits 0-31
                 */
                 * pools, we only need to use the first half of the register
                 * i.e. bits 0-31
                 */

-               if (((cfg->pool_map[i].pools >> 32) & UINT32_MAX) == 0) 
+               if (((cfg->pool_map[i].pools >> 32) & UINT32_MAX) == 0)

                        IXGBE_WRITE_REG(hw, IXGBE_VLVFB(i*2), \
                                        (cfg->pool_map[i].pools & UINT32_MAX));
                else
                        IXGBE_WRITE_REG(hw, IXGBE_VLVFB(i*2), \
                                        (cfg->pool_map[i].pools & UINT32_MAX));
                else


@@ -3148,12 +3148,12 @@ ixgbe_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
  * ixgbe_dcb_config_tx_hw_config - Configure general VMDq TX parameters
  * @hw: pointer to hardware structure
  */
  * ixgbe_dcb_config_tx_hw_config - Configure general VMDq TX parameters
  * @hw: pointer to hardware structure
  */

-static void 
+static void

 ixgbe_vmdq_tx_hw_configure(struct ixgbe_hw *hw)
 {
        uint32_t reg;
        uint32_t q;
 ixgbe_vmdq_tx_hw_configure(struct ixgbe_hw *hw)
 {
        uint32_t reg;
        uint32_t q;

-       
+

        PMD_INIT_FUNC_TRACE();
        /*PF VF Transmit Enable*/
        IXGBE_WRITE_REG(hw, IXGBE_VFTE(0), UINT32_MAX);
        PMD_INIT_FUNC_TRACE();
        /*PF VF Transmit Enable*/
        IXGBE_WRITE_REG(hw, IXGBE_VFTE(0), UINT32_MAX);


@@ -3220,15 +3220,15 @@ ixgbe_alloc_rx_queue_mbufs(struct igb_rx_queue *rxq)
 static int
 ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
 {
 static int
 ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
 {

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if (hw->mac.type == ixgbe_mac_82598EB)
                return 0;
 
        if (RTE_ETH_DEV_SRIOV(dev).active == 0) {
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if (hw->mac.type == ixgbe_mac_82598EB)
                return 0;
 
        if (RTE_ETH_DEV_SRIOV(dev).active == 0) {

-               /* 
-                * SRIOV inactive scheme
+               /*
+                * SRIOV inactive scheme

                 * any DCB/RSS w/o VMDq multi-queue setting
                 */
                switch (dev->data->dev_conf.rxmode.mq_mode) {
                 * any DCB/RSS w/o VMDq multi-queue setting
                 */
                switch (dev->data->dev_conf.rxmode.mq_mode) {


@@ -3239,11 +3239,11 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
                        case ETH_MQ_RX_VMDQ_DCB:
                                ixgbe_vmdq_dcb_configure(dev);
                                break;
                        case ETH_MQ_RX_VMDQ_DCB:
                                ixgbe_vmdq_dcb_configure(dev);
                                break;

-       
+

                        case ETH_MQ_RX_VMDQ_ONLY:
                                ixgbe_vmdq_rx_hw_configure(dev);
                                break;
                        case ETH_MQ_RX_VMDQ_ONLY:
                                ixgbe_vmdq_rx_hw_configure(dev);
                                break;

-                       
+

                        case ETH_MQ_RX_NONE:
                                /* if mq_mode is none, disable rss mode.*/
                        default: ixgbe_rss_disable(dev);
                        case ETH_MQ_RX_NONE:
                                /* if mq_mode is none, disable rss mode.*/
                        default: ixgbe_rss_disable(dev);


@@ -3261,7 +3261,7 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
                case ETH_32_POOLS:
                        IXGBE_WRITE_REG(hw, IXGBE_MRQC, IXGBE_MRQC_VMDQRT4TCEN);
                        break;
                case ETH_32_POOLS:
                        IXGBE_WRITE_REG(hw, IXGBE_MRQC, IXGBE_MRQC_VMDQRT4TCEN);
                        break;

-               
+

                case ETH_16_POOLS:
                        IXGBE_WRITE_REG(hw, IXGBE_MRQC, IXGBE_MRQC_VMDQRT8TCEN);
                        break;
                case ETH_16_POOLS:
                        IXGBE_WRITE_REG(hw, IXGBE_MRQC, IXGBE_MRQC_VMDQRT8TCEN);
                        break;


@@ -3276,7 +3276,7 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
 static int
 ixgbe_dev_mq_tx_configure(struct rte_eth_dev *dev)
 {
 static int
 ixgbe_dev_mq_tx_configure(struct rte_eth_dev *dev)
 {

-       struct ixgbe_hw *hw = 
+       struct ixgbe_hw *hw =

                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t mtqc;
        uint32_t rttdcs;
                IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t mtqc;
        uint32_t rttdcs;


@@ -3290,10 +3290,10 @@ ixgbe_dev_mq_tx_configure(struct rte_eth_dev *dev)
        IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, rttdcs);
 
        if (RTE_ETH_DEV_SRIOV(dev).active == 0) {
        IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, rttdcs);
 
        if (RTE_ETH_DEV_SRIOV(dev).active == 0) {

-               /* 
-                * SRIOV inactive scheme
+               /*
+                * SRIOV inactive scheme

                 * any DCB w/o VMDq multi-queue setting
                 * any DCB w/o VMDq multi-queue setting

-                */
+                */

                if (dev->data->dev_conf.txmode.mq_mode == ETH_MQ_TX_VMDQ_ONLY)
                        ixgbe_vmdq_tx_hw_configure(hw);
                else {
                if (dev->data->dev_conf.txmode.mq_mode == ETH_MQ_TX_VMDQ_ONLY)
                        ixgbe_vmdq_tx_hw_configure(hw);
                else {


@@ -3314,7 +3314,7 @@ ixgbe_dev_mq_tx_configure(struct rte_eth_dev *dev)
                        mtqc = IXGBE_MTQC_VT_ENA | IXGBE_MTQC_32VF;
                        break;
                case ETH_16_POOLS:
                        mtqc = IXGBE_MTQC_VT_ENA | IXGBE_MTQC_32VF;
                        break;
                case ETH_16_POOLS:

-                       mtqc = IXGBE_MTQC_VT_ENA | IXGBE_MTQC_RT_ENA | 
+                       mtqc = IXGBE_MTQC_VT_ENA | IXGBE_MTQC_RT_ENA |

                                IXGBE_MTQC_8TC_8TQ;
                        break;
                default:
                                IXGBE_MTQC_8TC_8TQ;
                        break;
                default:


@@ -3350,7 +3350,7 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev)
        uint32_t rxcsum;
        uint16_t buf_size;
        uint16_t i;
        uint32_t rxcsum;
        uint16_t buf_size;
        uint16_t i;

-       
+

        PMD_INIT_FUNC_TRACE();
        hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        PMD_INIT_FUNC_TRACE();
        hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 


@@ -3502,7 +3502,7 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev)
                rdrxctl &= ~IXGBE_RDRXCTL_RSCFRSTSIZE;
                IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, rdrxctl);
        }
                rdrxctl &= ~IXGBE_RDRXCTL_RSCFRSTSIZE;
                IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, rdrxctl);
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 

diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h b/lib/librte_pmd_ixgbe/ixgbe_rxtx.h
index c709b7d..26de64b 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -171,7 +171,7 @@ struct igb_tx_queue {
        struct igb_tx_entry *sw_ring;      /**< virtual address of SW ring. */
 #ifdef RTE_IXGBE_INC_VECTOR
        /** continuous tx entry sequence within the same mempool */
        struct igb_tx_entry *sw_ring;      /**< virtual address of SW ring. */
 #ifdef RTE_IXGBE_INC_VECTOR
        /** continuous tx entry sequence within the same mempool */

-       struct igb_tx_entry_seq *sw_ring_seq; 
+       struct igb_tx_entry_seq *sw_ring_seq;

 #endif
        volatile uint32_t   *tdt_reg_addr; /**< Address of TDT register. */
        uint16_t            nb_tx_desc;    /**< number of TX descriptors. */
 #endif
        volatile uint32_t   *tdt_reg_addr; /**< Address of TDT register. */
        uint16_t            nb_tx_desc;    /**< number of TX descriptors. */

diff --git a/lib/librte_pmd_pcap/Makefile b/lib/librte_pmd_pcap/Makefile
index a8b289f..c5c214d 100644 (file)
--- a/lib/librte_pmd_pcap/Makefile
+++ b/lib/librte_pmd_pcap/Makefile
@@ -1,13 +1,13 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   Copyright(c) 2014 6WIND S.A.
 #   All rights reserved.
 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   Copyright(c) 2014 6WIND S.A.
 #   All rights reserved.

-# 
+#

 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #   are met:
 #   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
 #     * 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.
 #     * 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
 #   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

diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c
index 6a411a9..b3dbbda 100644 (file)
--- a/lib/librte_pmd_pcap/rte_eth_pcap.c
+++ b/lib/librte_pmd_pcap/rte_eth_pcap.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.

- * 
+ *

  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
  *   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
  *     * 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


@@ -18,7 +18,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.
  *     * 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
  *   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


@@ -50,11 +50,11 @@
 #define RTE_ETH_PCAP_SNAPLEN 4096
 #define RTE_ETH_PCAP_PROMISC 1
 #define RTE_ETH_PCAP_TIMEOUT -1
 #define RTE_ETH_PCAP_SNAPLEN 4096
 #define RTE_ETH_PCAP_PROMISC 1
 #define RTE_ETH_PCAP_TIMEOUT -1

-#define ETH_PCAP_RX_PCAP_ARG   "rx_pcap"
-#define ETH_PCAP_TX_PCAP_ARG   "tx_pcap"
-#define ETH_PCAP_RX_IFACE_ARG  "rx_iface"
-#define ETH_PCAP_TX_IFACE_ARG  "tx_iface"
-#define ETH_PCAP_IFACE_ARG             "iface"
+#define ETH_PCAP_RX_PCAP_ARG  "rx_pcap"
+#define ETH_PCAP_TX_PCAP_ARG  "tx_pcap"
+#define ETH_PCAP_RX_IFACE_ARG "rx_iface"
+#define ETH_PCAP_TX_IFACE_ARG "tx_iface"
+#define ETH_PCAP_IFACE_ARG    "iface"

 
 static char errbuf[PCAP_ERRBUF_SIZE];
 static struct timeval start_time;
 
 static char errbuf[PCAP_ERRBUF_SIZE];
 static struct timeval start_time;


@@ -139,7 +139,7 @@ eth_pcap_rx(void *queue,
                packet = pcap_next(pcap_q->pcap, &header);
                if (unlikely(packet == NULL))
                        break;
                packet = pcap_next(pcap_q->pcap, &header);
                if (unlikely(packet == NULL))
                        break;

-               else 
+               else

                        mbuf = rte_pktmbuf_alloc(pcap_q->mb_pool);
                if (unlikely(mbuf == NULL))
                        break;
                        mbuf = rte_pktmbuf_alloc(pcap_q->mb_pool);
                if (unlikely(mbuf == NULL))
                        break;


@@ -158,7 +158,7 @@ eth_pcap_rx(void *queue,
                        num_rx++;
                } else {
                        /* pcap packet will not fit in the mbuf, so drop packet */
                        num_rx++;
                } else {
                        /* pcap packet will not fit in the mbuf, so drop packet */

-                       RTE_LOG(ERR, PMD, 
+                       RTE_LOG(ERR, PMD,

                                        "PCAP packet %d bytes will not fit in mbuf (%d bytes)\n",
                                        header.len, buf_size);
                        rte_pktmbuf_free(mbuf);
                                        "PCAP packet %d bytes will not fit in mbuf (%d bytes)\n",
                                        header.len, buf_size);
                        rte_pktmbuf_free(mbuf);

diff --git a/lib/librte_pmd_ring/Makefile b/lib/librte_pmd_ring/Makefile
index 35d40cb..b57e421 100644 (file)
--- a/lib/librte_pmd_ring/Makefile
+++ b/lib/librte_pmd_ring/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_pmd_ring/rte_eth_ring.c b/lib/librte_pmd_ring/rte_eth_ring.c
index 11a1196..10d4e24 100644 (file)
--- a/lib/librte_pmd_ring/rte_eth_ring.c
+++ b/lib/librte_pmd_ring/rte_eth_ring.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -78,7 +78,7 @@ eth_ring_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 {
        void **ptrs = (void *)&bufs[0];
        struct ring_queue *r = q;
 {
        void **ptrs = (void *)&bufs[0];
        struct ring_queue *r = q;

-       const uint16_t nb_rx = (uint16_t)rte_ring_dequeue_burst(r->rng, 
+       const uint16_t nb_rx = (uint16_t)rte_ring_dequeue_burst(r->rng,

                        ptrs, nb_bufs);
        if (r->rng->flags & RING_F_SC_DEQ)
                r->rx_pkts.cnt += nb_rx;
                        ptrs, nb_bufs);
        if (r->rng->flags & RING_F_SC_DEQ)
                r->rx_pkts.cnt += nb_rx;


@@ -92,7 +92,7 @@ eth_ring_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 {
        void **ptrs = (void *)&bufs[0];
        struct ring_queue *r = q;
 {
        void **ptrs = (void *)&bufs[0];
        struct ring_queue *r = q;

-       const uint16_t nb_tx = (uint16_t)rte_ring_enqueue_burst(r->rng, 
+       const uint16_t nb_tx = (uint16_t)rte_ring_enqueue_burst(r->rng,

                        ptrs, nb_bufs);
        if (r->rng->flags & RING_F_SP_ENQ) {
                r->tx_pkts.cnt += nb_tx;
                        ptrs, nb_bufs);
        if (r->rng->flags & RING_F_SP_ENQ) {
                r->tx_pkts.cnt += nb_tx;

diff --git a/lib/librte_pmd_ring/rte_eth_ring.h b/lib/librte_pmd_ring/rte_eth_ring.h
index b84a29e..ef29344 100644 (file)
--- a/lib/librte_pmd_ring/rte_eth_ring.h
+++ b/lib/librte_pmd_ring/rte_eth_ring.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_virtio/Makefile b/lib/librte_pmd_virtio/Makefile
index 820c738..456095b 100644 (file)
--- a/lib/librte_pmd_virtio/Makefile
+++ b/lib/librte_pmd_virtio/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c
index c2b4dfb..aa01125 100644 (file)
--- a/lib/librte_pmd_virtio/virtio_ethdev.c
+++ b/lib/librte_pmd_virtio/virtio_ethdev.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -239,7 +239,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
        const struct rte_memzone *mz;
        uint16_t vq_size;
        int size;
        const struct rte_memzone *mz;
        uint16_t vq_size;
        int size;

-       struct virtio_hw *hw = 
+       struct virtio_hw *hw =

                VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct virtqueue  *vq = NULL;
 
                VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct virtqueue  *vq = NULL;
 


@@ -289,7 +289,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
        }
        if (vq == NULL) {
                PMD_INIT_LOG(ERR, "%s: Can not allocate virtqueue\n", __func__);
        }
        if (vq == NULL) {
                PMD_INIT_LOG(ERR, "%s: Can not allocate virtqueue\n", __func__);

-               return (-ENOMEM); 
+               return (-ENOMEM);

        }
 
        vq->hw = hw;
        }
 
        vq->hw = hw;


@@ -315,10 +315,10 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
        }
 
        /*
        }
 
        /*

-       * Virtio PCI device VIRTIO_PCI_QUEUE_PF register is 32bit,
-       * and only accepts 32 bit page frame number. 
-       * Check if the allocated physical memory exceeds 16TB.
-       */
+        * Virtio PCI device VIRTIO_PCI_QUEUE_PF register is 32bit,
+        * and only accepts 32 bit page frame number.
+        * Check if the allocated physical memory exceeds 16TB.
+        */

        if ( (mz->phys_addr + vq->vq_ring_size - 1) >> (VIRTIO_PCI_QUEUE_ADDR_SHIFT + 32) ) {
                PMD_INIT_LOG(ERR, "vring address shouldn't be above 16TB!\n");
                rte_free(vq);
        if ( (mz->phys_addr + vq->vq_ring_size - 1) >> (VIRTIO_PCI_QUEUE_ADDR_SHIFT + 32) ) {
                PMD_INIT_LOG(ERR, "vring address shouldn't be above 16TB!\n");
                rte_free(vq);


@@ -335,7 +335,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
        vq->virtio_net_hdr_mem = (void *)NULL;
 
        if (queue_type == VTNET_TQ) {
        vq->virtio_net_hdr_mem = (void *)NULL;
 
        if (queue_type == VTNET_TQ) {

-               /* 
+               /*

                 * For each xmit packet, allocate a virtio_net_hdr
                 */
                rte_snprintf(vq_name, sizeof(vq_name), "port%d_tvq%d_hdrzone",
                 * For each xmit packet, allocate a virtio_net_hdr
                 */
                rte_snprintf(vq_name, sizeof(vq_name), "port%d_tvq%d_hdrzone",


@@ -664,9 +664,9 @@ eth_virtio_dev_init(__rte_unused struct eth_driver *eth_drv,
                VIRTIO_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
 
        if (RTE_PKTMBUF_HEADROOM < sizeof(struct virtio_net_hdr) ) {
                VIRTIO_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
 
        if (RTE_PKTMBUF_HEADROOM < sizeof(struct virtio_net_hdr) ) {

-               PMD_INIT_LOG(ERR, 
+               PMD_INIT_LOG(ERR,

                        "MBUF HEADROOM should be enough to hold virtio net hdr\n");
                        "MBUF HEADROOM should be enough to hold virtio net hdr\n");

-               return (-1); 
+               return (-1);

        }
 
        if (! (rte_eal_get_configuration()->flags & EAL_FLG_HIGH_IOPL)) {
        }
 
        if (! (rte_eal_get_configuration()->flags & EAL_FLG_HIGH_IOPL)) {

diff --git a/lib/librte_pmd_virtio/virtio_ethdev.h b/lib/librte_pmd_virtio/virtio_ethdev.h
index da26213..50f1020 100644 (file)
--- a/lib/librte_pmd_virtio/virtio_ethdev.h
+++ b/lib/librte_pmd_virtio/virtio_ethdev.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_virtio/virtio_logs.h b/lib/librte_pmd_virtio/virtio_logs.h
index 2591c6a..d6c33f7 100644 (file)
--- a/lib/librte_pmd_virtio/virtio_logs.h
+++ b/lib/librte_pmd_virtio/virtio_logs.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_virtio/virtio_pci.c b/lib/librte_pmd_virtio/virtio_pci.c
index 1279768..5b92fcb 100644 (file)
--- a/lib/librte_pmd_virtio/virtio_pci.c
+++ b/lib/librte_pmd_virtio/virtio_pci.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_virtio/virtio_pci.h b/lib/librte_pmd_virtio/virtio_pci.h
index 96443c7..fda9672 100644 (file)
--- a/lib/librte_pmd_virtio/virtio_pci.h
+++ b/lib/librte_pmd_virtio/virtio_pci.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -165,7 +165,7 @@ struct virtio_hw {
        uint32_t    io_base;
        uint32_t    host_features;
        uint32_t    guest_features;
        uint32_t    io_base;
        uint32_t    host_features;
        uint32_t    guest_features;

-       
+

        struct virtqueue *cvq;
 
        uint16_t    vtnet_hdr_size;
        struct virtqueue *cvq;
 
        uint16_t    vtnet_hdr_size;

diff --git a/lib/librte_pmd_virtio/virtio_ring.h b/lib/librte_pmd_virtio/virtio_ring.h
index 1985f6c..610dba3 100644 (file)
--- a/lib/librte_pmd_virtio/virtio_ring.h
+++ b/lib/librte_pmd_virtio/virtio_ring.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_virtio/virtio_rxtx.c b/lib/librte_pmd_virtio/virtio_rxtx.c
index 1fb5a2b..171cbc2 100644 (file)
--- a/lib/librte_pmd_virtio/virtio_rxtx.c
+++ b/lib/librte_pmd_virtio/virtio_rxtx.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -127,7 +127,7 @@ virtio_dev_vring_start(struct rte_eth_dev *dev, struct virtqueue *vq, int queue_
                        error = virtqueue_enqueue_recv_refill(vq, m);
 
                        if (error) {
                        error = virtqueue_enqueue_recv_refill(vq, m);
 
                        if (error) {

-                               rte_pktmbuf_free_seg(m);
+                               rte_pktmbuf_free_seg(m);

                                break;
                        }
                        nbufs++;
                                break;
                        }
                        nbufs++;


@@ -258,7 +258,7 @@ virtio_discard_rxbuf(struct virtqueue *vq, struct rte_mbuf *m)
        error = virtqueue_enqueue_recv_refill(vq, m);
        if (unlikely(error)) {
                RTE_LOG(ERR, PMD, "cannot requeue discarded mbuf");
        error = virtqueue_enqueue_recv_refill(vq, m);
        if (unlikely(error)) {
                RTE_LOG(ERR, PMD, "cannot requeue discarded mbuf");

-               rte_pktmbuf_free_seg(m);
+               rte_pktmbuf_free_seg(m);

        }
 }
 
        }
 }
 


@@ -333,14 +333,14 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                }
                error = virtqueue_enqueue_recv_refill(rxvq, new_mbuf);
                if (unlikely(error)) {
                }
                error = virtqueue_enqueue_recv_refill(rxvq, new_mbuf);
                if (unlikely(error)) {

-                       rte_pktmbuf_free_seg(new_mbuf);
+                       rte_pktmbuf_free_seg(new_mbuf);

                        break;
                }
                nb_enqueued ++;
        }
        if (likely(nb_enqueued)) {
                if (unlikely(virtqueue_kick_prepare(rxvq))) {
                        break;
                }
                nb_enqueued ++;
        }
        if (likely(nb_enqueued)) {
                if (unlikely(virtqueue_kick_prepare(rxvq))) {

-                       virtqueue_notify(rxvq);
+                       virtqueue_notify(rxvq);

                        PMD_RX_LOG(DEBUG, "Notified\n");
                }
        }
                        PMD_RX_LOG(DEBUG, "Notified\n");
                }
        }


@@ -391,7 +391,7 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                                        PMD_TX_LOG(ERR, "virtqueue_enqueue error: %d\n", error);
                                break;
                        }
                                        PMD_TX_LOG(ERR, "virtqueue_enqueue error: %d\n", error);
                                break;
                        }

-                       nb_tx++;
+                       nb_tx++;

                        hw->eth_stats.obytes += txm->pkt.data_len;
                        hw->eth_stats.q_obytes[txvq->queue_id]
                                += txm->pkt.data_len;
                        hw->eth_stats.obytes += txm->pkt.data_len;
                        hw->eth_stats.q_obytes[txvq->queue_id]
                                += txm->pkt.data_len;


@@ -406,7 +406,7 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
        hw->eth_stats.q_opackets[txvq->queue_id] += nb_tx;
 
        if(unlikely(virtqueue_kick_prepare(txvq))) {
        hw->eth_stats.q_opackets[txvq->queue_id] += nb_tx;
 
        if(unlikely(virtqueue_kick_prepare(txvq))) {

-               virtqueue_notify(txvq);
+               virtqueue_notify(txvq);

                PMD_TX_LOG(DEBUG, "Notified backend after xmit\n");
        }
 
                PMD_TX_LOG(DEBUG, "Notified backend after xmit\n");
        }
 

diff --git a/lib/librte_pmd_virtio/virtqueue.c b/lib/librte_pmd_virtio/virtqueue.c
index d98acd8..5c34635 100644 (file)
--- a/lib/librte_pmd_virtio/virtqueue.c
+++ b/lib/librte_pmd_virtio/virtqueue.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_virtio/virtqueue.h b/lib/librte_pmd_virtio/virtqueue.h
index 7684395..48b5092 100644 (file)
--- a/lib/librte_pmd_virtio/virtqueue.h
+++ b/lib/librte_pmd_virtio/virtqueue.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -88,7 +88,7 @@ enum { VTNET_RQ = 0, VTNET_TQ = 1, VTNET_CQ = 2 };
 #define VIRTIO_NET_CTRL_RX_ALLUNI       2
 #define VIRTIO_NET_CTRL_RX_NOMULTI      3
 #define VIRTIO_NET_CTRL_RX_NOUNI        4
 #define VIRTIO_NET_CTRL_RX_ALLUNI       2
 #define VIRTIO_NET_CTRL_RX_NOMULTI      3
 #define VIRTIO_NET_CTRL_RX_NOUNI        4

-#define VIRTIO_NET_CTRL_RX_NOBCAST      5 
+#define VIRTIO_NET_CTRL_RX_NOBCAST      5

 
 /**
  * Control VLAN filtering
 
 /**
  * Control VLAN filtering


@@ -251,7 +251,7 @@ virtqueue_kick_prepare(struct virtqueue * vq)
 static inline void __attribute__((always_inline))
 virtqueue_notify(struct virtqueue *vq)
 {
 static inline void __attribute__((always_inline))
 virtqueue_notify(struct virtqueue *vq)
 {

-       /* 
+       /*

         * Ensure updated avail->idx is visible to host. mb() necessary?
         * For virtio on IA, the notificaiton is through io port operation
         * which is a serialization instruction itself.
         * Ensure updated avail->idx is visible to host. mb() necessary?
         * For virtio on IA, the notificaiton is through io port operation
         * which is a serialization instruction itself.


@@ -276,7 +276,7 @@ vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx)
                }
        }
        dxp->ndescs = 0;
                }
        }
        dxp->ndescs = 0;

-       
+

        /*
         * We must append the existing free chain, if any, to the end of
         * newly freed chain. If the virtqueue was completely used, then
        /*
         * We must append the existing free chain, if any, to the end of
         * newly freed chain. If the virtqueue was completely used, then


@@ -344,7 +344,7 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie)
        if (unlikely(txvq->vq_free_cnt < needed))
                return (-EMSGSIZE);
        head_idx = txvq->vq_desc_head_idx;
        if (unlikely(txvq->vq_free_cnt < needed))
                return (-EMSGSIZE);
        head_idx = txvq->vq_desc_head_idx;

-       if (unlikely(head_idx >= txvq->vq_nentries)) 
+       if (unlikely(head_idx >= txvq->vq_nentries))

                return (-EFAULT);
 
        idx = head_idx;
                return (-EFAULT);
 
        idx = head_idx;


@@ -389,7 +389,7 @@ virtqueue_dequeue_burst_rx(struct virtqueue *vq, struct rte_mbuf **rx_pkts, uint
                cookie = (struct rte_mbuf *)vq->vq_descx[desc_idx].cookie;
 
                if (unlikely(cookie == NULL)) {
                cookie = (struct rte_mbuf *)vq->vq_descx[desc_idx].cookie;
 
                if (unlikely(cookie == NULL)) {

-                       PMD_DRV_LOG(ERR, "vring descriptor with no mbuf cookie at %u\n", 
+                       PMD_DRV_LOG(ERR, "vring descriptor with no mbuf cookie at %u\n",

                                vq->vq_used_cons_idx);
                        break;
                }
                                vq->vq_used_cons_idx);
                        break;
                }

diff --git a/lib/librte_pmd_vmxnet3/Makefile b/lib/librte_pmd_vmxnet3/Makefile
index 1f0f8e0..e0c0067 100644 (file)
--- a/lib/librte_pmd_vmxnet3/Makefile
+++ b/lib/librte_pmd_vmxnet3/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -44,7 +44,7 @@ ifeq ($(CC), icc)
 # CFLAGS for icc
 #
 CFLAGS_LAD = -wd174 -wd593 -wd869 -wd981 -wd2259
 # CFLAGS for icc
 #
 CFLAGS_LAD = -wd174 -wd593 -wd869 -wd981 -wd2259

-else 
+else

 #
 # CFLAGS for gcc
 #
 #
 # CFLAGS for gcc
 #

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/includeCheck.h b/lib/librte_pmd_vmxnet3/vmxnet3/includeCheck.h
index 22496d3..16308d2 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3/includeCheck.h
+++ b/lib/librte_pmd_vmxnet3/vmxnet3/includeCheck.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/upt1_defs.h b/lib/librte_pmd_vmxnet3/vmxnet3/upt1_defs.h
index 675f8da..d9144e3 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3/upt1_defs.h
+++ b/lib/librte_pmd_vmxnet3/vmxnet3/upt1_defs.h
@@ -95,7 +95,7 @@ UPT1_RxStats;
 #define UPT1_RSS_MAX_KEY_SIZE        40
 #define UPT1_RSS_MAX_IND_TABLE_SIZE  128
 
 #define UPT1_RSS_MAX_KEY_SIZE        40
 #define UPT1_RSS_MAX_IND_TABLE_SIZE  128
 

-typedef 
+typedef

 #include "vmware_pack_begin.h"
 struct UPT1_RSSConf {
    uint16   hashType;
 #include "vmware_pack_begin.h"
 struct UPT1_RSSConf {
    uint16   hashType;

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_begin.h b/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_begin.h
index 0212f4f..860ec4c 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_begin.h
+++ b/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_begin.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_end.h b/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_end.h
index 0212f4f..860ec4c 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_end.h
+++ b/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_end.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_defs.h b/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_defs.h
index 183fee1..2b56574 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_defs.h
+++ b/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_defs.h
@@ -137,12 +137,12 @@ typedef enum {
  *     Little Endian layout of bitfields -
  *     Byte 0 :        7.....len.....0
  *     Byte 1 :        rsvd gen 13.len.8
  *     Little Endian layout of bitfields -
  *     Byte 0 :        7.....len.....0
  *     Byte 1 :        rsvd gen 13.len.8

- *     Byte 2 :        5.msscof.0 ext1  dtype
- *     Byte 3 :        13...msscof...6
+ *     Byte 2 :        5.msscof.0 ext1  dtype
+ *     Byte 3 :        13...msscof...6

  *
  *     Big Endian layout of bitfields -
  *     Byte 0:         13...msscof...6
  *
  *     Big Endian layout of bitfields -
  *     Byte 0:         13...msscof...6

- *     Byte 1 :        5.msscof.0 ext1  dtype
+ *     Byte 1 :        5.msscof.0 ext1  dtype

  *     Byte 2 :        rsvd gen 13.len.8
  *     Byte 3 :        7.....len.....0
  *
  *     Byte 2 :        rsvd gen 13.len.8
  *     Byte 3 :        7.....len.....0
  *


@@ -475,7 +475,7 @@ Vmxnet3_DriverInfo;
 
 #define VMXNET3_REV1_MAGIC  0xbabefee1
 
 
 #define VMXNET3_REV1_MAGIC  0xbabefee1
 

-/* 
+/*

  * QueueDescPA must be 128 bytes aligned. It points to an array of
  * Vmxnet3_TxQueueDesc followed by an array of Vmxnet3_RxQueueDesc.
  * The number of Vmxnet3_TxQueueDesc/Vmxnet3_RxQueueDesc are specified by
  * QueueDescPA must be 128 bytes aligned. It points to an array of
  * Vmxnet3_TxQueueDesc followed by an array of Vmxnet3_RxQueueDesc.
  * The number of Vmxnet3_TxQueueDesc/Vmxnet3_RxQueueDesc are specified by

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_osdep.h b/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_osdep.h
index 79b1eb0..b6e3469 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_osdep.h
+++ b/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_osdep.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
index c41032f..b955314 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
+++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -197,10 +197,10 @@ eth_vmxnet3_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
        eth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts;
        pci_dev = eth_dev->pci_dev;
 
        eth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts;
        pci_dev = eth_dev->pci_dev;
 

-       /* 
-       * for secondary processes, we don't initialise any further as primary
-       * has already done this work. 
-       */
+       /*
+        * for secondary processes, we don't initialise any further as primary
+        * has already done this work.
+        */

        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 


@@ -219,20 +219,20 @@ eth_vmxnet3_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
     ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_VRRS);
     PMD_INIT_LOG(DEBUG, "Harware version : %d\n", ver);
     if (ver & 0x1)
     ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_VRRS);
     PMD_INIT_LOG(DEBUG, "Harware version : %d\n", ver);
     if (ver & 0x1)

-       VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS, 1);
+               VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS, 1);

     else {
     else {

-       PMD_INIT_LOG(ERR, "Uncompatiable h/w version, should be 0x1\n");
-       return -EIO;
+               PMD_INIT_LOG(ERR, "Uncompatiable h/w version, should be 0x1\n");
+               return -EIO;

     }
 
     /* Check UPT version compatibility with driver. */
     ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_UVRS);
     PMD_INIT_LOG(DEBUG, "UPT harware version : %d\n", ver);
     if (ver & 0x1)
     }
 
     /* Check UPT version compatibility with driver. */
     ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_UVRS);
     PMD_INIT_LOG(DEBUG, "UPT harware version : %d\n", ver);
     if (ver & 0x1)

-       VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_UVRS, 1);
+               VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_UVRS, 1);

     else {
     else {

-       PMD_INIT_LOG(ERR, "Incompatiable UPT version.\n");
-       return -EIO;
+               PMD_INIT_LOG(ERR, "Incompatiable UPT version.\n");
+               return -EIO;

     }
 
        /* Getting MAC Address */
     }
 
        /* Getting MAC Address */


@@ -311,13 +311,13 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
        hw->num_rx_queues = (uint8_t)dev->data->nb_rx_queues;
        hw->num_tx_queues = (uint8_t)dev->data->nb_tx_queues;
 
        hw->num_rx_queues = (uint8_t)dev->data->nb_rx_queues;
        hw->num_tx_queues = (uint8_t)dev->data->nb_tx_queues;
 

-       /* 
-        * Allocate a memzone for Vmxnet3_DriverShared - Vmxnet3_DSDevRead 
+       /*
+        * Allocate a memzone for Vmxnet3_DriverShared - Vmxnet3_DSDevRead

         * on current socket
         */
        mz = gpa_zone_reserve(dev, sizeof (struct Vmxnet3_DriverShared),
                "shared", rte_socket_id(), 8);
         * on current socket
         */
        mz = gpa_zone_reserve(dev, sizeof (struct Vmxnet3_DriverShared),
                "shared", rte_socket_id(), 8);

-                               
+

        if (mz == NULL) {
                PMD_INIT_LOG(ERR, "ERROR: Creating shared zone\n");
                return (-ENOMEM);
        if (mz == NULL) {
                PMD_INIT_LOG(ERR, "ERROR: Creating shared zone\n");
                return (-ENOMEM);


@@ -327,8 +327,8 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
        hw->shared = mz->addr;
        hw->sharedPA = mz->phys_addr;
 
        hw->shared = mz->addr;
        hw->sharedPA = mz->phys_addr;
 

-       /* 
-       * Allocate a memzone for Vmxnet3_RxQueueDesc - Vmxnet3_TxQueueDesc 
+       /*
+       * Allocate a memzone for Vmxnet3_RxQueueDesc - Vmxnet3_TxQueueDesc

        * on current socket
        */
        mz = gpa_zone_reserve(dev, size, "queuedesc",
        * on current socket
        */
        mz = gpa_zone_reserve(dev, size, "queuedesc",


@@ -729,7 +729,7 @@ vmxnet3_process_events(struct vmxnet3_hw *hw)
                return;
        }
 
                return;
        }
 

-       /* 
+       /*

        * ECR bits when written with 1b are cleared. Hence write
        * events back to ECR so that the bits which were set will be reset.
        */
        * ECR bits when written with 1b are cleared. Hence write
        * events back to ECR so that the bits which were set will be reset.
        */

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h
index ba1d2e5..3b9c7b0 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h
+++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_logs.h b/lib/librte_pmd_vmxnet3/vmxnet3_logs.h
index 9623063..82639a0 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3_logs.h
+++ b/lib/librte_pmd_vmxnet3/vmxnet3_logs.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ring.h b/lib/librte_pmd_vmxnet3/vmxnet3_ring.h
index 460c841..e2431a8 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3_ring.h
+++ b/lib/librte_pmd_vmxnet3/vmxnet3_ring.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -34,16 +34,16 @@
 #ifndef _VMXNET3_RING_H_
 #define _VMXNET3_RING_H_
 
 #ifndef _VMXNET3_RING_H_
 #define _VMXNET3_RING_H_
 

-#define VMXNET3_RX_CMDRING_SIZE        2
+#define VMXNET3_RX_CMDRING_SIZE 2

 
 

-#define VMXNET3_DRIVER_VERSION_NUM  0x01012000
+#define VMXNET3_DRIVER_VERSION_NUM 0x01012000

 
 /* Default ring size */
 
 /* Default ring size */

-#define VMXNET3_DEF_TX_RING_SIZE       512
-#define VMXNET3_DEF_RX_RING_SIZE       128
+#define VMXNET3_DEF_TX_RING_SIZE 512
+#define VMXNET3_DEF_RX_RING_SIZE 128

 
 

-#define VMXNET3_SUCCESS        0
-#define VMXNET3_FAIL      -1
+#define VMXNET3_SUCCESS 0
+#define VMXNET3_FAIL   -1

 
 #define TRUE  1
 #define FALSE 0
 
 #define TRUE  1
 #define FALSE 0


@@ -73,7 +73,7 @@ vmxnet3_cmd_ring_adv_next2fill(struct vmxnet3_cmd_ring *ring)
        if (unlikely(ring->next2fill == ring->size)) {
                ring->next2fill = 0;
                ring->gen = (uint8_t)(ring->gen ^ 1);
        if (unlikely(ring->next2fill == ring->size)) {
                ring->next2fill = 0;
                ring->gen = (uint8_t)(ring->gen ^ 1);

-       }
+       }

 }
 
 static inline void
 }
 
 static inline void


@@ -140,15 +140,15 @@ typedef struct vmxnet3_tx_ctx {
 } vmxnet3_tx_ctx_t;
 
 typedef struct vmxnet3_tx_queue {
 } vmxnet3_tx_ctx_t;
 
 typedef struct vmxnet3_tx_queue {

-       struct vmxnet3_hw                *hw;
+       struct vmxnet3_hw            *hw;

        struct vmxnet3_cmd_ring      cmd_ring;
        struct vmxnet3_comp_ring     comp_ring;
        uint32_t                     qid;
        struct Vmxnet3_TxQueueDesc   *shared;
        struct vmxnet3_txq_stats     stats;
        bool                         stopped;
        struct vmxnet3_cmd_ring      cmd_ring;
        struct vmxnet3_comp_ring     comp_ring;
        uint32_t                     qid;
        struct Vmxnet3_TxQueueDesc   *shared;
        struct vmxnet3_txq_stats     stats;
        bool                         stopped;

-       uint16_t                         queue_id;      /**< Device TX queue index. */
-       uint8_t                          port_id;       /**< Device port identifier. */
+       uint16_t                     queue_id;      /**< Device TX queue index. */
+       uint8_t                      port_id;       /**< Device port identifier. */

 } vmxnet3_tx_queue_t;
 
 
 } vmxnet3_tx_queue_t;
 
 


@@ -160,8 +160,8 @@ struct vmxnet3_rxq_stats {
 };
 
 typedef struct vmxnet3_rx_queue {
 };
 
 typedef struct vmxnet3_rx_queue {

-       struct rte_mempool                      *mp;
-       struct vmxnet3_hw               *hw;
+       struct rte_mempool          *mp;
+       struct vmxnet3_hw           *hw;

        struct vmxnet3_cmd_ring     cmd_ring[VMXNET3_RX_CMDRING_SIZE];
        struct vmxnet3_comp_ring    comp_ring;
        uint32_t                    qid1;
        struct vmxnet3_cmd_ring     cmd_ring[VMXNET3_RX_CMDRING_SIZE];
        struct vmxnet3_comp_ring    comp_ring;
        uint32_t                    qid1;


@@ -169,8 +169,8 @@ typedef struct vmxnet3_rx_queue {
        Vmxnet3_RxQueueDesc         *shared;
        struct vmxnet3_rxq_stats    stats;
        bool                        stopped;
        Vmxnet3_RxQueueDesc         *shared;
        struct vmxnet3_rxq_stats    stats;
        bool                        stopped;

-       uint16_t                                queue_id;      /**< Device RX queue index. */
-       uint8_t                         port_id;       /**< Device port identifier. */
+       uint16_t                    queue_id;      /**< Device RX queue index. */
+       uint8_t                     port_id;       /**< Device port identifier. */

 } vmxnet3_rx_queue_t;
 
 #endif /* _VMXNET3_RING_H_ */
 } vmxnet3_rx_queue_t;
 
 #endif /* _VMXNET3_RING_H_ */

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
index 1072654..cb711dc 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
+++ b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -184,7 +184,7 @@ vmxnet3_dev_rx_queue_release(void *rxq)
        vmxnet3_rx_queue_t *rq = rxq;
        if (rxq != NULL) {
                /* Release both the cmd_rings */
        vmxnet3_rx_queue_t *rq = rxq;
        if (rxq != NULL) {
                /* Release both the cmd_rings */

-               for (i = 0; i < VMXNET3_RX_CMDRING_SIZE; i++) 
+               for (i = 0; i < VMXNET3_RX_CMDRING_SIZE; i++)

                        vmxnet3_cmd_ring_release(&rq->cmd_ring[i]);
        }
 }
                        vmxnet3_cmd_ring_release(&rq->cmd_ring[i]);
        }
 }


@@ -231,9 +231,9 @@ vmxnet3_tq_tx_complete(vmxnet3_tx_queue_t *txq)
            mbuf = txq->cmd_ring.buf_info[tcd->txdIdx].m;
                if (unlikely(mbuf == NULL))
                        rte_panic("EOP desc does not point to a valid mbuf");
            mbuf = txq->cmd_ring.buf_info[tcd->txdIdx].m;
                if (unlikely(mbuf == NULL))
                        rte_panic("EOP desc does not point to a valid mbuf");

-               else 
+               else

                        rte_pktmbuf_free(mbuf);
                        rte_pktmbuf_free(mbuf);

-               
+

 
                txq->cmd_ring.buf_info[tcd->txdIdx].m = NULL;
                /* Mark the txd for which tcd was generated as completed */
 
                txq->cmd_ring.buf_info[tcd->txdIdx].m = NULL;
                /* Mark the txd for which tcd was generated as completed */


@@ -373,7 +373,7 @@ vmxnet3_post_rx_bufs(vmxnet3_rx_queue_t* rxq, uint8_t ring_id)
 
                if (ring->rid == 0) {
                         /* Usually: One HEAD type buf per packet
 
                if (ring->rid == 0) {
                         /* Usually: One HEAD type buf per packet

-                          * val = (ring->next2fill % rxq->hw->bufs_per_pkt) ? 
+                          * val = (ring->next2fill % rxq->hw->bufs_per_pkt) ?

                           * VMXNET3_RXD_BTYPE_BODY : VMXNET3_RXD_BTYPE_HEAD;
                           */
 
                           * VMXNET3_RXD_BTYPE_BODY : VMXNET3_RXD_BTYPE_HEAD;
                           */
 


@@ -623,13 +623,13 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
        PMD_INIT_FUNC_TRACE();
        hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        PMD_INIT_FUNC_TRACE();
        hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 

-       if ((tx_conf->txq_flags & ETH_TXQ_FLAGS_NOMULTSEGS) !=
+       if ((tx_conf->txq_flags & ETH_TXQ_FLAGS_NOMULTSEGS) !=

                ETH_TXQ_FLAGS_NOMULTSEGS) {
                PMD_INIT_LOG(ERR, "TX Multi segment not support yet\n");
                return (-EINVAL);
        }
 
                ETH_TXQ_FLAGS_NOMULTSEGS) {
                PMD_INIT_LOG(ERR, "TX Multi segment not support yet\n");
                return (-EINVAL);
        }
 

-       if ((tx_conf->txq_flags & ETH_TXQ_FLAGS_NOOFFLOADS) != 
+       if ((tx_conf->txq_flags & ETH_TXQ_FLAGS_NOOFFLOADS) !=

                ETH_TXQ_FLAGS_NOOFFLOADS) {
                PMD_INIT_LOG(ERR, "TX not support offload function yet\n");
                return (-EINVAL);
                ETH_TXQ_FLAGS_NOOFFLOADS) {
                PMD_INIT_LOG(ERR, "TX not support offload function yet\n");
                return (-EINVAL);


@@ -653,16 +653,16 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
 
     /* Tx vmxnet ring length should be between 512-4096 */
     if (nb_desc < VMXNET3_DEF_TX_RING_SIZE) {
 
     /* Tx vmxnet ring length should be between 512-4096 */
     if (nb_desc < VMXNET3_DEF_TX_RING_SIZE) {

-       PMD_INIT_LOG(ERR, "VMXNET3 Tx Ring Size Min: %u\n",
+               PMD_INIT_LOG(ERR, "VMXNET3 Tx Ring Size Min: %u\n",

                                        VMXNET3_DEF_TX_RING_SIZE);
                                        VMXNET3_DEF_TX_RING_SIZE);

-       return -EINVAL;
+               return -EINVAL;

        } else if (nb_desc > VMXNET3_TX_RING_MAX_SIZE) {
                PMD_INIT_LOG(ERR, "VMXNET3 Tx Ring Size Max: %u\n",
                                        VMXNET3_TX_RING_MAX_SIZE);
                return -EINVAL;
     } else {
        } else if (nb_desc > VMXNET3_TX_RING_MAX_SIZE) {
                PMD_INIT_LOG(ERR, "VMXNET3 Tx Ring Size Max: %u\n",
                                        VMXNET3_TX_RING_MAX_SIZE);
                return -EINVAL;
     } else {

-       ring->size = nb_desc;
-       ring->size &= ~VMXNET3_RING_SIZE_MASK;
+               ring->size = nb_desc;
+               ring->size &= ~VMXNET3_RING_SIZE_MASK;

     }
     comp_ring->size = ring->size;
 
     }
     comp_ring->size = ring->size;
 


@@ -690,11 +690,11 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
        /* comp_ring initialization */
     comp_ring->base = ring->base + ring->size;
     comp_ring->basePA = ring->basePA +
        /* comp_ring initialization */
     comp_ring->base = ring->base + ring->size;
     comp_ring->basePA = ring->basePA +

-                                       (sizeof(struct Vmxnet3_TxDesc) * ring->size);
+                               (sizeof(struct Vmxnet3_TxDesc) * ring->size);

 
     /* cmd_ring0 buf_info allocation */
        ring->buf_info = rte_zmalloc("tx_ring_buf_info",
 
     /* cmd_ring0 buf_info allocation */
        ring->buf_info = rte_zmalloc("tx_ring_buf_info",

-                                               ring->size * sizeof(vmxnet3_buf_info_t), CACHE_LINE_SIZE);
+                               ring->size * sizeof(vmxnet3_buf_info_t), CACHE_LINE_SIZE);

        if (ring->buf_info == NULL) {
                PMD_INIT_LOG(ERR, "ERROR: Creating tx_buf_info structure\n");
                return (-ENOMEM);
        if (ring->buf_info == NULL) {
                PMD_INIT_LOG(ERR, "ERROR: Creating tx_buf_info structure\n");
                return (-ENOMEM);

diff --git a/lib/librte_pmd_xenvirt/Makefile b/lib/librte_pmd_xenvirt/Makefile
index bf6d432..01bfcaa 100644 (file)
--- a/lib/librte_pmd_xenvirt/Makefile
+++ b/lib/librte_pmd_xenvirt/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
index 34c61d8..7c4d3fe 100644 (file)
--- a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
+++ b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -123,7 +123,7 @@ eth_xenvirt_rx(void *q, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                        break;
                }
                if (unlikely(virtqueue_enqueue_recv_refill(rxvq, new_mbuf))) {
                        break;
                }
                if (unlikely(virtqueue_enqueue_recv_refill(rxvq, new_mbuf))) {

-                       rte_pktmbuf_free_seg(new_mbuf);
+                       rte_pktmbuf_free_seg(new_mbuf);

                        break;
                }
        }
                        break;
                }
        }


@@ -420,7 +420,7 @@ gntalloc_vring_create(int queue_type, uint32_t size, int vtidx)
 
        if (queue_type == VTNET_RQ)
                rv = rte_snprintf(key_str, sizeof(key_str), DPDK_XENSTORE_PATH"%d"RXVRING_XENSTORE_STR, vtidx);
 
        if (queue_type == VTNET_RQ)
                rv = rte_snprintf(key_str, sizeof(key_str), DPDK_XENSTORE_PATH"%d"RXVRING_XENSTORE_STR, vtidx);

-       else 
+       else

                rv = rte_snprintf(key_str, sizeof(key_str), DPDK_XENSTORE_PATH"%d"TXVRING_XENSTORE_STR, vtidx);
        if (rv == -1 || xenstore_write(key_str, val_str) == -1) {
                gntfree(va, size, start_index);
                rv = rte_snprintf(key_str, sizeof(key_str), DPDK_XENSTORE_PATH"%d"TXVRING_XENSTORE_STR, vtidx);
        if (rv == -1 || xenstore_write(key_str, val_str) == -1) {
                gntfree(va, size, start_index);


@@ -484,10 +484,10 @@ virtio_queue_setup(struct rte_eth_dev *dev, int queue_type)
        memset(vq->vq_ring_virt_mem, 0, vq->vq_ring_size);
        vr = &vq->vq_ring;
        vring_init(vr, vq_size, vq->vq_ring_virt_mem, vq->vq_alignment);
        memset(vq->vq_ring_virt_mem, 0, vq->vq_ring_size);
        vr = &vq->vq_ring;
        vring_init(vr, vq_size, vq->vq_ring_virt_mem, vq->vq_alignment);

-       /* 
-        * Locally maintained last consumed index, this idex trails 
-        * vq_ring.used->idx.
-        */
+       /*
+        * Locally maintained last consumed index, this idex trails
+        * vq_ring.used->idx.
+        */

        vq->vq_used_cons_idx = 0;
        vq->vq_desc_head_idx = 0;
        vq->vq_free_cnt = vq->vq_nentries;
        vq->vq_used_cons_idx = 0;
        vq->vq_desc_head_idx = 0;
        vq->vq_free_cnt = vq->vq_nentries;


@@ -542,7 +542,7 @@ static struct eth_dev_ops ops = {
 };
 
 
 };
 
 

-static int 
+static int

 rte_eth_xenvirt_parse_args(struct xenvirt_dict *dict,
                        const char *name, const char *params)
 {
 rte_eth_xenvirt_parse_args(struct xenvirt_dict *dict,
                        const char *name, const char *params)
 {

diff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.h b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.h
index acdeb30..fc15a63 100644 (file)
--- a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.h
+++ b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_xenvirt/rte_mempool_gntalloc.c b/lib/librte_pmd_xenvirt/rte_mempool_gntalloc.c
index c1c2db0..3a650e8 100644 (file)
--- a/lib/librte_pmd_xenvirt/rte_mempool_gntalloc.c
+++ b/lib/librte_pmd_xenvirt/rte_mempool_gntalloc.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -89,10 +89,10 @@ _create_mempool(const char *name, unsigned elt_num, unsigned elt_size,
        ssize_t sz, usz; /* usz: unused size */
        /*
         * for each page allocated through xen_gntalloc driver,
        ssize_t sz, usz; /* usz: unused size */
        /*
         * for each page allocated through xen_gntalloc driver,

-        * gref_arr:stores grant references,
-        * pa_arr: stores physical address,
-        * gnt_arr: stores all meta dat
-        */
+        * gref_arr:stores grant references,
+        * pa_arr: stores physical address,
+        * gnt_arr: stores all meta dat
+        */

        uint32_t *gref_arr = NULL;
        phys_addr_t *pa_arr = NULL;
        struct _gntarr *gnt_arr = NULL;
        uint32_t *gref_arr = NULL;
        phys_addr_t *pa_arr = NULL;
        struct _gntarr *gnt_arr = NULL;


@@ -159,8 +159,8 @@ _create_mempool(const char *name, unsigned elt_num, unsigned elt_size,
        }
 
        /*
        }
 
        /*

-        * Check that allocated size is big enough to hold elt_num
-        * objects and a calcualte how many bytes are actually required.
+        * Check that allocated size is big enough to hold elt_num
+        * objects and a calcualte how many bytes are actually required.

         */
        usz = rte_mempool_xmem_usage(va, elt_num, objsz.total_size, pa_arr, pg_num, pg_shift);
        if (usz < 0) {
         */
        usz = rte_mempool_xmem_usage(va, elt_num, objsz.total_size, pa_arr, pg_num, pg_shift);
        if (usz < 0) {


@@ -186,7 +186,7 @@ _create_mempool(const char *name, unsigned elt_num, unsigned elt_size,
                                        /* shouldn't fail here */
                                        RTE_LOG(ERR, PMD, "va=%p pa=%p index=%p %s\n",
                                                gnt_arr[i].va,
                                        /* shouldn't fail here */
                                        RTE_LOG(ERR, PMD, "va=%p pa=%p index=%p %s\n",
                                                gnt_arr[i].va,

-                                               (void *)gnt_arr[i].pa, 
+                                               (void *)gnt_arr[i].pa,

                                                (void *)arg.index, strerror(errno));
                                        rte_panic("gntdealloc failed when freeing pages\n");
                                }
                                                (void *)arg.index, strerror(errno));
                                        rte_panic("gntdealloc failed when freeing pages\n");
                                }


@@ -195,7 +195,7 @@ _create_mempool(const char *name, unsigned elt_num, unsigned elt_size,
                        rpg_num = (sz - usz) >> pg_shift;
                } else
                        rpg_num = pg_num;
                        rpg_num = (sz - usz) >> pg_shift;
                } else
                        rpg_num = pg_num;

-                       
+

                mp = rte_mempool_xmem_create(name, elt_num, elt_size,
                                cache_size, private_data_size,
                                mp_init, mp_init_arg,
                mp = rte_mempool_xmem_create(name, elt_num, elt_size,
                                cache_size, private_data_size,
                                mp_init, mp_init_arg,


@@ -216,7 +216,7 @@ _create_mempool(const char *name, unsigned elt_num, unsigned elt_size,
        if (mp == NULL) {
                i = pg_num;
                goto mmap_failed;
        if (mp == NULL) {
                i = pg_num;
                goto mmap_failed;

-       } 
+       }

 
 /*
  * unmap only, without deallocate grant reference.
 
 /*
  * unmap only, without deallocate grant reference.


@@ -240,8 +240,8 @@ out:
                        free(pa_arr);
 
                /* some gref has already been de-allocated from the list in the driver,
                        free(pa_arr);
 
                /* some gref has already been de-allocated from the list in the driver,

-                * so dealloc one by one, and it is safe to deallocate twice 
-                */
+                * so dealloc one by one, and it is safe to deallocate twice
+                */

                if (orig_va) {
                        for (i = 0; i < pg_num; i++) {
                                arg.index = start_index + i * pg_sz;
                if (orig_va) {
                        for (i = 0; i < pg_num; i++) {
                                arg.index = start_index + i * pg_sz;

diff --git a/lib/librte_pmd_xenvirt/rte_xen_lib.c b/lib/librte_pmd_xenvirt/rte_xen_lib.c
index 1baa7e4..493908a 100644 (file)
--- a/lib/librte_pmd_xenvirt/rte_xen_lib.c
+++ b/lib/librte_pmd_xenvirt/rte_xen_lib.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -253,7 +253,7 @@ gntfree(void *va, size_t sz, uint64_t start_index)
        }
 }
 
        }
 }
 

-static int 
+static int

 xenstore_cleanup(void)
 {
        char store_path[PATH_MAX] = {0};
 xenstore_cleanup(void)
 {
        char store_path[PATH_MAX] = {0};

diff --git a/lib/librte_pmd_xenvirt/rte_xen_lib.h b/lib/librte_pmd_xenvirt/rte_xen_lib.h
index e555893..0ba7148 100644 (file)
--- a/lib/librte_pmd_xenvirt/rte_xen_lib.h
+++ b/lib/librte_pmd_xenvirt/rte_xen_lib.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -66,10 +66,10 @@
 
 #define MAP_FLAG       0xA5
 
 
 #define MAP_FLAG       0xA5
 

-#define RTE_ETH_XENVIRT_PAIRS_DELIM    ';'
-#define RTE_ETH_XENVIRT_KEY_VALUE_DELIM        '='
-#define RTE_ETH_XENVIRT_MAX_ARGS       1
-#define RTE_ETH_XENVIRT_MAC_PARAM      "mac"
+#define RTE_ETH_XENVIRT_PAIRS_DELIM ';'
+#define RTE_ETH_XENVIRT_KEY_VALUE_DELIM '='
+#define RTE_ETH_XENVIRT_MAX_ARGS 1
+#define RTE_ETH_XENVIRT_MAC_PARAM "mac"

 struct xenvirt_dict {
        uint8_t addr_valid;
        struct ether_addr addr;
 struct xenvirt_dict {
        uint8_t addr_valid;
        struct ether_addr addr;

diff --git a/lib/librte_pmd_xenvirt/virtio_logs.h b/lib/librte_pmd_xenvirt/virtio_logs.h
index 2591c6a..d6c33f7 100644 (file)
--- a/lib/librte_pmd_xenvirt/virtio_logs.h
+++ b/lib/librte_pmd_xenvirt/virtio_logs.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_pmd_xenvirt/virtqueue.h b/lib/librte_pmd_xenvirt/virtqueue.h
index 3844448..81cd938 100644 (file)
--- a/lib/librte_pmd_xenvirt/virtqueue.h
+++ b/lib/librte_pmd_xenvirt/virtqueue.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -167,7 +167,7 @@ vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx)
                dp = &vq->vq_ring.desc[dp->next];
        }
        dxp->ndescs = 0;
                dp = &vq->vq_ring.desc[dp->next];
        }
        dxp->ndescs = 0;

-       
+

        /*
         * We must append the existing free chain, if any, to the end of
         * newly freed chain. If the virtqueue was completely used, then
        /*
         * We must append the existing free chain, if any, to the end of
         * newly freed chain. If the virtqueue was completely used, then


@@ -221,7 +221,7 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie)
                return -ENOSPC;
        if (unlikely(txvq->vq_free_cnt < needed))
                return -EMSGSIZE;
                return -ENOSPC;
        if (unlikely(txvq->vq_free_cnt < needed))
                return -EMSGSIZE;

-       if (unlikely(head_idx >= txvq->vq_nentries)) 
+       if (unlikely(head_idx >= txvq->vq_nentries))

                return -EFAULT;
 
        dxp = &txvq->vq_descx[idx];
                return -EFAULT;
 
        dxp = &txvq->vq_descx[idx];


@@ -229,7 +229,7 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie)
        dxp->ndescs = needed;
 
        start_dp = txvq->vq_ring.desc;
        dxp->ndescs = needed;
 
        start_dp = txvq->vq_ring.desc;

-       start_dp[idx].addr  = 0; 
+       start_dp[idx].addr  = 0;

 /*
  * TODO: save one desc here?
  */
 /*
  * TODO: save one desc here?
  */


@@ -262,7 +262,7 @@ virtqueue_dequeue_burst(struct virtqueue *vq, struct rte_mbuf **rx_pkts, uint32_
                desc_idx = (uint16_t) uep->id;
                cookie = (struct rte_mbuf *)vq->vq_descx[desc_idx].cookie;
                if (unlikely(cookie == NULL)) {
                desc_idx = (uint16_t) uep->id;
                cookie = (struct rte_mbuf *)vq->vq_descx[desc_idx].cookie;
                if (unlikely(cookie == NULL)) {

-                       PMD_DRV_LOG(ERR, "vring descriptor with no mbuf cookie at %u\n", 
+                       PMD_DRV_LOG(ERR, "vring descriptor with no mbuf cookie at %u\n",

                                vq->vq_used_cons_idx);
                        RTE_LOG(ERR, PMD, "%s: inconsistent (%u, %u)\n", __func__, used_idx , desc_idx);
                        break;
                                vq->vq_used_cons_idx);
                        RTE_LOG(ERR, PMD, "%s: inconsistent (%u, %u)\n", __func__, used_idx , desc_idx);
                        break;

diff --git a/lib/librte_power/Makefile b/lib/librte_power/Makefile
index 2d6ef5d..6185812 100644 (file)
--- a/lib/librte_power/Makefile
+++ b/lib/librte_power/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_power/rte_power.c b/lib/librte_power/rte_power.c
index b3afa2f..a2d9e0c 100644 (file)
--- a/lib/librte_power/rte_power.c
+++ b/lib/librte_power/rte_power.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -49,7 +49,7 @@
 #ifdef RTE_LIBRTE_POWER_DEBUG
 #define POWER_DEBUG_TRACE(fmt, args...) do { \
                RTE_LOG(ERR, POWER, "%s: " fmt, __func__, ## args); \
 #ifdef RTE_LIBRTE_POWER_DEBUG
 #define POWER_DEBUG_TRACE(fmt, args...) do { \
                RTE_LOG(ERR, POWER, "%s: " fmt, __func__, ## args); \

-       } while (0) 
+       } while (0)

 #else
 #define POWER_DEBUG_TRACE(fmt, args...)
 #endif
 #else
 #define POWER_DEBUG_TRACE(fmt, args...)
 #endif


@@ -436,7 +436,7 @@ fail:
 
        return -1;
 }
 
        return -1;
 }

- 
+

 uint32_t
 rte_power_freqs(unsigned lcore_id, uint32_t *freqs, uint32_t num)
 {
 uint32_t
 rte_power_freqs(unsigned lcore_id, uint32_t *freqs, uint32_t num)
 {


@@ -456,7 +456,7 @@ rte_power_freqs(unsigned lcore_id, uint32_t *freqs, uint32_t num)
 
        return pi->nb_freqs;
 }
 
        return pi->nb_freqs;
 }

- 
+

 uint32_t
 rte_power_get_freq(unsigned lcore_id)
 {
 uint32_t
 rte_power_get_freq(unsigned lcore_id)
 {


@@ -478,7 +478,7 @@ rte_power_set_freq(unsigned lcore_id, uint32_t index)
 
        return set_freq_internal(&(lcore_power_info[lcore_id]), index);
 }
 
        return set_freq_internal(&(lcore_power_info[lcore_id]), index);
 }

- 
+

 int
 rte_power_freq_down(unsigned lcore_id)
 {
 int
 rte_power_freq_down(unsigned lcore_id)
 {


@@ -496,7 +496,7 @@ rte_power_freq_down(unsigned lcore_id)
        /* Frequencies in the array are from high to low. */
        return set_freq_internal(pi, pi->curr_idx + 1);
 }
        /* Frequencies in the array are from high to low. */
        return set_freq_internal(pi, pi->curr_idx + 1);
 }

- 
+

 int
 rte_power_freq_up(unsigned lcore_id)
 {
 int
 rte_power_freq_up(unsigned lcore_id)
 {


@@ -514,7 +514,7 @@ rte_power_freq_up(unsigned lcore_id)
        /* Frequencies in the array are from high to low. */
        return set_freq_internal(pi, pi->curr_idx - 1);
 }
        /* Frequencies in the array are from high to low. */
        return set_freq_internal(pi, pi->curr_idx - 1);
 }

- 
+

 int
 rte_power_freq_max(unsigned lcore_id)
 {
 int
 rte_power_freq_max(unsigned lcore_id)
 {


@@ -526,7 +526,7 @@ rte_power_freq_max(unsigned lcore_id)
        /* Frequencies in the array are from high to low. */
        return set_freq_internal(&lcore_power_info[lcore_id], 0);
 }
        /* Frequencies in the array are from high to low. */
        return set_freq_internal(&lcore_power_info[lcore_id], 0);
 }

- 
+

 int
 rte_power_freq_min(unsigned lcore_id)
 {
 int
 rte_power_freq_min(unsigned lcore_id)
 {

diff --git a/lib/librte_power/rte_power.h b/lib/librte_power/rte_power.h
index c85fe43..9c1419e 100644 (file)
--- a/lib/librte_power/rte_power.h
+++ b/lib/librte_power/rte_power.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -36,7 +36,7 @@
 
 /**
  * @file
 
 /**
  * @file

- * RTE Power Management 
+ * RTE Power Management

  */
 
 #include <rte_common.h>
  */
 
 #include <rte_common.h>


@@ -50,7 +50,7 @@ extern "C" {
 
 #define RTE_POWER_INVALID_FREQ_INDEX (~0)
 
 
 #define RTE_POWER_INVALID_FREQ_INDEX (~0)
 

-/** 
+/**

  * Initialize power management for a specific lcore. It will check and set the
  * governor to userspace for the lcore, get the available frequencies, and
  * prepare to set new lcore frequency.
  * Initialize power management for a specific lcore. It will check and set the
  * governor to userspace for the lcore, get the available frequencies, and
  * prepare to set new lcore frequency.


@@ -58,7 +58,7 @@ extern "C" {
  * @param lcore_id
  *  lcore id.
  *
  * @param lcore_id
  *  lcore id.
  *

- * @return 
+ * @return

  *  - 0 on success.
  *  - Negative on error.
  */
  *  - 0 on success.
  *  - Negative on error.
  */


@@ -71,13 +71,13 @@ int rte_power_init(unsigned lcore_id);
  * @param lcore_id
  *  lcore id.
  *
  * @param lcore_id
  *  lcore id.
  *

- * @return 
+ * @return

  *  - 0 on success.
  *  - Negative on error.
  */
 int rte_power_exit(unsigned lcore_id);
 
  *  - 0 on success.
  *  - Negative on error.
  */
 int rte_power_exit(unsigned lcore_id);
 

-/** 
+/**

  * Get the available frequencies of a specific lcore. The return value will be
  * the minimal one of the total number of available frequencies and the number
  * of buffer. The index of available frequencies used in other interfaces
  * Get the available frequencies of a specific lcore. The return value will be
  * the minimal one of the total number of available frequencies and the number
  * of buffer. The index of available frequencies used in other interfaces


@@ -96,7 +96,7 @@ int rte_power_exit(unsigned lcore_id);
  */
 uint32_t rte_power_freqs(unsigned lcore_id, uint32_t *freqs, uint32_t num);
 
  */
 uint32_t rte_power_freqs(unsigned lcore_id, uint32_t *freqs, uint32_t num);
 

-/** 
+/**

  * Return the current index of available frequencies of a specific lcore. It
  * will return 'RTE_POWER_INVALID_FREQ_INDEX = (~0)' if error.
  * It should be protected outside of this function for threadsafe.
  * Return the current index of available frequencies of a specific lcore. It
  * will return 'RTE_POWER_INVALID_FREQ_INDEX = (~0)' if error.
  * It should be protected outside of this function for threadsafe.


@@ -104,12 +104,12 @@ uint32_t rte_power_freqs(unsigned lcore_id, uint32_t *freqs, uint32_t num);
  * @param lcore_id
  *  lcore id.
  *
  * @param lcore_id
  *  lcore id.
  *

- * @return 
+ * @return

  *  The current index of available frequencies.
  */
 uint32_t rte_power_get_freq(unsigned lcore_id);
 
  *  The current index of available frequencies.
  */
 uint32_t rte_power_get_freq(unsigned lcore_id);
 

-/** 
+/**

  * Set the new frequency for a specific lcore by indicating the index of
  * available frequencies.
  * It should be protected outside of this function for threadsafe.
  * Set the new frequency for a specific lcore by indicating the index of
  * available frequencies.
  * It should be protected outside of this function for threadsafe.


@@ -126,7 +126,7 @@ uint32_t rte_power_get_freq(unsigned lcore_id);
  */
 int rte_power_set_freq(unsigned lcore_id, uint32_t index);
 
  */
 int rte_power_set_freq(unsigned lcore_id, uint32_t index);
 

-/** 
+/**

  * Scale up the frequency of a specific lcore according to the available
  * frequencies.
  * It should be protected outside of this function for threadsafe.
  * Scale up the frequency of a specific lcore according to the available
  * frequencies.
  * It should be protected outside of this function for threadsafe.


@@ -141,7 +141,7 @@ int rte_power_set_freq(unsigned lcore_id, uint32_t index);
  */
 int rte_power_freq_up(unsigned lcore_id);
 
  */
 int rte_power_freq_up(unsigned lcore_id);
 

-/** 
+/**

  * Scale down the frequency of a specific lcore according to the available
  * frequencies.
  * It should be protected outside of this function for threadsafe.
  * Scale down the frequency of a specific lcore according to the available
  * frequencies.
  * It should be protected outside of this function for threadsafe.


@@ -154,9 +154,9 @@ int rte_power_freq_up(unsigned lcore_id);
  *  - 0 on success without frequency chnaged.
  *  - Negative on error.
  */
  *  - 0 on success without frequency chnaged.
  *  - Negative on error.
  */

-int rte_power_freq_down(unsigned lcore_id); 
+int rte_power_freq_down(unsigned lcore_id);

 
 

-/** 
+/**

  * Scale up the frequency of a specific lcore to the highest according to the
  * available frequencies.
  * It should be protected outside of this function for threadsafe.
  * Scale up the frequency of a specific lcore to the highest according to the
  * available frequencies.
  * It should be protected outside of this function for threadsafe.


@@ -171,7 +171,7 @@ int rte_power_freq_down(unsigned lcore_id);
  */
 int rte_power_freq_max(unsigned lcore_id);
 
  */
 int rte_power_freq_max(unsigned lcore_id);
 

-/** 
+/**

  * Scale down the frequency of a specific lcore to the lowest according to the
  * available frequencies.
  * It should be protected outside of this function for threadsafe.
  * Scale down the frequency of a specific lcore to the lowest according to the
  * available frequencies.
  * It should be protected outside of this function for threadsafe.

diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile
index 64c3460..550507d 100644 (file)
--- a/lib/librte_ring/Makefile
+++ b/lib/librte_ring/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c
index 3a919b0..2fe4024 100644 (file)
--- a/lib/librte_ring/rte_ring.c
+++ b/lib/librte_ring/rte_ring.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -276,10 +276,10 @@ rte_ring_list_dump(FILE *f)
        struct rte_ring_list *ring_list;
 
        /* check that we have an initialised tail queue */
        struct rte_ring_list *ring_list;
 
        /* check that we have an initialised tail queue */

-       if ((ring_list = 
+       if ((ring_list =

             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_RING, rte_ring_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_RING, rte_ring_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;

-               return; 
+               return;

        }
 
        rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK);
        }
 
        rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK);


@@ -299,14 +299,14 @@ rte_ring_lookup(const char *name)
        struct rte_ring_list *ring_list;
 
        /* check that we have an initialized tail queue */
        struct rte_ring_list *ring_list;
 
        /* check that we have an initialized tail queue */

-       if ((ring_list = 
+       if ((ring_list =

             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_RING, rte_ring_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;
             RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_RING, rte_ring_list)) == NULL) {
                rte_errno = E_RTE_NO_TAILQ;

-               return NULL;    
+               return NULL;

        }
 
        rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK);
        }
 
        rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK);

-       
+

        TAILQ_FOREACH(r, ring_list, next) {
                if (strncmp(name, r->name, RTE_RING_NAMESIZE) == 0)
                        break;
        TAILQ_FOREACH(r, ring_list, next) {
                if (strncmp(name, r->name, RTE_RING_NAMESIZE) == 0)
                        break;

diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
index da54e34..4f3e20f 100644 (file)
--- a/lib/librte_ring/rte_ring.h
+++ b/lib/librte_ring/rte_ring.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -171,8 +171,8 @@ struct rte_ring {
 #endif
 
        void * ring[0] __rte_cache_aligned; /**< Memory space of ring starts here.
 #endif
 
        void * ring[0] __rte_cache_aligned; /**< Memory space of ring starts here.

-                                                                                * not volatile so need to be careful
-                                                                                * about compiler re-ordering */
+                                            * not volatile so need to be careful
+                                            * about compiler re-ordering */

 };
 
 #define RING_F_SP_ENQ 0x0001 /**< The default enqueue is "single-producer". */
 };
 
 #define RING_F_SP_ENQ 0x0001 /**< The default enqueue is "single-producer". */


@@ -325,7 +325,7 @@ int rte_ring_set_water_mark(struct rte_ring *r, unsigned count);
  */
 void rte_ring_dump(FILE *f, const struct rte_ring *r);
 
  */
 void rte_ring_dump(FILE *f, const struct rte_ring *r);
 

-/* the actual enqueue of pointers on the ring. 
+/* the actual enqueue of pointers on the ring.

  * Placed here since identical code needed in both
  * single and multi producer enqueue functions */
 #define ENQUEUE_PTRS() do { \
  * Placed here since identical code needed in both
  * single and multi producer enqueue functions */
 #define ENQUEUE_PTRS() do { \


@@ -351,7 +351,7 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r);
        } \
 } while(0)
 
        } \
 } while(0)
 

-/* the actual copy of pointers on the ring to obj_table. 
+/* the actual copy of pointers on the ring to obj_table.

  * Placed here since identical code needed in both
  * single and multi consumer dequeue functions */
 #define DEQUEUE_PTRS() do { \
  * Placed here since identical code needed in both
  * single and multi consumer dequeue functions */
 #define DEQUEUE_PTRS() do { \


@@ -1136,9 +1136,9 @@ rte_ring_enqueue_burst(struct rte_ring *r, void * const *obj_table,
                      unsigned n)
 {
        if (r->prod.sp_enqueue)
                      unsigned n)
 {
        if (r->prod.sp_enqueue)

-               return  rte_ring_sp_enqueue_burst(r, obj_table, n);
+               return rte_ring_sp_enqueue_burst(r, obj_table, n);

        else
        else

-               return  rte_ring_mp_enqueue_burst(r, obj_table, n);
+               return rte_ring_mp_enqueue_burst(r, obj_table, n);

 }
 
 /**
 }
 
 /**

diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile
index 42d8056..1a25b21 100644 (file)
--- a/lib/librte_sched/Makefile
+++ b/lib/librte_sched/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_sched/rte_approx.c b/lib/librte_sched/rte_approx.c
index aa51185..771c951 100644 (file)
--- a/lib/librte_sched/rte_approx.c
+++ b/lib/librte_sched/rte_approx.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -35,8 +35,8 @@
 
 #include "rte_approx.h"
 
 
 #include "rte_approx.h"
 

-/* 
- * Based on paper "Approximating Rational Numbers by Fractions" by Michal 
+/*
+ * Based on paper "Approximating Rational Numbers by Fractions" by Michal

  * Forisek forisek@dcs.fmph.uniba.sk
  *
  * Given a rational number alpha with 0 < alpha < 1 and a precision d, the goal
  * Forisek forisek@dcs.fmph.uniba.sk
  *
  * Given a rational number alpha with 0 < alpha < 1 and a precision d, the goal


@@ -47,7 +47,7 @@
  */
 
 /* fraction comparison: compare (a/b) and (c/d) */
  */
 
 /* fraction comparison: compare (a/b) and (c/d) */

-static inline uint32_t 
+static inline uint32_t

 less(uint32_t a, uint32_t b, uint32_t c, uint32_t d)
 {
        return (a*d < b*c);
 less(uint32_t a, uint32_t b, uint32_t c, uint32_t d)
 {
        return (a*d < b*c);


@@ -60,8 +60,8 @@ less_or_equal(uint32_t a, uint32_t b, uint32_t c, uint32_t d)
 }
 
 /* check whether a/b is a valid approximation */
 }
 
 /* check whether a/b is a valid approximation */

-static inline uint32_t 
-matches(uint32_t a, uint32_t b, 
+static inline uint32_t
+matches(uint32_t a, uint32_t b,

        uint32_t alpha_num, uint32_t d_num, uint32_t denum)
 {
        if (less_or_equal(a, b, alpha_num - d_num, denum))
        uint32_t alpha_num, uint32_t d_num, uint32_t denum)
 {
        if (less_or_equal(a, b, alpha_num - d_num, denum))


@@ -69,44 +69,44 @@ matches(uint32_t a, uint32_t b,
 
        if (less(a ,b, alpha_num + d_num, denum))
                return 1;
 
        if (less(a ,b, alpha_num + d_num, denum))
                return 1;

-       
+

        return 0;
 }
 
        return 0;
 }
 

-static inline void 
-find_exact_solution_left(uint32_t p_a, uint32_t q_a, uint32_t p_b, uint32_t q_b, 
+static inline void
+find_exact_solution_left(uint32_t p_a, uint32_t q_a, uint32_t p_b, uint32_t q_b,

        uint32_t alpha_num, uint32_t d_num, uint32_t denum, uint32_t *p, uint32_t *q)
 {
        uint32_t k_num = denum * p_b - (alpha_num + d_num) * q_b;
        uint32_t k_denum = (alpha_num + d_num) * q_a - denum * p_a;
        uint32_t k = (k_num / k_denum) + 1;
        uint32_t alpha_num, uint32_t d_num, uint32_t denum, uint32_t *p, uint32_t *q)
 {
        uint32_t k_num = denum * p_b - (alpha_num + d_num) * q_b;
        uint32_t k_denum = (alpha_num + d_num) * q_a - denum * p_a;
        uint32_t k = (k_num / k_denum) + 1;

-       
+

        *p = p_b + k * p_a;
        *q = q_b + k * q_a;
 }
 
 static inline void
 find_exact_solution_right(uint32_t p_a, uint32_t q_a, uint32_t p_b, uint32_t q_b,
        *p = p_b + k * p_a;
        *q = q_b + k * q_a;
 }
 
 static inline void
 find_exact_solution_right(uint32_t p_a, uint32_t q_a, uint32_t p_b, uint32_t q_b,

-       uint32_t alpha_num, uint32_t d_num, uint32_t denum, uint32_t *p, uint32_t *q) 
+       uint32_t alpha_num, uint32_t d_num, uint32_t denum, uint32_t *p, uint32_t *q)

 {
        uint32_t k_num = - denum * p_b + (alpha_num - d_num) * q_b;
        uint32_t k_denum = - (alpha_num - d_num) * q_a + denum * p_a;
        uint32_t k = (k_num / k_denum) + 1;
 {
        uint32_t k_num = - denum * p_b + (alpha_num - d_num) * q_b;
        uint32_t k_denum = - (alpha_num - d_num) * q_a + denum * p_a;
        uint32_t k = (k_num / k_denum) + 1;

-       
+

        *p = p_b + k * p_a;
        *q = q_b + k * q_a;
 }
 
        *p = p_b + k * p_a;
        *q = q_b + k * q_a;
 }
 

-static int 
+static int

 find_best_rational_approximation(uint32_t alpha_num, uint32_t d_num, uint32_t denum, uint32_t *p, uint32_t *q)
 {
        uint32_t p_a, q_a, p_b, q_b;
 find_best_rational_approximation(uint32_t alpha_num, uint32_t d_num, uint32_t denum, uint32_t *p, uint32_t *q)
 {
        uint32_t p_a, q_a, p_b, q_b;

-       
+

        /* check assumptions on the inputs */
        if (!((0 < d_num) && (d_num < alpha_num) && (alpha_num < denum) && (d_num + alpha_num < denum))) {
                return -1;
        }
        /* check assumptions on the inputs */
        if (!((0 < d_num) && (d_num < alpha_num) && (alpha_num < denum) && (d_num + alpha_num < denum))) {
                return -1;
        }

-       
+

        /* set initial bounds for the search */
        p_a = 0;
        q_a = 1;
        /* set initial bounds for the search */
        p_a = 0;
        q_a = 1;


@@ -117,12 +117,12 @@ find_best_rational_approximation(uint32_t alpha_num, uint32_t d_num, uint32_t de
                uint32_t new_p_a, new_q_a, new_p_b, new_q_b;
                uint32_t x_num, x_denum, x;
                int aa, bb;
                uint32_t new_p_a, new_q_a, new_p_b, new_q_b;
                uint32_t x_num, x_denum, x;
                int aa, bb;

-               
+

                /* compute the number of steps to the left */
                x_num = denum * p_b - alpha_num * q_b;
                x_denum = - denum * p_a + alpha_num * q_a;
                x = (x_num + x_denum - 1) / x_denum; /* x = ceil(x_num / x_denum) */
                /* compute the number of steps to the left */
                x_num = denum * p_b - alpha_num * q_b;
                x_denum = - denum * p_a + alpha_num * q_a;
                x = (x_num + x_denum - 1) / x_denum; /* x = ceil(x_num / x_denum) */

-               
+

                /* check whether we have a valid approximation */
                aa = matches(p_b + x * p_a, q_b + x * q_a, alpha_num, d_num, denum);
                bb = matches(p_b + (x-1) * p_a, q_b + (x - 1) * q_a, alpha_num, d_num, denum);
                /* check whether we have a valid approximation */
                aa = matches(p_b + x * p_a, q_b + x * q_a, alpha_num, d_num, denum);
                bb = matches(p_b + (x-1) * p_a, q_b + (x - 1) * q_a, alpha_num, d_num, denum);


@@ -130,7 +130,7 @@ find_best_rational_approximation(uint32_t alpha_num, uint32_t d_num, uint32_t de
                        find_exact_solution_left(p_a, q_a, p_b, q_b, alpha_num, d_num, denum, p, q);
                        return 0;
                }
                        find_exact_solution_left(p_a, q_a, p_b, q_b, alpha_num, d_num, denum, p, q);
                        return 0;
                }

-               
+

                /* update the interval */
                new_p_a = p_b + (x - 1) * p_a ;
                new_q_a = q_b + (x - 1) * q_a;
                /* update the interval */
                new_p_a = p_b + (x - 1) * p_a ;
                new_q_a = q_b + (x - 1) * q_a;


@@ -154,13 +154,13 @@ find_best_rational_approximation(uint32_t alpha_num, uint32_t d_num, uint32_t de
                        find_exact_solution_right(p_a, q_a, p_b, q_b, alpha_num, d_num, denum, p, q);
                        return 0;
                 }
                        find_exact_solution_right(p_a, q_a, p_b, q_b, alpha_num, d_num, denum, p, q);
                        return 0;
                 }

-                
+

                /* update the interval */
                new_p_a = p_b + (x - 1) * p_a;
                new_q_a = q_b + (x - 1) * q_a;
                new_p_b = p_b + x * p_a;
                new_q_b = q_b + x * q_a;
                /* update the interval */
                new_p_a = p_b + (x - 1) * p_a;
                new_q_a = q_b + (x - 1) * q_a;
                new_p_b = p_b + x * p_a;
                new_q_b = q_b + x * q_a;

-               
+

                p_a = new_p_a;
                q_a = new_q_a;
                p_b = new_p_b;
                p_a = new_p_a;
                q_a = new_q_a;
                p_b = new_p_b;


@@ -171,16 +171,16 @@ find_best_rational_approximation(uint32_t alpha_num, uint32_t d_num, uint32_t de
 int rte_approx(double alpha, double d, uint32_t *p, uint32_t *q)
 {
        uint32_t alpha_num, d_num, denum;
 int rte_approx(double alpha, double d, uint32_t *p, uint32_t *q)
 {
        uint32_t alpha_num, d_num, denum;

-       
+

        /* Check input arguments */
        if (!((0.0 < d) && (d < alpha) && (alpha < 1.0))) {
                return -1;
        }
        /* Check input arguments */
        if (!((0.0 < d) && (d < alpha) && (alpha < 1.0))) {
                return -1;
        }

-       
+

        if ((p == NULL) || (q == NULL)) {
                return -2;
        }
        if ((p == NULL) || (q == NULL)) {
                return -2;
        }

-       
+

        /* Compute alpha_num, d_num and denum */
        denum = 1;
        while (d < 1) {
        /* Compute alpha_num, d_num and denum */
        denum = 1;
        while (d < 1) {


@@ -190,7 +190,7 @@ int rte_approx(double alpha, double d, uint32_t *p, uint32_t *q)
        }
        alpha_num = (uint32_t) alpha;
        d_num = (uint32_t) d;
        }
        alpha_num = (uint32_t) alpha;
        d_num = (uint32_t) d;

-       
+

        /* Perform approximation */
        /* Perform approximation */

-       return find_best_rational_approximation(alpha_num, d_num, denum, p, q); 
+       return find_best_rational_approximation(alpha_num, d_num, denum, p, q);

 }
 }

diff --git a/lib/librte_sched/rte_approx.h b/lib/librte_sched/rte_approx.h
index 3fdae3a..09f30a8 100644 (file)
--- a/lib/librte_sched/rte_approx.h
+++ b/lib/librte_sched/rte_approx.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -45,7 +45,7 @@ extern "C" {
  * Given a rational number alpha with 0 < alpha < 1 and a precision d, the goal
  * is to find positive integers p, q such that alpha - d < p/q < alpha + d, and
  * q is minimal.
  * Given a rational number alpha with 0 < alpha < 1 and a precision d, the goal
  * is to find positive integers p, q such that alpha - d < p/q < alpha + d, and
  * q is minimal.

- * 
+ *

  ***/
 
 #include <stdint.h>
  ***/
 
 #include <stdint.h>


@@ -58,7 +58,7 @@ extern "C" {
  * @param d
  *   Precision for the rational approximation
  * @param p
  * @param d
  *   Precision for the rational approximation
  * @param p

- *   Pointer to pre-allocated space where the numerator of the rational 
+ *   Pointer to pre-allocated space where the numerator of the rational

  *   approximation will be stored when operation is successful
  * @param q
  *   Pointer to pre-allocated space where the denominator of the rational
  *   approximation will be stored when operation is successful
  * @param q
  *   Pointer to pre-allocated space where the denominator of the rational

diff --git a/lib/librte_sched/rte_bitmap.h b/lib/librte_sched/rte_bitmap.h
index 09f6ae4..89ed7fb 100644 (file)
--- a/lib/librte_sched/rte_bitmap.h
+++ b/lib/librte_sched/rte_bitmap.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -55,15 +55,15 @@ extern "C" {
  *
  * This bitmap is not thread safe. For lock free operation on a specific bitmap
  * instance, a single writer thread performing bit set/clear operations is
  *
  * This bitmap is not thread safe. For lock free operation on a specific bitmap
  * instance, a single writer thread performing bit set/clear operations is

- * allowed, only the writer thread can do bitmap scan operations, while there 
+ * allowed, only the writer thread can do bitmap scan operations, while there

  * can be several reader threads performing bit get operations in parallel with
  * can be several reader threads performing bit get operations in parallel with

- * the writer thread. When the use of locking primitives is acceptable, the 
+ * the writer thread. When the use of locking primitives is acceptable, the

  * serialization of the bit set/clear and bitmap scan operations needs to be
  * enforced by the caller, while the bit get operation does not require locking
  * the bitmap.
  *
  ***/
  * serialization of the bit set/clear and bitmap scan operations needs to be
  * enforced by the caller, while the bit get operation does not require locking
  * the bitmap.
  *
  ***/

- 
+

 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_memory.h>
 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_memory.h>


@@ -98,13 +98,13 @@ struct rte_bitmap {
        uint64_t *array2;                        /**< Bitmap array2 */
        uint32_t array1_size;                    /**< Number of 64-bit slabs in array1 that are actually used */
        uint32_t array2_size;                    /**< Number of 64-bit slabs in array2 */
        uint64_t *array2;                        /**< Bitmap array2 */
        uint32_t array1_size;                    /**< Number of 64-bit slabs in array1 that are actually used */
        uint32_t array2_size;                    /**< Number of 64-bit slabs in array2 */

-       
+

        /* Context for the "scan next" operation */
        uint32_t index1;  /**< Bitmap scan: Index of current array1 slab */
        uint32_t offset1; /**< Bitmap scan: Offset of current bit within current array1 slab */
        uint32_t index2;  /**< Bitmap scan: Index of current array2 slab */
        uint32_t go2;     /**< Bitmap scan: Go/stop condition for current array2 cache line */
        /* Context for the "scan next" operation */
        uint32_t index1;  /**< Bitmap scan: Index of current array1 slab */
        uint32_t offset1; /**< Bitmap scan: Offset of current bit within current array1 slab */
        uint32_t index2;  /**< Bitmap scan: Index of current array2 slab */
        uint32_t go2;     /**< Bitmap scan: Go/stop condition for current array2 cache line */

-       
+

        /* Storage space for array1 and array2 */
        uint8_t memory[0];
 };
        /* Storage space for array1 and array2 */
        uint8_t memory[0];
 };


@@ -129,7 +129,7 @@ __rte_bitmap_index2_set(struct rte_bitmap *bmp)
 
 #if RTE_BITMAP_OPTIMIZATIONS
 
 
 #if RTE_BITMAP_OPTIMIZATIONS
 

-static inline int 
+static inline int

 rte_bsf64(uint64_t slab, uint32_t *pos)
 {
        if (likely(slab == 0)) {
 rte_bsf64(uint64_t slab, uint32_t *pos)
 {
        if (likely(slab == 0)) {


@@ -142,12 +142,12 @@ rte_bsf64(uint64_t slab, uint32_t *pos)
 
 #else
 
 
 #else
 

-static inline int 
+static inline int

 rte_bsf64(uint64_t slab, uint32_t *pos)
 {
        uint64_t mask;
        uint32_t i;
 rte_bsf64(uint64_t slab, uint32_t *pos)
 {
        uint64_t mask;
        uint32_t i;

-       
+

        if (likely(slab == 0)) {
                return 0;
        }
        if (likely(slab == 0)) {
                return 0;
        }


@@ -158,28 +158,28 @@ rte_bsf64(uint64_t slab, uint32_t *pos)
                        return 1;
                }
        }
                        return 1;
                }
        }

-       
+

        return 0;
 }
 
 #endif
 
 static inline uint32_t
        return 0;
 }
 
 #endif
 
 static inline uint32_t

-__rte_bitmap_get_memory_footprint(uint32_t n_bits, 
+__rte_bitmap_get_memory_footprint(uint32_t n_bits,

        uint32_t *array1_byte_offset, uint32_t *array1_slabs,
        uint32_t *array2_byte_offset, uint32_t *array2_slabs)
 {
        uint32_t n_slabs_context, n_slabs_array1, n_cache_lines_context_and_array1;
        uint32_t n_cache_lines_array2;
        uint32_t n_bytes_total;
        uint32_t *array1_byte_offset, uint32_t *array1_slabs,
        uint32_t *array2_byte_offset, uint32_t *array2_slabs)
 {
        uint32_t n_slabs_context, n_slabs_array1, n_cache_lines_context_and_array1;
        uint32_t n_cache_lines_array2;
        uint32_t n_bytes_total;

-       
+

        n_cache_lines_array2 = (n_bits + RTE_BITMAP_CL_BIT_SIZE - 1) / RTE_BITMAP_CL_BIT_SIZE;
        n_slabs_array1 = (n_cache_lines_array2 + RTE_BITMAP_SLAB_BIT_SIZE - 1) / RTE_BITMAP_SLAB_BIT_SIZE;
        n_slabs_array1 = rte_align32pow2(n_slabs_array1);
        n_slabs_context = (sizeof(struct rte_bitmap) + (RTE_BITMAP_SLAB_BIT_SIZE / 8) - 1) / (RTE_BITMAP_SLAB_BIT_SIZE / 8);
        n_cache_lines_context_and_array1 = (n_slabs_context + n_slabs_array1 + RTE_BITMAP_CL_SLAB_SIZE - 1) / RTE_BITMAP_CL_SLAB_SIZE;
        n_bytes_total = (n_cache_lines_context_and_array1 + n_cache_lines_array2) * CACHE_LINE_SIZE;
        n_cache_lines_array2 = (n_bits + RTE_BITMAP_CL_BIT_SIZE - 1) / RTE_BITMAP_CL_BIT_SIZE;
        n_slabs_array1 = (n_cache_lines_array2 + RTE_BITMAP_SLAB_BIT_SIZE - 1) / RTE_BITMAP_SLAB_BIT_SIZE;
        n_slabs_array1 = rte_align32pow2(n_slabs_array1);
        n_slabs_context = (sizeof(struct rte_bitmap) + (RTE_BITMAP_SLAB_BIT_SIZE / 8) - 1) / (RTE_BITMAP_SLAB_BIT_SIZE / 8);
        n_cache_lines_context_and_array1 = (n_slabs_context + n_slabs_array1 + RTE_BITMAP_CL_SLAB_SIZE - 1) / RTE_BITMAP_CL_SLAB_SIZE;
        n_bytes_total = (n_cache_lines_context_and_array1 + n_cache_lines_array2) * CACHE_LINE_SIZE;

-       
+

        if (array1_byte_offset) {
                *array1_byte_offset = n_slabs_context * (RTE_BITMAP_SLAB_BIT_SIZE / 8);
        }
        if (array1_byte_offset) {
                *array1_byte_offset = n_slabs_context * (RTE_BITMAP_SLAB_BIT_SIZE / 8);
        }


@@ -192,7 +192,7 @@ __rte_bitmap_get_memory_footprint(uint32_t n_bits,
        if (array2_slabs) {
                *array2_slabs = n_cache_lines_array2 * RTE_BITMAP_CL_SLAB_SIZE;
        }
        if (array2_slabs) {
                *array2_slabs = n_cache_lines_array2 * RTE_BITMAP_CL_SLAB_SIZE;
        }

-       
+

        return n_bytes_total;
 }
 
        return n_bytes_total;
 }
 


@@ -221,7 +221,7 @@ rte_bitmap_get_memory_footprint(uint32_t n_bits) {
        if (n_bits == 0) {
                return 0;
        }
        if (n_bits == 0) {
                return 0;
        }

-       
+

        return __rte_bitmap_get_memory_footprint(n_bits, NULL, NULL, NULL, NULL);
 }
 
        return __rte_bitmap_get_memory_footprint(n_bits, NULL, NULL, NULL, NULL);
 }
 


@@ -237,7 +237,7 @@ rte_bitmap_get_memory_footprint(uint32_t n_bits) {
  * @return
  *   0 upon success, error code otherwise
  */
  * @return
  *   0 upon success, error code otherwise
  */

-static inline struct rte_bitmap * 
+static inline struct rte_bitmap *

 rte_bitmap_init(uint32_t n_bits, uint8_t *mem, uint32_t mem_size)
 {
        struct rte_bitmap *bmp;
 rte_bitmap_init(uint32_t n_bits, uint8_t *mem, uint32_t mem_size)
 {
        struct rte_bitmap *bmp;


@@ -248,18 +248,18 @@ rte_bitmap_init(uint32_t n_bits, uint8_t *mem, uint32_t mem_size)
        if (n_bits == 0) {
                return NULL;
        }
        if (n_bits == 0) {
                return NULL;
        }

-       
+

        if ((mem == NULL) || (((uintptr_t) mem) & CACHE_LINE_MASK)) {
                return NULL;
        }
        if ((mem == NULL) || (((uintptr_t) mem) & CACHE_LINE_MASK)) {
                return NULL;
        }

-       
-       size = __rte_bitmap_get_memory_footprint(n_bits, 
-               &array1_byte_offset, &array1_slabs, 
+
+       size = __rte_bitmap_get_memory_footprint(n_bits,
+               &array1_byte_offset, &array1_slabs,

                &array2_byte_offset, &array2_slabs);
        if (size < mem_size) {
                return NULL;
        }
                &array2_byte_offset, &array2_slabs);
        if (size < mem_size) {
                return NULL;
        }

-       
+

        /* Setup bitmap */
        memset(mem, 0, size);
        bmp = (struct rte_bitmap *) mem;
        /* Setup bitmap */
        memset(mem, 0, size);
        bmp = (struct rte_bitmap *) mem;


@@ -268,9 +268,9 @@ rte_bitmap_init(uint32_t n_bits, uint8_t *mem, uint32_t mem_size)
        bmp->array1_size = array1_slabs;
        bmp->array2 = (uint64_t *) &mem[array2_byte_offset];
        bmp->array2_size = array2_slabs;
        bmp->array1_size = array1_slabs;
        bmp->array2 = (uint64_t *) &mem[array2_byte_offset];
        bmp->array2_size = array2_slabs;

-       
+

        __rte_bitmap_scan_init(bmp);
        __rte_bitmap_scan_init(bmp);

-       
+

        return bmp;
 }
 
        return bmp;
 }
 


@@ -289,7 +289,7 @@ rte_bitmap_free(struct rte_bitmap *bmp)
        if (bmp == NULL) {
                return -1;
        }
        if (bmp == NULL) {
                return -1;
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -322,7 +322,7 @@ rte_bitmap_prefetch0(struct rte_bitmap *bmp, uint32_t pos)
 {
        uint64_t *slab2;
        uint32_t index2;
 {
        uint64_t *slab2;
        uint32_t index2;

-       
+

        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        slab2 = bmp->array2 + index2;
        rte_prefetch0((void *) slab2);
        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        slab2 = bmp->array2 + index2;
        rte_prefetch0((void *) slab2);


@@ -343,7 +343,7 @@ rte_bitmap_get(struct rte_bitmap *bmp, uint32_t pos)
 {
        uint64_t *slab2;
        uint32_t index2, offset2;
 {
        uint64_t *slab2;
        uint32_t index2, offset2;

-       
+

        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        offset2 = pos & RTE_BITMAP_SLAB_BIT_MASK;
        slab2 = bmp->array2 + index2;
        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        offset2 = pos & RTE_BITMAP_SLAB_BIT_MASK;
        slab2 = bmp->array2 + index2;


@@ -363,7 +363,7 @@ rte_bitmap_set(struct rte_bitmap *bmp, uint32_t pos)
 {
        uint64_t *slab1, *slab2;
        uint32_t index1, index2, offset1, offset2;
 {
        uint64_t *slab1, *slab2;
        uint32_t index1, index2, offset1, offset2;

-       
+

        /* Set bit in array2 slab and set bit in array1 slab */
        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        offset2 = pos & RTE_BITMAP_SLAB_BIT_MASK;
        /* Set bit in array2 slab and set bit in array1 slab */
        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        offset2 = pos & RTE_BITMAP_SLAB_BIT_MASK;


@@ -371,7 +371,7 @@ rte_bitmap_set(struct rte_bitmap *bmp, uint32_t pos)
        offset1 = (pos >> RTE_BITMAP_CL_BIT_SIZE_LOG2) & RTE_BITMAP_SLAB_BIT_MASK;
        slab2 = bmp->array2 + index2;
        slab1 = bmp->array1 + index1;
        offset1 = (pos >> RTE_BITMAP_CL_BIT_SIZE_LOG2) & RTE_BITMAP_SLAB_BIT_MASK;
        slab2 = bmp->array2 + index2;
        slab1 = bmp->array1 + index1;

-       
+

        *slab2 |= 1lu << offset2;
        *slab1 |= 1lu << offset1;
 }
        *slab2 |= 1lu << offset2;
        *slab1 |= 1lu << offset1;
 }


@@ -391,14 +391,14 @@ rte_bitmap_set_slab(struct rte_bitmap *bmp, uint32_t pos, uint64_t slab)
 {
        uint64_t *slab1, *slab2;
        uint32_t index1, index2, offset1;
 {
        uint64_t *slab1, *slab2;
        uint32_t index1, index2, offset1;

-       
+

        /* Set bits in array2 slab and set bit in array1 slab */
        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        index1 = pos >> (RTE_BITMAP_SLAB_BIT_SIZE_LOG2 + RTE_BITMAP_CL_BIT_SIZE_LOG2);
        offset1 = (pos >> RTE_BITMAP_CL_BIT_SIZE_LOG2) & RTE_BITMAP_SLAB_BIT_MASK;
        slab2 = bmp->array2 + index2;
        slab1 = bmp->array1 + index1;
        /* Set bits in array2 slab and set bit in array1 slab */
        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        index1 = pos >> (RTE_BITMAP_SLAB_BIT_SIZE_LOG2 + RTE_BITMAP_CL_BIT_SIZE_LOG2);
        offset1 = (pos >> RTE_BITMAP_CL_BIT_SIZE_LOG2) & RTE_BITMAP_SLAB_BIT_MASK;
        slab2 = bmp->array2 + index2;
        slab1 = bmp->array1 + index1;

-       
+

        *slab2 |= slab;
        *slab1 |= 1lu << offset1;
 }
        *slab2 |= slab;
        *slab1 |= 1lu << offset1;
 }


@@ -407,14 +407,14 @@ static inline uint64_t
 __rte_bitmap_line_not_empty(uint64_t *slab2)
 {
        uint64_t v1, v2, v3, v4;
 __rte_bitmap_line_not_empty(uint64_t *slab2)
 {
        uint64_t v1, v2, v3, v4;

-       
+

        v1 = slab2[0] | slab2[1];
        v2 = slab2[2] | slab2[3];
        v3 = slab2[4] | slab2[5];
        v4 = slab2[6] | slab2[7];
        v1 |= v2;
        v3 |= v4;
        v1 = slab2[0] | slab2[1];
        v2 = slab2[2] | slab2[3];
        v3 = slab2[4] | slab2[5];
        v4 = slab2[6] | slab2[7];
        v1 |= v2;
        v3 |= v4;

-       
+

        return (v1 | v3);
 }
 
        return (v1 | v3);
 }
 


@@ -436,20 +436,20 @@ rte_bitmap_clear(struct rte_bitmap *bmp, uint32_t pos)
        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        offset2 = pos & RTE_BITMAP_SLAB_BIT_MASK;
        slab2 = bmp->array2 + index2;
        index2 = pos >> RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
        offset2 = pos & RTE_BITMAP_SLAB_BIT_MASK;
        slab2 = bmp->array2 + index2;

-       
+

        /* Return if array2 slab is not all-zeros */
        *slab2 &= ~(1lu << offset2);
        if (*slab2){
                return;
        }
        /* Return if array2 slab is not all-zeros */
        *slab2 &= ~(1lu << offset2);
        if (*slab2){
                return;
        }

-       
+

        /* Check the entire cache line of array2 for all-zeros */
        index2 &= ~ RTE_BITMAP_CL_SLAB_MASK;
        slab2 = bmp->array2 + index2;
        if (__rte_bitmap_line_not_empty(slab2)) {
                return;
        }
        /* Check the entire cache line of array2 for all-zeros */
        index2 &= ~ RTE_BITMAP_CL_SLAB_MASK;
        slab2 = bmp->array2 + index2;
        if (__rte_bitmap_line_not_empty(slab2)) {
                return;
        }

-       
+

        /* The array2 cache line is all-zeros, so clear bit in array1 slab */
        index1 = pos >> (RTE_BITMAP_SLAB_BIT_SIZE_LOG2 + RTE_BITMAP_CL_BIT_SIZE_LOG2);
        offset1 = (pos >> RTE_BITMAP_CL_BIT_SIZE_LOG2) & RTE_BITMAP_SLAB_BIT_MASK;
        /* The array2 cache line is all-zeros, so clear bit in array1 slab */
        index1 = pos >> (RTE_BITMAP_SLAB_BIT_SIZE_LOG2 + RTE_BITMAP_CL_BIT_SIZE_LOG2);
        offset1 = (pos >> RTE_BITMAP_CL_BIT_SIZE_LOG2) & RTE_BITMAP_SLAB_BIT_MASK;


@@ -464,27 +464,27 @@ __rte_bitmap_scan_search(struct rte_bitmap *bmp)
 {
        uint64_t value1;
        uint32_t i;
 {
        uint64_t value1;
        uint32_t i;

-       
+

        /* Check current array1 slab */
        value1 = bmp->array1[bmp->index1];
        value1 &= __rte_bitmap_mask1_get(bmp);
        /* Check current array1 slab */
        value1 = bmp->array1[bmp->index1];
        value1 &= __rte_bitmap_mask1_get(bmp);

-       
+

        if (rte_bsf64(value1, &bmp->offset1)) {
                return 1;
        }
        if (rte_bsf64(value1, &bmp->offset1)) {
                return 1;
        }

-       
+

        __rte_bitmap_index1_inc(bmp);
        bmp->offset1 = 0;
        __rte_bitmap_index1_inc(bmp);
        bmp->offset1 = 0;

-       
+

        /* Look for another array1 slab */
        for (i = 0; i < bmp->array1_size; i ++, __rte_bitmap_index1_inc(bmp)) {
                value1 = bmp->array1[bmp->index1];
        /* Look for another array1 slab */
        for (i = 0; i < bmp->array1_size; i ++, __rte_bitmap_index1_inc(bmp)) {
                value1 = bmp->array1[bmp->index1];

-               
+

                if (rte_bsf64(value1, &bmp->offset1)) {
                        return 1;
                }
        }
                if (rte_bsf64(value1, &bmp->offset1)) {
                        return 1;
                }
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -500,20 +500,20 @@ static inline int
 __rte_bitmap_scan_read(struct rte_bitmap *bmp, uint32_t *pos, uint64_t *slab)
 {
        uint64_t *slab2;
 __rte_bitmap_scan_read(struct rte_bitmap *bmp, uint32_t *pos, uint64_t *slab)
 {
        uint64_t *slab2;

-       
+

        slab2 = bmp->array2 + bmp->index2;
        for ( ; bmp->go2 ; bmp->index2 ++, slab2 ++, bmp->go2 = bmp->index2 & RTE_BITMAP_CL_SLAB_MASK) {
                if (*slab2) {
                        *pos = bmp->index2 << RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
                        *slab = *slab2;
        slab2 = bmp->array2 + bmp->index2;
        for ( ; bmp->go2 ; bmp->index2 ++, slab2 ++, bmp->go2 = bmp->index2 & RTE_BITMAP_CL_SLAB_MASK) {
                if (*slab2) {
                        *pos = bmp->index2 << RTE_BITMAP_SLAB_BIT_SIZE_LOG2;
                        *slab = *slab2;

-                       
+

                        bmp->index2 ++;
                        slab2 ++;
                        bmp->go2 = bmp->index2 & RTE_BITMAP_CL_SLAB_MASK;
                        return 1;
                }
        }
                        bmp->index2 ++;
                        slab2 ++;
                        bmp->go2 = bmp->index2 & RTE_BITMAP_CL_SLAB_MASK;
                        return 1;
                }
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -528,10 +528,10 @@ __rte_bitmap_scan_read(struct rte_bitmap *bmp, uint32_t *pos, uint64_t *slab)
  * @param slab
  *   When function call returns 1, slab contains the value of the entire 64-bit
  *   slab where the bit indicated by pos is located. Slabs are always 64-bit
  * @param slab
  *   When function call returns 1, slab contains the value of the entire 64-bit
  *   slab where the bit indicated by pos is located. Slabs are always 64-bit

- *   aligned, so the position of the first bit of the slab (this bit is not 
+ *   aligned, so the position of the first bit of the slab (this bit is not

  *   necessarily set) is pos / 64. Once a slab has been returned by the bitmap
  *   scan operation, the internal pointers of the bitmap are updated to point
  *   necessarily set) is pos / 64. Once a slab has been returned by the bitmap
  *   scan operation, the internal pointers of the bitmap are updated to point

- *   after this slab, so the same slab will not be returned again if it 
+ *   after this slab, so the same slab will not be returned again if it

  *   contains more than one bit which is set. When function call returns 0,
  *   slab is not modified.
  * @return
  *   contains more than one bit which is set. When function call returns 0,
  *   slab is not modified.
  * @return


@@ -544,14 +544,14 @@ rte_bitmap_scan(struct rte_bitmap *bmp, uint32_t *pos, uint64_t *slab)
        if (__rte_bitmap_scan_read(bmp, pos, slab)) {
                return 1;
        }
        if (__rte_bitmap_scan_read(bmp, pos, slab)) {
                return 1;
        }

-       
+

        /* Look for non-empty array2 line */
        if (__rte_bitmap_scan_search(bmp)) {
                __rte_bitmap_scan_read_init(bmp);
                __rte_bitmap_scan_read(bmp, pos, slab);
                return 1;
        }
        /* Look for non-empty array2 line */
        if (__rte_bitmap_scan_search(bmp)) {
                __rte_bitmap_scan_read_init(bmp);
                __rte_bitmap_scan_read(bmp, pos, slab);
                return 1;
        }

-       
+

        /* Empty bitmap */
        return 0;
 }
        /* Empty bitmap */
        return 0;
 }

diff --git a/lib/librte_sched/rte_red.c b/lib/librte_sched/rte_red.c
index f63e195..fdf4057 100644 (file)
--- a/lib/librte_sched/rte_red.c
+++ b/lib/librte_sched/rte_red.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -71,10 +71,10 @@ __rte_red_init_tables(void)
 
        for (i = 0; i < RTE_DIM(rte_red_pow2_frac_inv); i++) {
                double m = (double)i;
 
        for (i = 0; i < RTE_DIM(rte_red_pow2_frac_inv); i++) {
                double m = (double)i;

-               
+

                rte_red_pow2_frac_inv[i] = (uint16_t) round(scale / pow(2, m / table_size));
        }
                rte_red_pow2_frac_inv[i] = (uint16_t) round(scale / pow(2, m / table_size));
        }

-       
+

        scale = 1024.0;
 
        RTE_RED_ASSERT(RTE_RED_WQ_LOG2_NUM == RTE_DIM(rte_red_log2_1_minus_Wq));
        scale = 1024.0;
 
        RTE_RED_ASSERT(RTE_RED_WQ_LOG2_NUM == RTE_DIM(rte_red_log2_1_minus_Wq));


@@ -83,7 +83,7 @@ __rte_red_init_tables(void)
                double n = (double)i;
                double Wq = pow(2, -n);
                uint32_t index = i - RTE_RED_WQ_LOG2_MIN;
                double n = (double)i;
                double Wq = pow(2, -n);
                uint32_t index = i - RTE_RED_WQ_LOG2_MIN;

-               
+

                rte_red_log2_1_minus_Wq[index] = (uint16_t) round(-1.0 * scale * log2(1.0 - Wq));
                /**
                * Table entry of zero, corresponds to a Wq of zero
                rte_red_log2_1_minus_Wq[index] = (uint16_t) round(-1.0 * scale * log2(1.0 - Wq));
                /**
                * Table entry of zero, corresponds to a Wq of zero


@@ -137,7 +137,7 @@ rte_red_config_init(struct rte_red_config *red_cfg,
        if (maxp_inv > RTE_RED_MAXP_INV_MAX) {
                return -7;
        }
        if (maxp_inv > RTE_RED_MAXP_INV_MAX) {
                return -7;
        }

-       
+

        /**
         *  Initialize the RED module if not already done
         */
        /**
         *  Initialize the RED module if not already done
         */

diff --git a/lib/librte_sched/rte_red.h b/lib/librte_sched/rte_red.h
index 9d300f2..0d8412f 100644 (file)
--- a/lib/librte_sched/rte_red.h
+++ b/lib/librte_sched/rte_red.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -78,7 +78,7 @@ if (!(exp)) {                                                    \
 
 /**
  * Externs
 
 /**
  * Externs

- * 
+ *

  */
 extern uint32_t rte_red_rand_val;
 extern uint32_t rte_red_rand_seed;
  */
 extern uint32_t rte_red_rand_val;
 extern uint32_t rte_red_rand_seed;


@@ -87,7 +87,7 @@ extern uint16_t rte_red_pow2_frac_inv[16];
 
 /**
  * RED configuration parameters passed by user
 
 /**
  * RED configuration parameters passed by user

- * 
+ *

  */
 struct rte_red_params {
        uint16_t min_th;   /**< Minimum threshold for queue (max_th) */
  */
 struct rte_red_params {
        uint16_t min_th;   /**< Minimum threshold for queue (max_th) */


@@ -116,9 +116,9 @@ struct rte_red {
        uint64_t q_time;   /**< Start of the queue idle time (q_time) */
 };
 
        uint64_t q_time;   /**< Start of the queue idle time (q_time) */
 };
 

-/** 
+/**

  * @brief Initialises run-time data
  * @brief Initialises run-time data

- *  
+ *

  * @param [in,out] data pointer to RED runtime data
  *
  * @return Operation status
  * @param [in,out] data pointer to RED runtime data
  *
  * @return Operation status


@@ -128,16 +128,16 @@ struct rte_red {
 int
 rte_red_rt_data_init(struct rte_red *red);
 
 int
 rte_red_rt_data_init(struct rte_red *red);
 

-/** 
+/**

  * @brief Configures a single RED configuration parameter structure.
  * @brief Configures a single RED configuration parameter structure.

- * 
+ *

  * @param [in,out] config pointer to a RED configuration parameter structure
  * @param [in] wq_log2 log2 of the filter weight, valid range is:
  *             RTE_RED_WQ_LOG2_MIN <= wq_log2 <= RTE_RED_WQ_LOG2_MAX
  * @param [in] min_th queue minimum threshold in number of packets
  * @param [in] max_th queue maximum threshold in number of packets
  * @param [in] maxp_inv inverse maximum mark probability
  * @param [in,out] config pointer to a RED configuration parameter structure
  * @param [in] wq_log2 log2 of the filter weight, valid range is:
  *             RTE_RED_WQ_LOG2_MIN <= wq_log2 <= RTE_RED_WQ_LOG2_MAX
  * @param [in] min_th queue minimum threshold in number of packets
  * @param [in] max_th queue maximum threshold in number of packets
  * @param [in] maxp_inv inverse maximum mark probability

- * 
+ *

  * @return Operation status
  * @retval 0 success
  * @retval !0 error
  * @return Operation status
  * @retval 0 success
  * @retval !0 error


@@ -225,7 +225,7 @@ __rte_red_calc_qempty_factor(uint8_t wq_log2, uint16_t m)
        return 0;
 }
 
        return 0;
 }
 

-/** 
+/**

  * @brief Updates queue average in condition when queue is empty
  *
  * Note: packet is never dropped in this particular case.
  * @brief Updates queue average in condition when queue is empty
  *
  * Note: packet is never dropped in this particular case.


@@ -233,7 +233,7 @@ __rte_red_calc_qempty_factor(uint8_t wq_log2, uint16_t m)
  * @param [in] config pointer to a RED configuration parameter structure
  * @param [in,out] data pointer to RED runtime data
  * @param [in] time current time stamp
  * @param [in] config pointer to a RED configuration parameter structure
  * @param [in,out] data pointer to RED runtime data
  * @param [in] time current time stamp

- * 
+ *

  * @return Operation status
  * @retval 0 enqueue the packet
  * @retval 1 drop the packet based on max threshold criterion
  * @return Operation status
  * @retval 0 enqueue the packet
  * @retval 1 drop the packet based on max threshold criterion


@@ -245,7 +245,7 @@ rte_red_enqueue_empty(const struct rte_red_config *red_cfg,
        const uint64_t time)
 {
        uint64_t time_diff = 0, m = 0;
        const uint64_t time)
 {
        uint64_t time_diff = 0, m = 0;

-       
+

        RTE_RED_ASSERT(red_cfg != NULL);
        RTE_RED_ASSERT(red != NULL);
 
        RTE_RED_ASSERT(red_cfg != NULL);
        RTE_RED_ASSERT(red != NULL);
 


@@ -259,7 +259,7 @@ rte_red_enqueue_empty(const struct rte_red_config *red_cfg,
 
        /**
         * m is the number of packets that might have arrived while the queue was empty.
 
        /**
         * m is the number of packets that might have arrived while the queue was empty.

-        * In this case we have time stamps provided by scheduler in byte units (bytes 
+        * In this case we have time stamps provided by scheduler in byte units (bytes

         * transmitted on network port). Such time stamp translates into time units as
         * port speed is fixed but such approach simplifies the code.
         */
         * transmitted on network port). Such time stamp translates into time units as
         * port speed is fixed but such approach simplifies the code.
         */


@@ -336,21 +336,21 @@ __rte_red_drop(const struct rte_red_config *red_cfg, struct rte_red *red)
        /* If drop, generate and save random number to be used next time */
        if (unlikely((rte_red_rand_val % pa_den) < pa_num)) {
                rte_red_rand_val = rte_fast_rand();
        /* If drop, generate and save random number to be used next time */
        if (unlikely((rte_red_rand_val % pa_den) < pa_num)) {
                rte_red_rand_val = rte_fast_rand();

-               
+

                return 1;
        }
                return 1;
        }

-       
+

        /* No drop */
        return 0;
 }
 
        /* No drop */
        return 0;
 }
 

-/** 
+/**

  * @brief Decides if new packet should be enqeued or dropped in queue non-empty case
  *
  * @param [in] config pointer to a RED configuration parameter structure
  * @param [in,out] data pointer to RED runtime data
  * @param [in] q current queue size (measured in packets)
  * @brief Decides if new packet should be enqeued or dropped in queue non-empty case
  *
  * @param [in] config pointer to a RED configuration parameter structure
  * @param [in,out] data pointer to RED runtime data
  * @param [in] q current queue size (measured in packets)

- * 
+ *

  * @return Operation status
  * @retval 0 enqueue the packet
  * @retval 1 drop the packet based on max threshold criterion
  * @return Operation status
  * @retval 0 enqueue the packet
  * @retval 1 drop the packet based on max threshold criterion


@@ -376,7 +376,7 @@ rte_red_enqueue_nonempty(const struct rte_red_config *red_cfg,
        *    avg_s = avg_s + (q << N) - (avg_s >> n)
        *    avg_s += (q << N) - (avg_s >> n)
        */
        *    avg_s = avg_s + (q << N) - (avg_s >> n)
        *    avg_s += (q << N) - (avg_s >> n)
        */

-       
+

        /* avg update */
        red->avg += (q << RTE_RED_SCALING) - (red->avg >> red_cfg->wq_log2);
 
        /* avg update */
        red->avg += (q << RTE_RED_SCALING) - (red->avg >> red_cfg->wq_log2);
 


@@ -396,23 +396,23 @@ rte_red_enqueue_nonempty(const struct rte_red_config *red_cfg,
                red->count = 0;
                return 2;
        }
                red->count = 0;
                return 2;
        }

-       
+

        /* max_th <= avg: always mark the packet */
        red->count = 0;
        return 1;
 }
 
        /* max_th <= avg: always mark the packet */
        red->count = 0;
        return 1;
 }
 

-/** 
+/**

  * @brief Decides if new packet should be enqeued or dropped
  * Updates run time data based on new queue size value.
  * Based on new queue average and RED configuration parameters
  * @brief Decides if new packet should be enqeued or dropped
  * Updates run time data based on new queue size value.
  * Based on new queue average and RED configuration parameters

- * gives verdict whether to enqueue or drop the packet. 
+ * gives verdict whether to enqueue or drop the packet.

  *
  * @param [in] config pointer to a RED configuration parameter structure
  * @param [in,out] data pointer to RED runtime data
  * @param [in] q updated queue size in packets
  * @param [in] time current time stamp
  *
  * @param [in] config pointer to a RED configuration parameter structure
  * @param [in,out] data pointer to RED runtime data
  * @param [in] q updated queue size in packets
  * @param [in] time current time stamp

- * 
+ *

  * @return Operation status
  * @retval 0 enqueue the packet
  * @retval 1 drop the packet based on max threshold criteria
  * @return Operation status
  * @retval 0 enqueue the packet
  * @retval 1 drop the packet based on max threshold criteria


@@ -434,7 +434,7 @@ rte_red_enqueue(const struct rte_red_config *red_cfg,
        }
 }
 
        }
 }
 

-/** 
+/**

  * @brief Callback to records time that queue became empty
  *
  * @param [in,out] data pointer to RED runtime data
  * @brief Callback to records time that queue became empty
  *
  * @param [in,out] data pointer to RED runtime data

diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c
index 2625662..968c2b3 100644 (file)
--- a/lib/librte_sched/rte_sched.c
+++ b/lib/librte_sched/rte_sched.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -97,7 +97,7 @@
 #endif
 
 #define RTE_SCHED_GRINDER_PCACHE_SIZE         (64 / RTE_SCHED_QUEUES_PER_PIPE)
 #endif
 
 #define RTE_SCHED_GRINDER_PCACHE_SIZE         (64 / RTE_SCHED_QUEUES_PER_PIPE)

-       
+

 #define RTE_SCHED_PIPE_INVALID                UINT32_MAX
 
 #define RTE_SCHED_BMP_POS_INVALID             UINT32_MAX
 #define RTE_SCHED_PIPE_INVALID                UINT32_MAX
 
 #define RTE_SCHED_BMP_POS_INVALID             UINT32_MAX


@@ -115,7 +115,7 @@ struct rte_sched_subport {
        uint32_t tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        uint32_t tc_credits[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        uint32_t tc_period;
        uint32_t tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        uint32_t tc_credits[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        uint32_t tc_period;

-       
+

        /* TC oversubscription */
        uint32_t tc_ov_wm;
        uint32_t tc_ov_wm_min;
        /* TC oversubscription */
        uint32_t tc_ov_wm;
        uint32_t tc_ov_wm_min;


@@ -124,7 +124,7 @@ struct rte_sched_subport {
        uint8_t tc_ov;
        uint32_t tc_ov_n;
        double tc_ov_rate;
        uint8_t tc_ov;
        uint32_t tc_ov_n;
        double tc_ov_rate;

-       
+

        /* Statistics */
        struct rte_sched_subport_stats stats;
 };
        /* Statistics */
        struct rte_sched_subport_stats stats;
 };


@@ -134,12 +134,12 @@ struct rte_sched_pipe_profile {
        uint32_t tb_period;
        uint32_t tb_credits_per_period;
        uint32_t tb_size;
        uint32_t tb_period;
        uint32_t tb_credits_per_period;
        uint32_t tb_size;

-       
+

        /* Pipe traffic classes */
        uint32_t tc_period;
        uint32_t tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        uint8_t tc_ov_weight;
        /* Pipe traffic classes */
        uint32_t tc_period;
        uint32_t tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        uint8_t tc_ov_weight;

-       
+

        /* Pipe queues */
        uint8_t  wrr_cost[RTE_SCHED_QUEUES_PER_PIPE];
 };
        /* Pipe queues */
        uint8_t  wrr_cost[RTE_SCHED_QUEUES_PER_PIPE];
 };


@@ -151,14 +151,14 @@ struct rte_sched_pipe {
 
        /* Pipe profile and flags */
        uint32_t profile;
 
        /* Pipe profile and flags */
        uint32_t profile;

-       
+

        /* Traffic classes (TCs) */
        uint64_t tc_time; /* time of next update */
        uint32_t tc_credits[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        /* Traffic classes (TCs) */
        uint64_t tc_time; /* time of next update */
        uint32_t tc_credits[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];

-       
+

        /* Weighted Round Robin (WRR) */
        uint8_t wrr_tokens[RTE_SCHED_QUEUES_PER_PIPE];
        /* Weighted Round Robin (WRR) */
        uint8_t wrr_tokens[RTE_SCHED_QUEUES_PER_PIPE];

-       
+

        /* TC oversubscription */
        uint32_t tc_ov_credits;
        uint8_t tc_ov_period_id;
        /* TC oversubscription */
        uint32_t tc_ov_credits;
        uint8_t tc_ov_period_id;


@@ -190,7 +190,7 @@ struct rte_sched_grinder {
        uint32_t pcache_qindex[RTE_SCHED_GRINDER_PCACHE_SIZE];
        uint32_t pcache_w;
        uint32_t pcache_r;
        uint32_t pcache_qindex[RTE_SCHED_GRINDER_PCACHE_SIZE];
        uint32_t pcache_w;
        uint32_t pcache_r;

-       
+

        /* Current pipe */
        enum grinder_state state;
        uint32_t productive;
        /* Current pipe */
        enum grinder_state state;
        uint32_t productive;


@@ -204,7 +204,7 @@ struct rte_sched_grinder {
        uint32_t tccache_qindex[4];
        uint32_t tccache_w;
        uint32_t tccache_r;
        uint32_t tccache_qindex[4];
        uint32_t tccache_w;
        uint32_t tccache_r;

-       
+

        /* Current TC */
        uint32_t tc_index;
        struct rte_sched_queue *queue[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        /* Current TC */
        uint32_t tc_index;
        struct rte_sched_queue *queue[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];


@@ -214,7 +214,7 @@ struct rte_sched_grinder {
        uint32_t qmask;
        uint32_t qpos;
        struct rte_mbuf *pkt;
        uint32_t qmask;
        uint32_t qpos;
        struct rte_mbuf *pkt;

-       
+

        /* WRR */
        uint16_t wrr_tokens[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];
        uint16_t wrr_mask[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];
        /* WRR */
        uint16_t wrr_tokens[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];
        uint16_t wrr_mask[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];


@@ -240,7 +240,7 @@ struct rte_sched_port {
        uint64_t time_cpu_bytes;      /* Current CPU time measured in bytes */
        uint64_t time;                /* Current NIC TX time measured in bytes */
        double cycles_per_byte;       /* CPU cycles per byte */
        uint64_t time_cpu_bytes;      /* Current CPU time measured in bytes */
        uint64_t time;                /* Current NIC TX time measured in bytes */
        double cycles_per_byte;       /* CPU cycles per byte */

-       
+

        /* Scheduling loop detection */
        uint32_t pipe_loop;
        uint32_t pipe_exhaustion;
        /* Scheduling loop detection */
        uint32_t pipe_loop;
        uint32_t pipe_exhaustion;


@@ -248,17 +248,17 @@ struct rte_sched_port {
        /* Bitmap */
        struct rte_bitmap *bmp;
        uint32_t grinder_base_bmp_pos[RTE_SCHED_PORT_N_GRINDERS] __rte_aligned_16;
        /* Bitmap */
        struct rte_bitmap *bmp;
        uint32_t grinder_base_bmp_pos[RTE_SCHED_PORT_N_GRINDERS] __rte_aligned_16;

-       
+

        /* Grinders */
        struct rte_sched_grinder grinder[RTE_SCHED_PORT_N_GRINDERS];
        uint32_t busy_grinders;
        struct rte_mbuf **pkts_out;
        uint32_t n_pkts_out;
        /* Grinders */
        struct rte_sched_grinder grinder[RTE_SCHED_PORT_N_GRINDERS];
        uint32_t busy_grinders;
        struct rte_mbuf **pkts_out;
        uint32_t n_pkts_out;

-       
+

        /* Queue base calculation */
        uint32_t qsize_add[RTE_SCHED_QUEUES_PER_PIPE];
        uint32_t qsize_sum;
        /* Queue base calculation */
        uint32_t qsize_add[RTE_SCHED_QUEUES_PER_PIPE];
        uint32_t qsize_sum;

-       
+

        /* Large data structures */
        struct rte_sched_subport *subport;
        struct rte_sched_pipe *pipe;
        /* Large data structures */
        struct rte_sched_subport *subport;
        struct rte_sched_pipe *pipe;


@@ -301,26 +301,26 @@ static int
 rte_sched_port_check_params(struct rte_sched_port_params *params)
 {
        uint32_t i, j;
 rte_sched_port_check_params(struct rte_sched_port_params *params)
 {
        uint32_t i, j;

-       
+

        if (params == NULL) {
                return -1;
        }
        if (params == NULL) {
                return -1;
        }

-       
+

        /* socket */
        if ((params->socket < 0) || (params->socket >= RTE_MAX_NUMA_NODES)) {
                return -3;
        }
        /* socket */
        if ((params->socket < 0) || (params->socket >= RTE_MAX_NUMA_NODES)) {
                return -3;
        }

-       
+

        /* rate */
        if (params->rate == 0) {
                return -4;
        }
        /* rate */
        if (params->rate == 0) {
                return -4;
        }

-       
+

        /* mtu */
        if (params->mtu == 0) {
                return -5;
        }
        /* mtu */
        if (params->mtu == 0) {
                return -5;
        }

-       
+

        /* n_subports_per_port: non-zero, power of 2 */
        if ((params->n_subports_per_port == 0) || (!rte_is_power_of_2(params->n_subports_per_port))) {
                return -6;
        /* n_subports_per_port: non-zero, power of 2 */
        if ((params->n_subports_per_port == 0) || (!rte_is_power_of_2(params->n_subports_per_port))) {
                return -6;


@@ -330,31 +330,31 @@ rte_sched_port_check_params(struct rte_sched_port_params *params)
        if ((params->n_pipes_per_subport == 0) || (!rte_is_power_of_2(params->n_pipes_per_subport))) {
                return -7;
        }
        if ((params->n_pipes_per_subport == 0) || (!rte_is_power_of_2(params->n_pipes_per_subport))) {
                return -7;
        }

-       
+

        /* qsize: non-zero, power of 2, no bigger than 32K (due to 16-bit read/write pointers) */
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                uint16_t qsize = params->qsize[i];
        /* qsize: non-zero, power of 2, no bigger than 32K (due to 16-bit read/write pointers) */
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                uint16_t qsize = params->qsize[i];

-               
+

                if ((qsize == 0) || (!rte_is_power_of_2(qsize))) {
                        return -8;
                }
        }
                if ((qsize == 0) || (!rte_is_power_of_2(qsize))) {
                        return -8;
                }
        }

-       
+

        /* pipe_profiles and n_pipe_profiles */
        /* pipe_profiles and n_pipe_profiles */

-       if ((params->pipe_profiles == NULL) || 
+       if ((params->pipe_profiles == NULL) ||

            (params->n_pipe_profiles == 0) ||
            (params->n_pipe_profiles > RTE_SCHED_PIPE_PROFILES_PER_PORT)) {
                return -9;
        }
            (params->n_pipe_profiles == 0) ||
            (params->n_pipe_profiles > RTE_SCHED_PIPE_PROFILES_PER_PORT)) {
                return -9;
        }

-       
+

        for (i = 0; i < params->n_pipe_profiles; i ++) {
                struct rte_sched_pipe_params *p = params->pipe_profiles + i;
        for (i = 0; i < params->n_pipe_profiles; i ++) {
                struct rte_sched_pipe_params *p = params->pipe_profiles + i;

-               
+

                /* TB rate: non-zero, not greater than port rate */
                if ((p->tb_rate == 0) || (p->tb_rate > params->rate)) {
                        return -10;
                }
                /* TB rate: non-zero, not greater than port rate */
                if ((p->tb_rate == 0) || (p->tb_rate > params->rate)) {
                        return -10;
                }

-               
+

                /* TB size: non-zero */
                if (p->tb_size == 0) {
                        return -11;
                /* TB size: non-zero */
                if (p->tb_size == 0) {
                        return -11;


@@ -366,7 +366,7 @@ rte_sched_port_check_params(struct rte_sched_port_params *params)
                                return -12;
                        }
                }
                                return -12;
                        }
                }

-               
+

                /* TC period: non-zero */
                if (p->tc_period == 0) {
                        return -13;
                /* TC period: non-zero */
                if (p->tc_period == 0) {
                        return -13;


@@ -386,7 +386,7 @@ rte_sched_port_check_params(struct rte_sched_port_params *params)
                        }
                }
        }
                        }
                }
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -397,7 +397,7 @@ rte_sched_port_get_array_base(struct rte_sched_port_params *params, enum rte_sch
        uint32_t n_pipes_per_subport = params->n_pipes_per_subport;
        uint32_t n_pipes_per_port = n_pipes_per_subport * n_subports_per_port;
        uint32_t n_queues_per_port = RTE_SCHED_QUEUES_PER_PIPE * n_pipes_per_subport * n_subports_per_port;
        uint32_t n_pipes_per_subport = params->n_pipes_per_subport;
        uint32_t n_pipes_per_port = n_pipes_per_subport * n_subports_per_port;
        uint32_t n_queues_per_port = RTE_SCHED_QUEUES_PER_PIPE * n_pipes_per_subport * n_subports_per_port;

-       
+

        uint32_t size_subport = n_subports_per_port * sizeof(struct rte_sched_subport);
        uint32_t size_pipe = n_pipes_per_port * sizeof(struct rte_sched_pipe);
        uint32_t size_queue = n_queues_per_port * sizeof(struct rte_sched_queue);
        uint32_t size_subport = n_subports_per_port * sizeof(struct rte_sched_subport);
        uint32_t size_pipe = n_pipes_per_port * sizeof(struct rte_sched_pipe);
        uint32_t size_queue = n_queues_per_port * sizeof(struct rte_sched_queue);


@@ -405,29 +405,29 @@ rte_sched_port_get_array_base(struct rte_sched_port_params *params, enum rte_sch
        uint32_t size_pipe_profiles = RTE_SCHED_PIPE_PROFILES_PER_PORT * sizeof(struct rte_sched_pipe_profile);
        uint32_t size_bmp_array = rte_bitmap_get_memory_footprint(n_queues_per_port);
        uint32_t size_per_pipe_queue_array, size_queue_array;
        uint32_t size_pipe_profiles = RTE_SCHED_PIPE_PROFILES_PER_PORT * sizeof(struct rte_sched_pipe_profile);
        uint32_t size_bmp_array = rte_bitmap_get_memory_footprint(n_queues_per_port);
        uint32_t size_per_pipe_queue_array, size_queue_array;

-       
+

        uint32_t base, i;
        uint32_t base, i;

-       
+

        size_per_pipe_queue_array = 0;
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                size_per_pipe_queue_array += RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS * params->qsize[i] * sizeof(struct rte_mbuf *);
        }
        size_queue_array = n_pipes_per_port * size_per_pipe_queue_array;
        size_per_pipe_queue_array = 0;
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                size_per_pipe_queue_array += RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS * params->qsize[i] * sizeof(struct rte_mbuf *);
        }
        size_queue_array = n_pipes_per_port * size_per_pipe_queue_array;

-       
+

        base = 0;
        base = 0;

-       
+

        if (array == e_RTE_SCHED_PORT_ARRAY_SUBPORT) return base;
        base += CACHE_LINE_ROUNDUP(size_subport);
        if (array == e_RTE_SCHED_PORT_ARRAY_SUBPORT) return base;
        base += CACHE_LINE_ROUNDUP(size_subport);

-       
+

        if (array == e_RTE_SCHED_PORT_ARRAY_PIPE) return base;
        base += CACHE_LINE_ROUNDUP(size_pipe);
 
        if (array == e_RTE_SCHED_PORT_ARRAY_QUEUE) return base;
        base += CACHE_LINE_ROUNDUP(size_queue);
        if (array == e_RTE_SCHED_PORT_ARRAY_PIPE) return base;
        base += CACHE_LINE_ROUNDUP(size_pipe);
 
        if (array == e_RTE_SCHED_PORT_ARRAY_QUEUE) return base;
        base += CACHE_LINE_ROUNDUP(size_queue);

-       
+

        if (array == e_RTE_SCHED_PORT_ARRAY_QUEUE_EXTRA) return base;
        base += CACHE_LINE_ROUNDUP(size_queue_extra);
        if (array == e_RTE_SCHED_PORT_ARRAY_QUEUE_EXTRA) return base;
        base += CACHE_LINE_ROUNDUP(size_queue_extra);

-       
+

        if (array == e_RTE_SCHED_PORT_ARRAY_PIPE_PROFILES) return base;
        base += CACHE_LINE_ROUNDUP(size_pipe_profiles);
 
        if (array == e_RTE_SCHED_PORT_ARRAY_PIPE_PROFILES) return base;
        base += CACHE_LINE_ROUNDUP(size_pipe_profiles);
 


@@ -445,17 +445,17 @@ rte_sched_port_get_memory_footprint(struct rte_sched_port_params *params)
 {
        uint32_t size0, size1;
        int status;
 {
        uint32_t size0, size1;
        int status;

-       
+

        status = rte_sched_port_check_params(params);
        if (status != 0) {
                RTE_LOG(INFO, SCHED, "Port scheduler params check failed (%d)\n", status);
        status = rte_sched_port_check_params(params);
        if (status != 0) {
                RTE_LOG(INFO, SCHED, "Port scheduler params check failed (%d)\n", status);

-               
+

                return 0;
        }
                return 0;
        }

-       
+

        size0 = sizeof(struct rte_sched_port);
        size1 = rte_sched_port_get_array_base(params, e_RTE_SCHED_PORT_ARRAY_TOTAL);
        size0 = sizeof(struct rte_sched_port);
        size1 = rte_sched_port_get_array_base(params, e_RTE_SCHED_PORT_ARRAY_TOTAL);

-       
+

        return (size0 + size1);
 }
 
        return (size0 + size1);
 }
 


@@ -467,7 +467,7 @@ rte_sched_port_config_qsize(struct rte_sched_port *port)
        port->qsize_add[1] = port->qsize_add[0] + port->qsize[0];
        port->qsize_add[2] = port->qsize_add[1] + port->qsize[0];
        port->qsize_add[3] = port->qsize_add[2] + port->qsize[0];
        port->qsize_add[1] = port->qsize_add[0] + port->qsize[0];
        port->qsize_add[2] = port->qsize_add[1] + port->qsize[0];
        port->qsize_add[3] = port->qsize_add[2] + port->qsize[0];

-       
+

        /* TC 1 */
        port->qsize_add[4] = port->qsize_add[3] + port->qsize[0];
        port->qsize_add[5] = port->qsize_add[4] + port->qsize[1];
        /* TC 1 */
        port->qsize_add[4] = port->qsize_add[3] + port->qsize[0];
        port->qsize_add[5] = port->qsize_add[4] + port->qsize[1];


@@ -485,37 +485,37 @@ rte_sched_port_config_qsize(struct rte_sched_port *port)
        port->qsize_add[13] = port->qsize_add[12] + port->qsize[3];
        port->qsize_add[14] = port->qsize_add[13] + port->qsize[3];
        port->qsize_add[15] = port->qsize_add[14] + port->qsize[3];
        port->qsize_add[13] = port->qsize_add[12] + port->qsize[3];
        port->qsize_add[14] = port->qsize_add[13] + port->qsize[3];
        port->qsize_add[15] = port->qsize_add[14] + port->qsize[3];

-       
+

        port->qsize_sum = port->qsize_add[15] + port->qsize[3];
 }
 
        port->qsize_sum = port->qsize_add[15] + port->qsize[3];
 }
 

-static void 
+static void

 rte_sched_port_log_pipe_profile(struct rte_sched_port *port, uint32_t i)
 {
        struct rte_sched_pipe_profile *p = port->pipe_profiles + i;
 rte_sched_port_log_pipe_profile(struct rte_sched_port *port, uint32_t i)
 {
        struct rte_sched_pipe_profile *p = port->pipe_profiles + i;

-       
+

        RTE_LOG(INFO, SCHED, "Low level config for pipe profile %u:\n"
                "\tToken bucket: period = %u, credits per period = %u, size = %u\n"
                "\tTraffic classes: period = %u, credits per period = [%u, %u, %u, %u]\n"
                "\tTraffic class 3 oversubscription: weight = %hhu\n"
                "\tWRR cost: [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu]\n",
                i,
        RTE_LOG(INFO, SCHED, "Low level config for pipe profile %u:\n"
                "\tToken bucket: period = %u, credits per period = %u, size = %u\n"
                "\tTraffic classes: period = %u, credits per period = [%u, %u, %u, %u]\n"
                "\tTraffic class 3 oversubscription: weight = %hhu\n"
                "\tWRR cost: [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu]\n",
                i,

-               
+

                /* Token bucket */
                p->tb_period,
                p->tb_credits_per_period,
                p->tb_size,
                /* Token bucket */
                p->tb_period,
                p->tb_credits_per_period,
                p->tb_size,

-               
+

                /* Traffic classes */
                p->tc_period,
                p->tc_credits_per_period[0],
                p->tc_credits_per_period[1],
                p->tc_credits_per_period[2],
                p->tc_credits_per_period[3],
                /* Traffic classes */
                p->tc_period,
                p->tc_credits_per_period[0],
                p->tc_credits_per_period[1],
                p->tc_credits_per_period[2],
                p->tc_credits_per_period[3],

-               
+

                /* Traffic class 3 oversubscription */
                p->tc_ov_weight,
                /* Traffic class 3 oversubscription */
                p->tc_ov_weight,

-               
+

                /* WRR */
                p->wrr_cost[ 0], p->wrr_cost[ 1], p->wrr_cost[ 2], p->wrr_cost[ 3],
                p->wrr_cost[ 4], p->wrr_cost[ 5], p->wrr_cost[ 6], p->wrr_cost[ 7],
                /* WRR */
                p->wrr_cost[ 0], p->wrr_cost[ 1], p->wrr_cost[ 2], p->wrr_cost[ 3],
                p->wrr_cost[ 4], p->wrr_cost[ 5], p->wrr_cost[ 6], p->wrr_cost[ 7],


@@ -528,7 +528,7 @@ rte_sched_time_ms_to_bytes(uint32_t time_ms, uint32_t rate)
 {
        uint64_t time = time_ms;
        time = (time * rate) / 1000;
 {
        uint64_t time = time_ms;
        time = (time * rate) / 1000;

-       
+

        return time;
 }
 
        return time;
 }
 


@@ -536,11 +536,11 @@ static void
 rte_sched_port_config_pipe_profile_table(struct rte_sched_port *port, struct rte_sched_port_params *params)
 {
        uint32_t i, j;
 rte_sched_port_config_pipe_profile_table(struct rte_sched_port *port, struct rte_sched_port_params *params)
 {
        uint32_t i, j;

-       
+

        for (i = 0; i < port->n_pipe_profiles; i ++) {
                struct rte_sched_pipe_params *src = params->pipe_profiles + i;
                struct rte_sched_pipe_profile *dst = port->pipe_profiles + i;
        for (i = 0; i < port->n_pipe_profiles; i ++) {
                struct rte_sched_pipe_params *src = params->pipe_profiles + i;
                struct rte_sched_pipe_profile *dst = port->pipe_profiles + i;

-               
+

                /* Token Bucket */
                if (src->tb_rate == params->rate) {
                        dst->tb_credits_per_period = 1;
                /* Token Bucket */
                if (src->tb_rate == params->rate) {
                        dst->tb_credits_per_period = 1;


@@ -548,11 +548,11 @@ rte_sched_port_config_pipe_profile_table(struct rte_sched_port *port, struct rte
                } else {
                        double tb_rate = ((double) src->tb_rate) / ((double) params->rate);
                        double d = RTE_SCHED_TB_RATE_CONFIG_ERR;
                } else {
                        double tb_rate = ((double) src->tb_rate) / ((double) params->rate);
                        double d = RTE_SCHED_TB_RATE_CONFIG_ERR;

-                       
+

                        rte_approx(tb_rate, d, &dst->tb_credits_per_period, &dst->tb_period);
                }
                dst->tb_size = src->tb_size;
                        rte_approx(tb_rate, d, &dst->tb_credits_per_period, &dst->tb_period);
                }
                dst->tb_size = src->tb_size;

-               
+

                /* Traffic Classes */
                dst->tc_period = (uint32_t) rte_sched_time_ms_to_bytes(src->tc_period, params->rate);
                for (j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j ++) {
                /* Traffic Classes */
                dst->tc_period = (uint32_t) rte_sched_time_ms_to_bytes(src->tc_period, params->rate);
                for (j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j ++) {


@@ -561,20 +561,20 @@ rte_sched_port_config_pipe_profile_table(struct rte_sched_port *port, struct rte
 #ifdef RTE_SCHED_SUBPORT_TC_OV
                dst->tc_ov_weight = src->tc_ov_weight;
 #endif
 #ifdef RTE_SCHED_SUBPORT_TC_OV
                dst->tc_ov_weight = src->tc_ov_weight;
 #endif

-               
+

                /* WRR */
                for (j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j ++) {
                        uint32_t wrr_cost[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];
                        uint32_t lcd, lcd1, lcd2;
                        uint32_t qindex;
                /* WRR */
                for (j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j ++) {
                        uint32_t wrr_cost[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];
                        uint32_t lcd, lcd1, lcd2;
                        uint32_t qindex;

-                       
+

                        qindex = j * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS;
                        qindex = j * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS;

-                       
+

                        wrr_cost[0] = src->wrr_weights[qindex];
                        wrr_cost[1] = src->wrr_weights[qindex + 1];
                        wrr_cost[2] = src->wrr_weights[qindex + 2];
                        wrr_cost[3] = src->wrr_weights[qindex + 3];
                        wrr_cost[0] = src->wrr_weights[qindex];
                        wrr_cost[1] = src->wrr_weights[qindex + 1];
                        wrr_cost[2] = src->wrr_weights[qindex + 2];
                        wrr_cost[3] = src->wrr_weights[qindex + 3];

-                       
+

                        lcd1 = rte_get_lcd(wrr_cost[0], wrr_cost[1]);
                        lcd2 = rte_get_lcd(wrr_cost[2], wrr_cost[3]);
                        lcd = rte_get_lcd(lcd1, lcd2);
                        lcd1 = rte_get_lcd(wrr_cost[0], wrr_cost[1]);
                        lcd2 = rte_get_lcd(wrr_cost[2], wrr_cost[3]);
                        lcd = rte_get_lcd(lcd1, lcd2);


@@ -583,13 +583,13 @@ rte_sched_port_config_pipe_profile_table(struct rte_sched_port *port, struct rte
                        wrr_cost[1] = lcd / wrr_cost[1];
                        wrr_cost[2] = lcd / wrr_cost[2];
                        wrr_cost[3] = lcd / wrr_cost[3];
                        wrr_cost[1] = lcd / wrr_cost[1];
                        wrr_cost[2] = lcd / wrr_cost[2];
                        wrr_cost[3] = lcd / wrr_cost[3];

-                       
+

                        dst->wrr_cost[qindex] = (uint8_t) wrr_cost[0];
                        dst->wrr_cost[qindex + 1] = (uint8_t) wrr_cost[1];
                        dst->wrr_cost[qindex + 2] = (uint8_t) wrr_cost[2];
                        dst->wrr_cost[qindex + 3] = (uint8_t) wrr_cost[3];
                }
                        dst->wrr_cost[qindex] = (uint8_t) wrr_cost[0];
                        dst->wrr_cost[qindex + 1] = (uint8_t) wrr_cost[1];
                        dst->wrr_cost[qindex + 2] = (uint8_t) wrr_cost[2];
                        dst->wrr_cost[qindex + 3] = (uint8_t) wrr_cost[3];
                }

-       
+

                rte_sched_port_log_pipe_profile(port, i);
        }
 
                rte_sched_port_log_pipe_profile(port, i);
        }
 


@@ -597,7 +597,7 @@ rte_sched_port_config_pipe_profile_table(struct rte_sched_port *port, struct rte
        for (i = 0; i < port->n_pipe_profiles; i ++) {
                struct rte_sched_pipe_params *src = params->pipe_profiles + i;
                uint32_t pipe_tc3_rate = src->tc_rate[3];
        for (i = 0; i < port->n_pipe_profiles; i ++) {
                struct rte_sched_pipe_params *src = params->pipe_profiles + i;
                uint32_t pipe_tc3_rate = src->tc_rate[3];

-               
+

                if (port->pipe_tc3_rate_max < pipe_tc3_rate) {
                        port->pipe_tc3_rate_max = pipe_tc3_rate;
                }
                if (port->pipe_tc3_rate_max < pipe_tc3_rate) {
                        port->pipe_tc3_rate_max = pipe_tc3_rate;
                }


@@ -609,13 +609,13 @@ rte_sched_port_config(struct rte_sched_port_params *params)
 {
        struct rte_sched_port *port = NULL;
        uint32_t mem_size, bmp_mem_size, n_queues_per_port, i;
 {
        struct rte_sched_port *port = NULL;
        uint32_t mem_size, bmp_mem_size, n_queues_per_port, i;

-       
+

        /* Check user parameters. Determine the amount of memory to allocate */
        mem_size = rte_sched_port_get_memory_footprint(params);
        if (mem_size == 0) {
                return NULL;
        }
        /* Check user parameters. Determine the amount of memory to allocate */
        mem_size = rte_sched_port_get_memory_footprint(params);
        if (mem_size == 0) {
                return NULL;
        }

-       
+

        /* Allocate memory to store the data structures */
        port = rte_zmalloc("qos_params", mem_size, CACHE_LINE_SIZE);
        if (port == NULL) {
        /* Allocate memory to store the data structures */
        port = rte_zmalloc("qos_params", mem_size, CACHE_LINE_SIZE);
        if (port == NULL) {


@@ -634,7 +634,7 @@ rte_sched_port_config(struct rte_sched_port_params *params)
 #ifdef RTE_SCHED_RED
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {
                uint32_t j;
 #ifdef RTE_SCHED_RED
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {
                uint32_t j;

-               
+

                for (j = 0; j < e_RTE_METER_COLORS; j++) {
                        if (rte_red_config_init(&port->red_config[i][j],
                                params->red_params[i][j].wq_log2,
                for (j = 0; j < e_RTE_METER_COLORS; j++) {
                        if (rte_red_config_init(&port->red_config[i][j],
                                params->red_params[i][j].wq_log2,


@@ -661,10 +661,10 @@ rte_sched_port_config(struct rte_sched_port_params *params)
        port->busy_grinders = 0;
        port->pkts_out = NULL;
        port->n_pkts_out = 0;
        port->busy_grinders = 0;
        port->pkts_out = NULL;
        port->n_pkts_out = 0;

-       
+

        /* Queue base calculation */
        rte_sched_port_config_qsize(port);
        /* Queue base calculation */
        rte_sched_port_config_qsize(port);

-       
+

        /* Large data structures */
        port->subport = (struct rte_sched_subport *) (port->memory + rte_sched_port_get_array_base(params, e_RTE_SCHED_PORT_ARRAY_SUBPORT));
        port->pipe = (struct rte_sched_pipe *) (port->memory + rte_sched_port_get_array_base(params, e_RTE_SCHED_PORT_ARRAY_PIPE));
        /* Large data structures */
        port->subport = (struct rte_sched_subport *) (port->memory + rte_sched_port_get_array_base(params, e_RTE_SCHED_PORT_ARRAY_SUBPORT));
        port->pipe = (struct rte_sched_pipe *) (port->memory + rte_sched_port_get_array_base(params, e_RTE_SCHED_PORT_ARRAY_PIPE));


@@ -676,7 +676,7 @@ rte_sched_port_config(struct rte_sched_port_params *params)
 
        /* Pipe profile table */
        rte_sched_port_config_pipe_profile_table(port, params);
 
        /* Pipe profile table */
        rte_sched_port_config_pipe_profile_table(port, params);

-       
+

        /* Bitmap */
        n_queues_per_port = rte_sched_port_queues_per_port(port);
        bmp_mem_size = rte_bitmap_get_memory_footprint(n_queues_per_port);
        /* Bitmap */
        n_queues_per_port = rte_sched_port_queues_per_port(port);
        bmp_mem_size = rte_bitmap_get_memory_footprint(n_queues_per_port);


@@ -688,11 +688,11 @@ rte_sched_port_config(struct rte_sched_port_params *params)
        for (i = 0; i < RTE_SCHED_PORT_N_GRINDERS; i ++) {
                port->grinder_base_bmp_pos[i] = RTE_SCHED_PIPE_INVALID;
        }
        for (i = 0; i < RTE_SCHED_PORT_N_GRINDERS; i ++) {
                port->grinder_base_bmp_pos[i] = RTE_SCHED_PIPE_INVALID;
        }

-       
+

        return port;
 }
 
        return port;
 }
 

-void 
+void

 rte_sched_port_free(struct rte_sched_port *port)
 {
        /* Check user parameters */
 rte_sched_port_free(struct rte_sched_port *port)
 {
        /* Check user parameters */


@@ -708,65 +708,65 @@ static void
 rte_sched_port_log_subport_config(struct rte_sched_port *port, uint32_t i)
 {
        struct rte_sched_subport *s = port->subport + i;
 rte_sched_port_log_subport_config(struct rte_sched_port *port, uint32_t i)
 {
        struct rte_sched_subport *s = port->subport + i;

-       
-       RTE_LOG(INFO, SCHED, "Low level config for subport %u:\n"       
+
+       RTE_LOG(INFO, SCHED, "Low level config for subport %u:\n"

                "\tToken bucket: period = %u, credits per period = %u, size = %u\n"
                "\tTraffic classes: period = %u, credits per period = [%u, %u, %u, %u]\n"
                "\tTraffic class 3 oversubscription: wm min = %u, wm max = %u\n",
                i,
                "\tToken bucket: period = %u, credits per period = %u, size = %u\n"
                "\tTraffic classes: period = %u, credits per period = [%u, %u, %u, %u]\n"
                "\tTraffic class 3 oversubscription: wm min = %u, wm max = %u\n",
                i,

-               
+

                /* Token bucket */
                s->tb_period,
                s->tb_credits_per_period,
                s->tb_size,
                /* Token bucket */
                s->tb_period,
                s->tb_credits_per_period,
                s->tb_size,

-               
+

                /* Traffic classes */
                s->tc_period,
                s->tc_credits_per_period[0],
                s->tc_credits_per_period[1],
                s->tc_credits_per_period[2],
                s->tc_credits_per_period[3],
                /* Traffic classes */
                s->tc_period,
                s->tc_credits_per_period[0],
                s->tc_credits_per_period[1],
                s->tc_credits_per_period[2],
                s->tc_credits_per_period[3],

-               
+

                /* Traffic class 3 oversubscription */
                s->tc_ov_wm_min,
                s->tc_ov_wm_max);
 }
 
 int
                /* Traffic class 3 oversubscription */
                s->tc_ov_wm_min,
                s->tc_ov_wm_max);
 }
 
 int

-rte_sched_subport_config(struct rte_sched_port *port, 
+rte_sched_subport_config(struct rte_sched_port *port,

        uint32_t subport_id,
        struct rte_sched_subport_params *params)
 {
        struct rte_sched_subport *s;
        uint32_t i;
        uint32_t subport_id,
        struct rte_sched_subport_params *params)
 {
        struct rte_sched_subport *s;
        uint32_t i;

-       
+

        /* Check user parameters */
        if ((port == NULL) ||
            (subport_id >= port->n_subports_per_port) ||
                (params == NULL)) {
                return -1;
        }
        /* Check user parameters */
        if ((port == NULL) ||
            (subport_id >= port->n_subports_per_port) ||
                (params == NULL)) {
                return -1;
        }

-       
+

        if ((params->tb_rate == 0) || (params->tb_rate > port->rate)) {
                return -2;
        }
        if ((params->tb_rate == 0) || (params->tb_rate > port->rate)) {
                return -2;
        }

-       
+

        if (params->tb_size == 0) {
                return -3;
        }
        if (params->tb_size == 0) {
                return -3;
        }

-       
+

        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                if ((params->tc_rate[i] == 0) || (params->tc_rate[i] > params->tb_rate)) {
                        return -4;
                }
        }
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                if ((params->tc_rate[i] == 0) || (params->tc_rate[i] > params->tb_rate)) {
                        return -4;
                }
        }

-       
+

        if (params->tc_period == 0) {
                return -5;
        }
        if (params->tc_period == 0) {
                return -5;
        }

-       
+

        s = port->subport + subport_id;
        s = port->subport + subport_id;

-       
+

        /* Token Bucket (TB) */
        if (params->tb_rate == port->rate) {
                s->tb_credits_per_period = 1;
        /* Token Bucket (TB) */
        if (params->tb_rate == port->rate) {
                s->tb_credits_per_period = 1;


@@ -774,13 +774,13 @@ rte_sched_subport_config(struct rte_sched_port *port,
        } else {
                double tb_rate = ((double) params->tb_rate) / ((double) port->rate);
                double d = RTE_SCHED_TB_RATE_CONFIG_ERR;
        } else {
                double tb_rate = ((double) params->tb_rate) / ((double) port->rate);
                double d = RTE_SCHED_TB_RATE_CONFIG_ERR;

-               
+

                rte_approx(tb_rate, d, &s->tb_credits_per_period, &s->tb_period);
        }
        s->tb_size = params->tb_size;
        s->tb_time = port->time;
        s->tb_credits = s->tb_size / 2;
                rte_approx(tb_rate, d, &s->tb_credits_per_period, &s->tb_period);
        }
        s->tb_size = params->tb_size;
        s->tb_time = port->time;
        s->tb_credits = s->tb_size / 2;

-       
+

        /* Traffic Classes (TCs) */
        s->tc_period = (uint32_t) rte_sched_time_ms_to_bytes(params->tc_period, port->rate);
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
        /* Traffic Classes (TCs) */
        s->tc_period = (uint32_t) rte_sched_time_ms_to_bytes(params->tc_period, port->rate);
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {


@@ -790,7 +790,7 @@ rte_sched_subport_config(struct rte_sched_port *port,
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                s->tc_credits[i] = s->tc_credits_per_period[i];
        }
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                s->tc_credits[i] = s->tc_credits_per_period[i];
        }

-       
+

 #ifdef RTE_SCHED_SUBPORT_TC_OV
        /* TC oversubscription */
        s->tc_ov_wm_min = port->mtu;
 #ifdef RTE_SCHED_SUBPORT_TC_OV
        /* TC oversubscription */
        s->tc_ov_wm_min = port->mtu;


@@ -801,15 +801,15 @@ rte_sched_subport_config(struct rte_sched_port *port,
        s->tc_ov_n = 0;
        s->tc_ov_rate = 0;
 #endif
        s->tc_ov_n = 0;
        s->tc_ov_rate = 0;
 #endif

-       
+

        rte_sched_port_log_subport_config(port, subport_id);
        rte_sched_port_log_subport_config(port, subport_id);

-       
+

        return 0;
 }
 
 int
 rte_sched_pipe_config(struct rte_sched_port *port,
        return 0;
 }
 
 int
 rte_sched_pipe_config(struct rte_sched_port *port,

-       uint32_t subport_id, 
+       uint32_t subport_id,

        uint32_t pipe_id,
        int32_t pipe_profile)
 {
        uint32_t pipe_id,
        int32_t pipe_profile)
 {


@@ -817,7 +817,7 @@ rte_sched_pipe_config(struct rte_sched_port *port,
        struct rte_sched_pipe *p;
        struct rte_sched_pipe_profile *params;
        uint32_t deactivate, profile, i;
        struct rte_sched_pipe *p;
        struct rte_sched_pipe_profile *params;
        uint32_t deactivate, profile, i;

-       
+

        /* Check user parameters */
        profile = (uint32_t) pipe_profile;
        deactivate = (pipe_profile < 0);
        /* Check user parameters */
        profile = (uint32_t) pipe_profile;
        deactivate = (pipe_profile < 0);


@@ -827,15 +827,15 @@ rte_sched_pipe_config(struct rte_sched_port *port,
                ((!deactivate) && (profile >= port->n_pipe_profiles))) {
                return -1;
        }
                ((!deactivate) && (profile >= port->n_pipe_profiles))) {
                return -1;
        }

-       
+

        /* Check that subport configuration is valid */
        s = port->subport + subport_id;
        if (s->tb_period == 0) {
                return -2;
        }
        /* Check that subport configuration is valid */
        s = port->subport + subport_id;
        if (s->tb_period == 0) {
                return -2;
        }

-       
+

        p = port->pipe + (subport_id * port->n_pipes_per_subport + pipe_id);
        p = port->pipe + (subport_id * port->n_pipes_per_subport + pipe_id);

-       
+

        /* Handle the case when pipe already has a valid configuration */
        if (p->tb_time) {
                params = port->pipe_profiles + p->profile;
        /* Handle the case when pipe already has a valid configuration */
        if (p->tb_time) {
                params = port->pipe_profiles + p->profile;


@@ -844,26 +844,26 @@ rte_sched_pipe_config(struct rte_sched_port *port,
                double subport_tc3_rate = ((double) s->tc_credits_per_period[3]) / ((double) s->tc_period);
                double pipe_tc3_rate = ((double) params->tc_credits_per_period[3]) / ((double) params->tc_period);
                uint32_t tc3_ov = s->tc_ov;
                double subport_tc3_rate = ((double) s->tc_credits_per_period[3]) / ((double) s->tc_period);
                double pipe_tc3_rate = ((double) params->tc_credits_per_period[3]) / ((double) params->tc_period);
                uint32_t tc3_ov = s->tc_ov;

-               
+

                /* Unplug pipe from its subport */
                s->tc_ov_n -= params->tc_ov_weight;
                s->tc_ov_rate -= pipe_tc3_rate;
                s->tc_ov = s->tc_ov_rate > subport_tc3_rate;
                /* Unplug pipe from its subport */
                s->tc_ov_n -= params->tc_ov_weight;
                s->tc_ov_rate -= pipe_tc3_rate;
                s->tc_ov = s->tc_ov_rate > subport_tc3_rate;

-               
+

                if (s->tc_ov != tc3_ov) {
                if (s->tc_ov != tc3_ov) {

-                       RTE_LOG(INFO, SCHED, "Subport %u TC3 oversubscription is OFF (%.4lf >= %.4lf)\n", 
+                       RTE_LOG(INFO, SCHED, "Subport %u TC3 oversubscription is OFF (%.4lf >= %.4lf)\n",

                                subport_id, subport_tc3_rate, s->tc_ov_rate);
                }
 #endif
                                subport_id, subport_tc3_rate, s->tc_ov_rate);
                }
 #endif

-               
+

                /* Reset the pipe */
                memset(p, 0, sizeof(struct rte_sched_pipe));
        }
                /* Reset the pipe */
                memset(p, 0, sizeof(struct rte_sched_pipe));
        }

-       
+

        if (deactivate) {
                return 0;
        }
        if (deactivate) {
                return 0;
        }

-       
+

        /* Apply the new pipe configuration */
        p->profile = profile;
        params = port->pipe_profiles + p->profile;
        /* Apply the new pipe configuration */
        p->profile = profile;
        params = port->pipe_profiles + p->profile;


@@ -871,33 +871,33 @@ rte_sched_pipe_config(struct rte_sched_port *port,
        /* Token Bucket (TB) */
        p->tb_time = port->time;
        p->tb_credits = params->tb_size / 2;
        /* Token Bucket (TB) */
        p->tb_time = port->time;
        p->tb_credits = params->tb_size / 2;

-       
+

        /* Traffic Classes (TCs) */
        p->tc_time = port->time + params->tc_period;
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                p->tc_credits[i] = params->tc_credits_per_period[i];
        }
        /* Traffic Classes (TCs) */
        p->tc_time = port->time + params->tc_period;
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i ++) {
                p->tc_credits[i] = params->tc_credits_per_period[i];
        }

-       
+

 #ifdef RTE_SCHED_SUBPORT_TC_OV
        {
                /* Subport TC3 oversubscription */
                double subport_tc3_rate = ((double) s->tc_credits_per_period[3]) / ((double) s->tc_period);
                double pipe_tc3_rate = ((double) params->tc_credits_per_period[3]) / ((double) params->tc_period);
                uint32_t tc3_ov = s->tc_ov;
 #ifdef RTE_SCHED_SUBPORT_TC_OV
        {
                /* Subport TC3 oversubscription */
                double subport_tc3_rate = ((double) s->tc_credits_per_period[3]) / ((double) s->tc_period);
                double pipe_tc3_rate = ((double) params->tc_credits_per_period[3]) / ((double) params->tc_period);
                uint32_t tc3_ov = s->tc_ov;

-                       
+

                s->tc_ov_n += params->tc_ov_weight;
                s->tc_ov_rate += pipe_tc3_rate;
                s->tc_ov = s->tc_ov_rate > subport_tc3_rate;
                s->tc_ov_n += params->tc_ov_weight;
                s->tc_ov_rate += pipe_tc3_rate;
                s->tc_ov = s->tc_ov_rate > subport_tc3_rate;

-               
+

                if (s->tc_ov != tc3_ov) {
                if (s->tc_ov != tc3_ov) {

-                       RTE_LOG(INFO, SCHED, "Subport %u TC3 oversubscription is ON (%.4lf < %.4lf)\n", 
+                       RTE_LOG(INFO, SCHED, "Subport %u TC3 oversubscription is ON (%.4lf < %.4lf)\n",

                                subport_id, subport_tc3_rate, s->tc_ov_rate);
                }
                p->tc_ov_period_id = s->tc_ov_period_id;
                p->tc_ov_credits = s->tc_ov_wm;
        }
 #endif
                                subport_id, subport_tc3_rate, s->tc_ov_rate);
                }
                p->tc_ov_period_id = s->tc_ov_period_id;
                p->tc_ov_credits = s->tc_ov_wm;
        }
 #endif

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -908,7 +908,7 @@ rte_sched_subport_read_stats(struct rte_sched_port *port,
        uint32_t *tc_ov)
 {
        struct rte_sched_subport *s;
        uint32_t *tc_ov)
 {
        struct rte_sched_subport *s;

-       
+

        /* Check user parameters */
        if ((port == NULL) ||
            (subport_id >= port->n_subports_per_port) ||
        /* Check user parameters */
        if ((port == NULL) ||
            (subport_id >= port->n_subports_per_port) ||


@@ -921,10 +921,10 @@ rte_sched_subport_read_stats(struct rte_sched_port *port,
        /* Copy subport stats and clear */
        memcpy(stats, &s->stats, sizeof(struct rte_sched_subport_stats));
        memset(&s->stats, 0, sizeof(struct rte_sched_subport_stats));
        /* Copy subport stats and clear */
        memcpy(stats, &s->stats, sizeof(struct rte_sched_subport_stats));
        memset(&s->stats, 0, sizeof(struct rte_sched_subport_stats));

-       
+

        /* Subport TC ovesubscription status */
        *tc_ov = s->tc_ov;
        /* Subport TC ovesubscription status */
        *tc_ov = s->tc_ov;

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -936,7 +936,7 @@ rte_sched_queue_read_stats(struct rte_sched_port *port,
 {
        struct rte_sched_queue *q;
        struct rte_sched_queue_extra *qe;
 {
        struct rte_sched_queue *q;
        struct rte_sched_queue_extra *qe;

-       
+

        /* Check user parameters */
        if ((port == NULL) ||
            (queue_id >= rte_sched_port_queues_per_port(port)) ||
        /* Check user parameters */
        if ((port == NULL) ||
            (queue_id >= rte_sched_port_queues_per_port(port)) ||


@@ -950,10 +950,10 @@ rte_sched_queue_read_stats(struct rte_sched_port *port,
        /* Copy queue stats and clear */
        memcpy(stats, &qe->stats, sizeof(struct rte_sched_queue_stats));
        memset(&qe->stats, 0, sizeof(struct rte_sched_queue_stats));
        /* Copy queue stats and clear */
        memcpy(stats, &qe->stats, sizeof(struct rte_sched_queue_stats));
        memset(&qe->stats, 0, sizeof(struct rte_sched_queue_stats));

-       
+

        /* Queue length */
        *qlen = q->qw - q->qr;
        /* Queue length */
        *qlen = q->qw - q->qr;

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -961,11 +961,11 @@ static inline uint32_t
 rte_sched_port_qindex(struct rte_sched_port *port, uint32_t subport, uint32_t pipe, uint32_t traffic_class, uint32_t queue)
 {
        uint32_t result;
 rte_sched_port_qindex(struct rte_sched_port *port, uint32_t subport, uint32_t pipe, uint32_t traffic_class, uint32_t queue)
 {
        uint32_t result;

-       
+

        result = subport * port->n_pipes_per_subport + pipe;
        result = result * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE + traffic_class;
        result = result * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue;
        result = subport * port->n_pipes_per_subport + pipe;
        result = result * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE + traffic_class;
        result = result * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue;

-       
+

        return result;
 }
 
        return result;
 }
 


@@ -974,7 +974,7 @@ rte_sched_port_qbase(struct rte_sched_port *port, uint32_t qindex)
 {
        uint32_t pindex = qindex >> 4;
        uint32_t qpos = qindex & 0xF;
 {
        uint32_t pindex = qindex >> 4;
        uint32_t qpos = qindex & 0xF;

-       
+

        return (port->queue_array + pindex * port->qsize_sum + port->qsize_add[qpos]);
 }
 
        return (port->queue_array + pindex * port->qsize_sum + port->qsize_add[qpos]);
 }
 


@@ -982,7 +982,7 @@ static inline uint16_t
 rte_sched_port_qsize(struct rte_sched_port *port, uint32_t qindex)
 {
        uint32_t tc = (qindex >> 2) & 0x3;
 rte_sched_port_qsize(struct rte_sched_port *port, uint32_t qindex)
 {
        uint32_t tc = (qindex >> 2) & 0x3;

-       
+

        return port->qsize[tc];
 }
 
        return port->qsize[tc];
 }
 


@@ -992,7 +992,7 @@ static inline int
 rte_sched_port_queue_is_empty(struct rte_sched_port *port, uint32_t qindex)
 {
        struct rte_sched_queue *queue = port->queue + qindex;
 rte_sched_port_queue_is_empty(struct rte_sched_port *port, uint32_t qindex)
 {
        struct rte_sched_queue *queue = port->queue + qindex;

-       
+

        return (queue->qr == queue->qw);
 }
 
        return (queue->qr == queue->qw);
 }
 


@@ -1002,7 +1002,7 @@ rte_sched_port_queue_is_full(struct rte_sched_port *port, uint32_t qindex)
        struct rte_sched_queue *queue = port->queue + qindex;
        uint16_t qsize = rte_sched_port_qsize(port, qindex);
        uint16_t qlen = queue->qw - queue->qr;
        struct rte_sched_queue *queue = port->queue + qindex;
        uint16_t qsize = rte_sched_port_qsize(port, qindex);
        uint16_t qlen = queue->qw - queue->qr;

-       
+

        return (qlen >= qsize);
 }
 
        return (qlen >= qsize);
 }
 


@@ -1016,7 +1016,7 @@ rte_sched_port_update_subport_stats(struct rte_sched_port *port, uint32_t qindex
        struct rte_sched_subport *s = port->subport + (qindex / rte_sched_port_queues_per_subport(port));
        uint32_t tc_index = (qindex >> 2) & 0x3;
        uint32_t pkt_len = pkt->pkt.pkt_len;
        struct rte_sched_subport *s = port->subport + (qindex / rte_sched_port_queues_per_subport(port));
        uint32_t tc_index = (qindex >> 2) & 0x3;
        uint32_t pkt_len = pkt->pkt.pkt_len;

-       
+

        s->stats.n_pkts_tc[tc_index] += 1;
        s->stats.n_bytes_tc[tc_index] += pkt_len;
 }
        s->stats.n_pkts_tc[tc_index] += 1;
        s->stats.n_bytes_tc[tc_index] += pkt_len;
 }


@@ -1027,7 +1027,7 @@ rte_sched_port_update_subport_stats_on_drop(struct rte_sched_port *port, uint32_
        struct rte_sched_subport *s = port->subport + (qindex / rte_sched_port_queues_per_subport(port));
        uint32_t tc_index = (qindex >> 2) & 0x3;
        uint32_t pkt_len = pkt->pkt.pkt_len;
        struct rte_sched_subport *s = port->subport + (qindex / rte_sched_port_queues_per_subport(port));
        uint32_t tc_index = (qindex >> 2) & 0x3;
        uint32_t pkt_len = pkt->pkt.pkt_len;

-       
+

        s->stats.n_pkts_tc_dropped[tc_index] += 1;
        s->stats.n_bytes_tc_dropped[tc_index] += pkt_len;
 }
        s->stats.n_pkts_tc_dropped[tc_index] += 1;
        s->stats.n_bytes_tc_dropped[tc_index] += pkt_len;
 }


@@ -1037,7 +1037,7 @@ rte_sched_port_update_queue_stats(struct rte_sched_port *port, uint32_t qindex,
 {
        struct rte_sched_queue_extra *qe = port->queue_extra + qindex;
        uint32_t pkt_len = pkt->pkt.pkt_len;
 {
        struct rte_sched_queue_extra *qe = port->queue_extra + qindex;
        uint32_t pkt_len = pkt->pkt.pkt_len;

-       
+

        qe->stats.n_pkts += 1;
        qe->stats.n_bytes += pkt_len;
 }
        qe->stats.n_pkts += 1;
        qe->stats.n_bytes += pkt_len;
 }


@@ -1047,7 +1047,7 @@ rte_sched_port_update_queue_stats_on_drop(struct rte_sched_port *port, uint32_t
 {
        struct rte_sched_queue_extra *qe = port->queue_extra + qindex;
        uint32_t pkt_len = pkt->pkt.pkt_len;
 {
        struct rte_sched_queue_extra *qe = port->queue_extra + qindex;
        uint32_t pkt_len = pkt->pkt.pkt_len;

-       
+

        qe->stats.n_pkts_dropped += 1;
        qe->stats.n_bytes_dropped += pkt_len;
 }
        qe->stats.n_pkts_dropped += 1;
        qe->stats.n_bytes_dropped += pkt_len;
 }


@@ -1064,7 +1064,7 @@ rte_sched_port_red_drop(struct rte_sched_port *port, struct rte_mbuf *pkt, uint3
     struct rte_red *red;
        uint32_t tc_index;
        enum rte_meter_color color;
     struct rte_red *red;
        uint32_t tc_index;
        enum rte_meter_color color;

-       
+

        tc_index = (qindex >> 2) & 0x3;
        color = rte_sched_port_pkt_read_color(pkt);
        red_cfg = &port->red_config[tc_index][color];
        tc_index = (qindex >> 2) & 0x3;
        color = rte_sched_port_pkt_read_color(pkt);
        red_cfg = &port->red_config[tc_index][color];


@@ -1080,7 +1080,7 @@ rte_sched_port_set_queue_empty_timestamp(struct rte_sched_port *port, uint32_t q
 {
        struct rte_sched_queue_extra *qe;
     struct rte_red *red;
 {
        struct rte_sched_queue_extra *qe;
     struct rte_red *red;

-       
+

        qe = port->queue_extra + qindex;
        red = &qe->red;
 
        qe = port->queue_extra + qindex;
        red = &qe->red;
 


@@ -1103,20 +1103,20 @@ debug_pipe_is_empty(struct rte_sched_port *port, uint32_t pindex)
        uint32_t qindex, i;
 
        qindex = pindex << 4;
        uint32_t qindex, i;
 
        qindex = pindex << 4;

-       
+

        for (i = 0; i < 16; i ++){
                uint32_t queue_empty = rte_sched_port_queue_is_empty(port, qindex + i);
                uint32_t bmp_bit_clear = (rte_bitmap_get(port->bmp, qindex + i) == 0);
        for (i = 0; i < 16; i ++){
                uint32_t queue_empty = rte_sched_port_queue_is_empty(port, qindex + i);
                uint32_t bmp_bit_clear = (rte_bitmap_get(port->bmp, qindex + i) == 0);

-               
+

                if (queue_empty != bmp_bit_clear){
                        rte_panic("Queue status mismatch for queue %u of pipe %u\n", i, pindex);
                }
                if (queue_empty != bmp_bit_clear){
                        rte_panic("Queue status mismatch for queue %u of pipe %u\n", i, pindex);
                }

-               
+

                if (!queue_empty){
                        return 0;
                }
        }
                if (!queue_empty){
                        return 0;
                }
        }

-       
+

        return 1;
 }
 
        return 1;
 }
 


@@ -1125,11 +1125,11 @@ debug_check_queue_slab(struct rte_sched_port *port, uint32_t bmp_pos, uint64_t b
 {
        uint64_t mask;
        uint32_t i, panic;
 {
        uint64_t mask;
        uint32_t i, panic;

-       
+

        if (bmp_slab == 0){
                rte_panic("Empty slab at position %u\n", bmp_pos);
        }
        if (bmp_slab == 0){
                rte_panic("Empty slab at position %u\n", bmp_pos);
        }

-       
+

        panic = 0;
        for (i = 0, mask = 1; i < 64; i ++, mask <<= 1) {
                if (mask & bmp_slab){
        panic = 0;
        for (i = 0, mask = 1; i < 64; i ++, mask <<= 1) {
                if (mask & bmp_slab){


@@ -1139,7 +1139,7 @@ debug_check_queue_slab(struct rte_sched_port *port, uint32_t bmp_pos, uint64_t b
                        }
                }
        }
                        }
                }
        }

-       
+

        if (panic){
                rte_panic("Empty queues in slab 0x%" PRIx64 "starting at position %u\n",
                        bmp_slab, bmp_pos);
        if (panic){
                rte_panic("Empty queues in slab 0x%" PRIx64 "starting at position %u\n",
                        bmp_slab, bmp_pos);


@@ -1158,7 +1158,7 @@ rte_sched_port_enqueue_qptrs_prefetch0(struct rte_sched_port *port, struct rte_m
        uint32_t subport, pipe, traffic_class, queue, qindex;
 
        rte_sched_port_pkt_read_tree_path(pkt, &subport, &pipe, &traffic_class, &queue);
        uint32_t subport, pipe, traffic_class, queue, qindex;
 
        rte_sched_port_pkt_read_tree_path(pkt, &subport, &pipe, &traffic_class, &queue);

-       
+

        qindex = rte_sched_port_qindex(port, subport, pipe, traffic_class, queue);
        q = port->queue + qindex;
        rte_prefetch0(q);
        qindex = rte_sched_port_qindex(port, subport, pipe, traffic_class, queue);
        q = port->queue + qindex;
        rte_prefetch0(q);


@@ -1166,21 +1166,21 @@ rte_sched_port_enqueue_qptrs_prefetch0(struct rte_sched_port *port, struct rte_m
        qe = port->queue_extra + qindex;
        rte_prefetch0(qe);
 #endif
        qe = port->queue_extra + qindex;
        rte_prefetch0(qe);
 #endif

-       
+

        return qindex;
 }
 
 static inline void
 rte_sched_port_enqueue_qwa_prefetch0(struct rte_sched_port *port, uint32_t qindex, struct rte_mbuf **qbase)
        return qindex;
 }
 
 static inline void
 rte_sched_port_enqueue_qwa_prefetch0(struct rte_sched_port *port, uint32_t qindex, struct rte_mbuf **qbase)

-{      
+{

        struct rte_sched_queue *q;
        struct rte_mbuf **q_qw;
        struct rte_sched_queue *q;
        struct rte_mbuf **q_qw;

-       uint16_t qsize; 
-       
+       uint16_t qsize;
+

        q = port->queue + qindex;
        qsize = rte_sched_port_qsize(port, qindex);
        q_qw = qbase + (q->qw & (qsize - 1));
        q = port->queue + qindex;
        qsize = rte_sched_port_qsize(port, qindex);
        q_qw = qbase + (q->qw & (qsize - 1));

-       
+

        rte_prefetch0(q_qw);
        rte_bitmap_prefetch0(port->bmp, qindex);
 }
        rte_prefetch0(q_qw);
        rte_bitmap_prefetch0(port->bmp, qindex);
 }


@@ -1205,14 +1205,14 @@ rte_sched_port_enqueue_qwa(struct rte_sched_port *port, uint32_t qindex, struct
 #endif
                return 0;
        }
 #endif
                return 0;
        }

-       
+

        /* Enqueue packet */
        qbase[q->qw & (qsize - 1)] = pkt;
        q->qw ++;
        /* Enqueue packet */
        qbase[q->qw & (qsize - 1)] = pkt;
        q->qw ++;

-       
+

        /* Activate queue in the port bitmap */
        rte_bitmap_set(port->bmp, qindex);
        /* Activate queue in the port bitmap */
        rte_bitmap_set(port->bmp, qindex);

-       
+

        /* Statistics */
 #ifdef RTE_SCHED_COLLECT_STATS
        rte_sched_port_update_subport_stats(port, qindex, pkt);
        /* Statistics */
 #ifdef RTE_SCHED_COLLECT_STATS
        rte_sched_port_update_subport_stats(port, qindex, pkt);


@@ -1224,44 +1224,44 @@ rte_sched_port_enqueue_qwa(struct rte_sched_port *port, uint32_t qindex, struct
 
 #if RTE_SCHED_ENQUEUE == 0
 
 
 #if RTE_SCHED_ENQUEUE == 0
 

-int 
+int

 rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint32_t n_pkts)
 {
        uint32_t result, i;
 rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint32_t n_pkts)
 {
        uint32_t result, i;

-       
+

        result = 0;
        result = 0;

-       
+

        for (i = 0; i < n_pkts; i ++) {
                struct rte_mbuf *pkt;
                struct rte_mbuf **q_base;
                uint32_t subport, pipe, traffic_class, queue, qindex;
        for (i = 0; i < n_pkts; i ++) {
                struct rte_mbuf *pkt;
                struct rte_mbuf **q_base;
                uint32_t subport, pipe, traffic_class, queue, qindex;

-               
+

                pkt = pkts[i];
                pkt = pkts[i];

-               
+

                rte_sched_port_pkt_read_tree_path(pkt, &subport, &pipe, &traffic_class, &queue);
 
                qindex = rte_sched_port_qindex(port, subport, pipe, traffic_class, queue);
                rte_sched_port_pkt_read_tree_path(pkt, &subport, &pipe, &traffic_class, &queue);
 
                qindex = rte_sched_port_qindex(port, subport, pipe, traffic_class, queue);

-               
+

                q_base = rte_sched_port_qbase(port, qindex);
 
                result += rte_sched_port_enqueue_qwa(port, qindex, q_base, pkt);
        }
                q_base = rte_sched_port_qbase(port, qindex);
 
                result += rte_sched_port_enqueue_qwa(port, qindex, q_base, pkt);
        }

-       
+

        return result;
 }
 
 #else
 
        return result;
 }
 
 #else
 

-/* The enqueue function implements a 4-level pipeline with each stage processing 
- * two different packets. The purpose of using a pipeline is to hide the latency 
+/* The enqueue function implements a 4-level pipeline with each stage processing
+ * two different packets. The purpose of using a pipeline is to hide the latency

  * of prefetching the data structures. The naming convention is presented in the
  * diagram below:
  * of prefetching the data structures. The naming convention is presented in the
  * diagram below:

- * 
- *   p00  _______   p10  _______   p20  _______   p30  _______       
+ *
+ *   p00  _______   p10  _______   p20  _______   p30  _______

  * ----->|       |----->|       |----->|       |----->|       |----->
  * ----->|       |----->|       |----->|       |----->|       |----->

- *       |   0   |      |   1   |      |   2   |      |   3   |      
+ *       |   0   |      |   1   |      |   2   |      |   3   |

  * ----->|_______|----->|_______|----->|_______|----->|_______|----->
  * ----->|_______|----->|_______|----->|_______|----->|_______|----->

- *   p01            p11            p21            p31                
+ *   p01            p11            p21            p31

  *
  ***/
 int
  *
  ***/
 int


@@ -1272,44 +1272,44 @@ rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint
        uint32_t q00, q01, q10, q11, q20, q21, q30, q31, q_last;
        uint32_t r00, r01, r10, r11, r20, r21, r30, r31, r_last;
        uint32_t result, i;
        uint32_t q00, q01, q10, q11, q20, q21, q30, q31, q_last;
        uint32_t r00, r01, r10, r11, r20, r21, r30, r31, r_last;
        uint32_t result, i;

-       
+

        result = 0;
        result = 0;

-       
+

        /* Less then 6 input packets available, which is not enough to feed the pipeline */
        if (unlikely(n_pkts < 6)) {
                struct rte_mbuf **q_base[5];
                uint32_t q[5];
        /* Less then 6 input packets available, which is not enough to feed the pipeline */
        if (unlikely(n_pkts < 6)) {
                struct rte_mbuf **q_base[5];
                uint32_t q[5];

-               
+

                /* Prefetch the mbuf structure of each packet */
                for (i = 0; i < n_pkts; i ++) {
                        rte_prefetch0(pkts[i]);
                }
                /* Prefetch the mbuf structure of each packet */
                for (i = 0; i < n_pkts; i ++) {
                        rte_prefetch0(pkts[i]);
                }

-               
+

                /* Prefetch the queue structure for each queue */
                for (i = 0; i < n_pkts; i ++) {
                        q[i] = rte_sched_port_enqueue_qptrs_prefetch0(port, pkts[i]);
                }
                /* Prefetch the queue structure for each queue */
                for (i = 0; i < n_pkts; i ++) {
                        q[i] = rte_sched_port_enqueue_qptrs_prefetch0(port, pkts[i]);
                }

-               
+

                /* Prefetch the write pointer location of each queue */
                for (i = 0; i < n_pkts; i ++) {
                        q_base[i] = rte_sched_port_qbase(port, q[i]);
                        rte_sched_port_enqueue_qwa_prefetch0(port, q[i], q_base[i]);
                }
                /* Prefetch the write pointer location of each queue */
                for (i = 0; i < n_pkts; i ++) {
                        q_base[i] = rte_sched_port_qbase(port, q[i]);
                        rte_sched_port_enqueue_qwa_prefetch0(port, q[i], q_base[i]);
                }

-               
+

                /* Write each packet to its queue */
                for (i = 0; i < n_pkts; i ++) {
                        result += rte_sched_port_enqueue_qwa(port, q[i], q_base[i], pkts[i]);
                }
                /* Write each packet to its queue */
                for (i = 0; i < n_pkts; i ++) {
                        result += rte_sched_port_enqueue_qwa(port, q[i], q_base[i], pkts[i]);
                }

-               
+

                return result;
        }
                return result;
        }

-       
+

        /* Feed the first 3 stages of the pipeline (6 packets needed) */
        pkt20 = pkts[0];
        pkt21 = pkts[1];
        rte_prefetch0(pkt20);
        rte_prefetch0(pkt21);
        /* Feed the first 3 stages of the pipeline (6 packets needed) */
        pkt20 = pkts[0];
        pkt21 = pkts[1];
        rte_prefetch0(pkt20);
        rte_prefetch0(pkt21);

-       
+

        pkt10 = pkts[2];
        pkt11 = pkts[3];
        rte_prefetch0(pkt10);
        pkt10 = pkts[2];
        pkt11 = pkts[3];
        rte_prefetch0(pkt10);


@@ -1322,17 +1322,17 @@ rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint
        pkt01 = pkts[5];
        rte_prefetch0(pkt00);
        rte_prefetch0(pkt01);
        pkt01 = pkts[5];
        rte_prefetch0(pkt00);
        rte_prefetch0(pkt01);

-       
+

        q10 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt10);
        q11 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt11);
 
        q20_base = rte_sched_port_qbase(port, q20);
        q10 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt10);
        q11 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt11);
 
        q20_base = rte_sched_port_qbase(port, q20);

-       q21_base = rte_sched_port_qbase(port, q21);     
+       q21_base = rte_sched_port_qbase(port, q21);

        rte_sched_port_enqueue_qwa_prefetch0(port, q20, q20_base);
        rte_sched_port_enqueue_qwa_prefetch0(port, q21, q21_base);
        rte_sched_port_enqueue_qwa_prefetch0(port, q20, q20_base);
        rte_sched_port_enqueue_qwa_prefetch0(port, q21, q21_base);

-       
+

        /* Run the pipeline */
        /* Run the pipeline */

-       for (i = 6; i < (n_pkts & (~1)); i += 2) {      
+       for (i = 6; i < (n_pkts & (~1)); i += 2) {

                /* Propagate stage inputs */
                pkt30 = pkt20;
                pkt31 = pkt21;
                /* Propagate stage inputs */
                pkt30 = pkt20;
                pkt31 = pkt21;


@@ -1346,34 +1346,34 @@ rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint
                q21 = q11;
                q30_base = q20_base;
                q31_base = q21_base;
                q21 = q11;
                q30_base = q20_base;
                q31_base = q21_base;

-               
+

                /* Stage 0: Get packets in */
                pkt00 = pkts[i];
                pkt01 = pkts[i + 1];
                rte_prefetch0(pkt00);
                rte_prefetch0(pkt01);
                /* Stage 0: Get packets in */
                pkt00 = pkts[i];
                pkt01 = pkts[i + 1];
                rte_prefetch0(pkt00);
                rte_prefetch0(pkt01);

-               
+

                /* Stage 1: Prefetch queue structure storing queue pointers */
                q10 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt10);
                q11 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt11);
                /* Stage 1: Prefetch queue structure storing queue pointers */
                q10 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt10);
                q11 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt11);

-               
+

                /* Stage 2: Prefetch queue write location */
                q20_base = rte_sched_port_qbase(port, q20);
                q21_base = rte_sched_port_qbase(port, q21);
                rte_sched_port_enqueue_qwa_prefetch0(port, q20, q20_base);
                rte_sched_port_enqueue_qwa_prefetch0(port, q21, q21_base);
                /* Stage 2: Prefetch queue write location */
                q20_base = rte_sched_port_qbase(port, q20);
                q21_base = rte_sched_port_qbase(port, q21);
                rte_sched_port_enqueue_qwa_prefetch0(port, q20, q20_base);
                rte_sched_port_enqueue_qwa_prefetch0(port, q21, q21_base);

-               
+

                /* Stage 3: Write packet to queue and activate queue */
                r30 = rte_sched_port_enqueue_qwa(port, q30, q30_base, pkt30);
                r31 = rte_sched_port_enqueue_qwa(port, q31, q31_base, pkt31);
                result += r30 + r31;
        }
                /* Stage 3: Write packet to queue and activate queue */
                r30 = rte_sched_port_enqueue_qwa(port, q30, q30_base, pkt30);
                r31 = rte_sched_port_enqueue_qwa(port, q31, q31_base, pkt31);
                result += r30 + r31;
        }

-       
+

        /* Drain the pipeline (exactly 6 packets). Handle the last packet in the case
        of an odd number of input packets. */
        pkt_last = pkts[n_pkts - 1];
        rte_prefetch0(pkt_last);
        /* Drain the pipeline (exactly 6 packets). Handle the last packet in the case
        of an odd number of input packets. */
        pkt_last = pkts[n_pkts - 1];
        rte_prefetch0(pkt_last);

-       
+

        q00 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt00);
        q01 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt01);
 
        q00 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt00);
        q01 = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt01);
 


@@ -1381,18 +1381,18 @@ rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint
        q11_base = rte_sched_port_qbase(port, q11);
        rte_sched_port_enqueue_qwa_prefetch0(port, q10, q10_base);
        rte_sched_port_enqueue_qwa_prefetch0(port, q11, q11_base);
        q11_base = rte_sched_port_qbase(port, q11);
        rte_sched_port_enqueue_qwa_prefetch0(port, q10, q10_base);
        rte_sched_port_enqueue_qwa_prefetch0(port, q11, q11_base);

-               
+

        r20 = rte_sched_port_enqueue_qwa(port, q20, q20_base, pkt20);
        r21 = rte_sched_port_enqueue_qwa(port, q21, q21_base, pkt21);
        result += r20 + r21;
        r20 = rte_sched_port_enqueue_qwa(port, q20, q20_base, pkt20);
        r21 = rte_sched_port_enqueue_qwa(port, q21, q21_base, pkt21);
        result += r20 + r21;

-       
+

        q_last = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt_last);
 
        q00_base = rte_sched_port_qbase(port, q00);
        q01_base = rte_sched_port_qbase(port, q01);
        rte_sched_port_enqueue_qwa_prefetch0(port, q00, q00_base);
        rte_sched_port_enqueue_qwa_prefetch0(port, q01, q01_base);
        q_last = rte_sched_port_enqueue_qptrs_prefetch0(port, pkt_last);
 
        q00_base = rte_sched_port_qbase(port, q00);
        q01_base = rte_sched_port_qbase(port, q01);
        rte_sched_port_enqueue_qwa_prefetch0(port, q00, q00_base);
        rte_sched_port_enqueue_qwa_prefetch0(port, q01, q01_base);

-       
+

        r10 = rte_sched_port_enqueue_qwa(port, q10, q10_base, pkt10);
        r11 = rte_sched_port_enqueue_qwa(port, q11, q11_base, pkt11);
        result += r10 + r11;
        r10 = rte_sched_port_enqueue_qwa(port, q10, q10_base, pkt10);
        r11 = rte_sched_port_enqueue_qwa(port, q11, q11_base, pkt11);
        result += r10 + r11;


@@ -1408,7 +1408,7 @@ rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint
                r_last = rte_sched_port_enqueue_qwa(port, q_last, q_last_base, pkt_last);
                result += r_last;
        }
                r_last = rte_sched_port_enqueue_qwa(port, q_last, q_last_base, pkt_last);
                result += r_last;
        }

-       
+

        return result;
 }
 
        return result;
 }
 


@@ -1428,13 +1428,13 @@ grinder_credits_update(struct rte_sched_port *port, uint32_t pos)
        struct rte_sched_pipe *pipe = grinder->pipe;
        struct rte_sched_pipe_profile *params = grinder->pipe_params;
        uint64_t n_periods;
        struct rte_sched_pipe *pipe = grinder->pipe;
        struct rte_sched_pipe_profile *params = grinder->pipe_params;
        uint64_t n_periods;

-       
+

        /* Subport TB */
        n_periods = (port->time - subport->tb_time) / subport->tb_period;
        subport->tb_credits += n_periods * subport->tb_credits_per_period;
        subport->tb_credits = rte_sched_min_val_2_u32(subport->tb_credits, subport->tb_size);
        subport->tb_time += n_periods * subport->tb_period;
        /* Subport TB */
        n_periods = (port->time - subport->tb_time) / subport->tb_period;
        subport->tb_credits += n_periods * subport->tb_credits_per_period;
        subport->tb_credits = rte_sched_min_val_2_u32(subport->tb_credits, subport->tb_size);
        subport->tb_time += n_periods * subport->tb_period;

-       
+

        /* Pipe TB */
        n_periods = (port->time - pipe->tb_time) / params->tb_period;
        pipe->tb_credits += n_periods * params->tb_credits_per_period;
        /* Pipe TB */
        n_periods = (port->time - pipe->tb_time) / params->tb_period;
        pipe->tb_credits += n_periods * params->tb_credits_per_period;


@@ -1449,7 +1449,7 @@ grinder_credits_update(struct rte_sched_port *port, uint32_t pos)
                subport->tc_credits[3] = subport->tc_credits_per_period[3];
                subport->tc_time = port->time + subport->tc_period;
        }
                subport->tc_credits[3] = subport->tc_credits_per_period[3];
                subport->tc_time = port->time + subport->tc_period;
        }

-       
+

        /* Pipe TCs */
        if (unlikely(port->time >= pipe->tc_time)) {
                pipe->tc_credits[0] = params->tc_credits_per_period[0];
        /* Pipe TCs */
        if (unlikely(port->time >= pipe->tc_time)) {
                pipe->tc_credits[0] = params->tc_credits_per_period[0];


@@ -1470,19 +1470,19 @@ grinder_tc_ov_credits_update(struct rte_sched_port *port, uint32_t pos)
        uint32_t tc_ov_consumption[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        uint32_t tc_ov_consumption_max;
        uint32_t tc_ov_wm = subport->tc_ov_wm;
        uint32_t tc_ov_consumption[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
        uint32_t tc_ov_consumption_max;
        uint32_t tc_ov_wm = subport->tc_ov_wm;

-       
+

        if (subport->tc_ov == 0) {
                return subport->tc_ov_wm_max;
        }
        if (subport->tc_ov == 0) {
                return subport->tc_ov_wm_max;
        }

-       
+

        tc_ov_consumption[0] = subport->tc_credits_per_period[0] - subport->tc_credits[0];
        tc_ov_consumption[1] = subport->tc_credits_per_period[1] - subport->tc_credits[1];
        tc_ov_consumption[2] = subport->tc_credits_per_period[2] - subport->tc_credits[2];
        tc_ov_consumption[3] = subport->tc_credits_per_period[3] - subport->tc_credits[3];
        tc_ov_consumption[0] = subport->tc_credits_per_period[0] - subport->tc_credits[0];
        tc_ov_consumption[1] = subport->tc_credits_per_period[1] - subport->tc_credits[1];
        tc_ov_consumption[2] = subport->tc_credits_per_period[2] - subport->tc_credits[2];
        tc_ov_consumption[3] = subport->tc_credits_per_period[3] - subport->tc_credits[3];

-       
-       tc_ov_consumption_max = subport->tc_credits_per_period[3] - 
+
+       tc_ov_consumption_max = subport->tc_credits_per_period[3] -

                (tc_ov_consumption[0] + tc_ov_consumption[1] + tc_ov_consumption[2]);
                (tc_ov_consumption[0] + tc_ov_consumption[1] + tc_ov_consumption[2]);

-       
+

        if (tc_ov_consumption[3] > (tc_ov_consumption_max - port->mtu)) {
                tc_ov_wm  -= tc_ov_wm >> 7;
                if (tc_ov_wm < subport->tc_ov_wm_min) {
        if (tc_ov_consumption[3] > (tc_ov_consumption_max - port->mtu)) {
                tc_ov_wm  -= tc_ov_wm >> 7;
                if (tc_ov_wm < subport->tc_ov_wm_min) {


@@ -1490,7 +1490,7 @@ grinder_tc_ov_credits_update(struct rte_sched_port *port, uint32_t pos)
                }
                return tc_ov_wm;
        }
                }
                return tc_ov_wm;
        }

-       
+

        tc_ov_wm += (tc_ov_wm >> 7) + 1;
        if (tc_ov_wm > subport->tc_ov_wm_max) {
                tc_ov_wm = subport->tc_ov_wm_max;
        tc_ov_wm += (tc_ov_wm >> 7) + 1;
        if (tc_ov_wm > subport->tc_ov_wm_max) {
                tc_ov_wm = subport->tc_ov_wm_max;


@@ -1506,13 +1506,13 @@ grinder_credits_update(struct rte_sched_port *port, uint32_t pos)
        struct rte_sched_pipe *pipe = grinder->pipe;
        struct rte_sched_pipe_profile *params = grinder->pipe_params;
        uint64_t n_periods;
        struct rte_sched_pipe *pipe = grinder->pipe;
        struct rte_sched_pipe_profile *params = grinder->pipe_params;
        uint64_t n_periods;

-       
+

        /* Subport TB */
        n_periods = (port->time - subport->tb_time) / subport->tb_period;
        subport->tb_credits += n_periods * subport->tb_credits_per_period;
        subport->tb_credits = rte_sched_min_val_2_u32(subport->tb_credits, subport->tb_size);
        subport->tb_time += n_periods * subport->tb_period;
        /* Subport TB */
        n_periods = (port->time - subport->tb_time) / subport->tb_period;
        subport->tb_credits += n_periods * subport->tb_credits_per_period;
        subport->tb_credits = rte_sched_min_val_2_u32(subport->tb_credits, subport->tb_size);
        subport->tb_time += n_periods * subport->tb_period;

-       
+

        /* Pipe TB */
        n_periods = (port->time - pipe->tb_time) / params->tb_period;
        pipe->tb_credits += n_periods * params->tb_credits_per_period;
        /* Pipe TB */
        n_periods = (port->time - pipe->tb_time) / params->tb_period;
        pipe->tb_credits += n_periods * params->tb_credits_per_period;


@@ -1527,7 +1527,7 @@ grinder_credits_update(struct rte_sched_port *port, uint32_t pos)
                subport->tc_credits[1] = subport->tc_credits_per_period[1];
                subport->tc_credits[2] = subport->tc_credits_per_period[2];
                subport->tc_credits[3] = subport->tc_credits_per_period[3];
                subport->tc_credits[1] = subport->tc_credits_per_period[1];
                subport->tc_credits[2] = subport->tc_credits_per_period[2];
                subport->tc_credits[3] = subport->tc_credits_per_period[3];

-               
+

                subport->tc_time = port->time + subport->tc_period;
                subport->tc_ov_period_id ++;
        }
                subport->tc_time = port->time + subport->tc_period;
                subport->tc_ov_period_id ++;
        }


@@ -1540,11 +1540,11 @@ grinder_credits_update(struct rte_sched_port *port, uint32_t pos)
                pipe->tc_credits[3] = params->tc_credits_per_period[3];
                pipe->tc_time = port->time + params->tc_period;
        }
                pipe->tc_credits[3] = params->tc_credits_per_period[3];
                pipe->tc_time = port->time + params->tc_period;
        }

-       
+

        /* Pipe TCs - Oversubscription */
        if (unlikely(pipe->tc_ov_period_id != subport->tc_ov_period_id)) {
                pipe->tc_ov_credits = subport->tc_ov_wm * params->tc_ov_weight;
        /* Pipe TCs - Oversubscription */
        if (unlikely(pipe->tc_ov_period_id != subport->tc_ov_period_id)) {
                pipe->tc_ov_credits = subport->tc_ov_wm * params->tc_ov_weight;

-               
+

                pipe->tc_ov_period_id = subport->tc_ov_period_id;
        }
 }
                pipe->tc_ov_period_id = subport->tc_ov_period_id;
        }
 }


@@ -1575,11 +1575,11 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos)
                (pkt_len <= subport_tc_credits) &&
                (pkt_len <= pipe_tb_credits) &&
                (pkt_len <= pipe_tc_credits);
                (pkt_len <= subport_tc_credits) &&
                (pkt_len <= pipe_tb_credits) &&
                (pkt_len <= pipe_tc_credits);

-       
+

        if (!enough_credits) {
                return 0;
        }
        if (!enough_credits) {
                return 0;
        }

-       
+

        /* Update port credits */
        subport->tb_credits -= pkt_len;
        subport->tc_credits[tc_index] -= pkt_len;
        /* Update port credits */
        subport->tb_credits -= pkt_len;
        subport->tc_credits[tc_index] -= pkt_len;


@@ -1608,25 +1608,25 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos)
        uint32_t pipe_tc_ov_mask2[] = {0, 0, 0, UINT32_MAX};
        uint32_t pipe_tc_ov_credits = pipe_tc_ov_mask1[tc_index];
        int enough_credits;
        uint32_t pipe_tc_ov_mask2[] = {0, 0, 0, UINT32_MAX};
        uint32_t pipe_tc_ov_credits = pipe_tc_ov_mask1[tc_index];
        int enough_credits;

-       
+

        /* Check pipe and subport credits */
        enough_credits = (pkt_len <= subport_tb_credits) &&
                (pkt_len <= subport_tc_credits) &&
                (pkt_len <= pipe_tb_credits) &&
                (pkt_len <= pipe_tc_credits) &&
                (pkt_len <= pipe_tc_ov_credits);
        /* Check pipe and subport credits */
        enough_credits = (pkt_len <= subport_tb_credits) &&
                (pkt_len <= subport_tc_credits) &&
                (pkt_len <= pipe_tb_credits) &&
                (pkt_len <= pipe_tc_credits) &&
                (pkt_len <= pipe_tc_ov_credits);

-       
+

        if (!enough_credits) {
                return 0;
        }
        if (!enough_credits) {
                return 0;
        }

-       
+

        /* Update pipe and subport credits */
        subport->tb_credits -= pkt_len;
        subport->tc_credits[tc_index] -= pkt_len;
        pipe->tb_credits -= pkt_len;
        pipe->tc_credits[tc_index] -= pkt_len;
        pipe->tc_ov_credits -= pipe_tc_ov_mask2[tc_index] & pkt_len;
        /* Update pipe and subport credits */
        subport->tb_credits -= pkt_len;
        subport->tc_credits[tc_index] -= pkt_len;
        pipe->tb_credits -= pkt_len;
        pipe->tc_credits[tc_index] -= pkt_len;
        pipe->tc_ov_credits -= pipe_tc_ov_mask2[tc_index] & pkt_len;

-       
+

        return 1;
 }
 
        return 1;
 }
 


@@ -1634,7 +1634,7 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos)
 
 #endif /* RTE_SCHED_TS_CREDITS_CHECK */
 
 
 #endif /* RTE_SCHED_TS_CREDITS_CHECK */
 

-static inline int 
+static inline int

 grinder_schedule(struct rte_sched_port *port, uint32_t pos)
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
 grinder_schedule(struct rte_sched_port *port, uint32_t pos)
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;


@@ -1650,7 +1650,7 @@ grinder_schedule(struct rte_sched_port *port, uint32_t pos)
 
        /* Advance port time */
        port->time += pkt_len;
 
        /* Advance port time */
        port->time += pkt_len;

-       
+

        /* Send packet */
        port->pkts_out[port->n_pkts_out ++] = pkt;
        queue->qr ++;
        /* Send packet */
        port->pkts_out[port->n_pkts_out ++] = pkt;
        queue->qr ++;


@@ -1663,11 +1663,11 @@ grinder_schedule(struct rte_sched_port *port, uint32_t pos)
                grinder->wrr_mask[grinder->qpos] = 0;
                rte_sched_port_set_queue_empty_timestamp(port, qindex);
        }
                grinder->wrr_mask[grinder->qpos] = 0;
                rte_sched_port_set_queue_empty_timestamp(port, qindex);
        }

-       
+

        /* Reset pipe loop detection */
        port->pipe_loop = RTE_SCHED_PIPE_INVALID;
        grinder->productive = 1;
        /* Reset pipe loop detection */
        port->pipe_loop = RTE_SCHED_PIPE_INVALID;
        grinder->productive = 1;

-       
+

        return 1;
 }
 
        return 1;
 }
 


@@ -1695,13 +1695,13 @@ static inline int
 grinder_pipe_exists(struct rte_sched_port *port, uint32_t base_pipe)
 {
        uint32_t i;
 grinder_pipe_exists(struct rte_sched_port *port, uint32_t base_pipe)
 {
        uint32_t i;

-       
+

        for (i = 0; i < RTE_SCHED_PORT_N_GRINDERS; i ++) {
                if (port->grinder_base_bmp_pos[i] == base_pipe) {
                        return 1;
                }
        }
        for (i = 0; i < RTE_SCHED_PORT_N_GRINDERS; i ++) {
                if (port->grinder_base_bmp_pos[i] == base_pipe) {
                        return 1;
                }
        }

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -1715,24 +1715,24 @@ grinder_pcache_populate(struct rte_sched_port *port, uint32_t pos, uint32_t bmp_
 
        grinder->pcache_w = 0;
        grinder->pcache_r = 0;
 
        grinder->pcache_w = 0;
        grinder->pcache_r = 0;

-       
+

        w[0] = (uint16_t) bmp_slab;
        w[1] = (uint16_t) (bmp_slab >> 16);
        w[2] = (uint16_t) (bmp_slab >> 32);
        w[3] = (uint16_t) (bmp_slab >> 48);
        w[0] = (uint16_t) bmp_slab;
        w[1] = (uint16_t) (bmp_slab >> 16);
        w[2] = (uint16_t) (bmp_slab >> 32);
        w[3] = (uint16_t) (bmp_slab >> 48);

-       
+

        grinder->pcache_qmask[grinder->pcache_w] = w[0];
        grinder->pcache_qindex[grinder->pcache_w] = bmp_pos;
        grinder->pcache_w += (w[0] != 0);
        grinder->pcache_qmask[grinder->pcache_w] = w[0];
        grinder->pcache_qindex[grinder->pcache_w] = bmp_pos;
        grinder->pcache_w += (w[0] != 0);

-       
+

        grinder->pcache_qmask[grinder->pcache_w] = w[1];
        grinder->pcache_qindex[grinder->pcache_w] = bmp_pos + 16;
        grinder->pcache_w += (w[1] != 0);
        grinder->pcache_qmask[grinder->pcache_w] = w[1];
        grinder->pcache_qindex[grinder->pcache_w] = bmp_pos + 16;
        grinder->pcache_w += (w[1] != 0);

-       
+

        grinder->pcache_qmask[grinder->pcache_w] = w[2];
        grinder->pcache_qindex[grinder->pcache_w] = bmp_pos + 32;
        grinder->pcache_w += (w[2] != 0);
        grinder->pcache_qmask[grinder->pcache_w] = w[2];
        grinder->pcache_qindex[grinder->pcache_w] = bmp_pos + 32;
        grinder->pcache_w += (w[2] != 0);

-       
+

        grinder->pcache_qmask[grinder->pcache_w] = w[3];
        grinder->pcache_qindex[grinder->pcache_w] = bmp_pos + 48;
        grinder->pcache_w += (w[3] != 0);
        grinder->pcache_qmask[grinder->pcache_w] = w[3];
        grinder->pcache_qindex[grinder->pcache_w] = bmp_pos + 48;
        grinder->pcache_w += (w[3] != 0);


@@ -1743,27 +1743,27 @@ grinder_tccache_populate(struct rte_sched_port *port, uint32_t pos, uint32_t qin
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
        uint8_t b[4];
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
        uint8_t b[4];

-       
+

        grinder->tccache_w = 0;
        grinder->tccache_r = 0;
        grinder->tccache_w = 0;
        grinder->tccache_r = 0;

-       
+

        b[0] = (uint8_t) (qmask & 0xF);
        b[1] = (uint8_t) ((qmask >> 4) & 0xF);
        b[2] = (uint8_t) ((qmask >> 8) & 0xF);
        b[3] = (uint8_t) ((qmask >> 12) & 0xF);
        b[0] = (uint8_t) (qmask & 0xF);
        b[1] = (uint8_t) ((qmask >> 4) & 0xF);
        b[2] = (uint8_t) ((qmask >> 8) & 0xF);
        b[3] = (uint8_t) ((qmask >> 12) & 0xF);

-       
+

        grinder->tccache_qmask[grinder->tccache_w] = b[0];
        grinder->tccache_qindex[grinder->tccache_w] = qindex;
        grinder->tccache_w += (b[0] != 0);
        grinder->tccache_qmask[grinder->tccache_w] = b[0];
        grinder->tccache_qindex[grinder->tccache_w] = qindex;
        grinder->tccache_w += (b[0] != 0);

-       
+

        grinder->tccache_qmask[grinder->tccache_w] = b[1];
        grinder->tccache_qindex[grinder->tccache_w] = qindex + 4;
        grinder->tccache_w += (b[1] != 0);
        grinder->tccache_qmask[grinder->tccache_w] = b[1];
        grinder->tccache_qindex[grinder->tccache_w] = qindex + 4;
        grinder->tccache_w += (b[1] != 0);

-       
+

        grinder->tccache_qmask[grinder->tccache_w] = b[2];
        grinder->tccache_qindex[grinder->tccache_w] = qindex + 8;
        grinder->tccache_w += (b[2] != 0);
        grinder->tccache_qmask[grinder->tccache_w] = b[2];
        grinder->tccache_qindex[grinder->tccache_w] = qindex + 8;
        grinder->tccache_w += (b[2] != 0);

-       
+

        grinder->tccache_qmask[grinder->tccache_w] = b[3];
        grinder->tccache_qindex[grinder->tccache_w] = qindex + 12;
        grinder->tccache_w += (b[3] != 0);
        grinder->tccache_qmask[grinder->tccache_w] = b[3];
        grinder->tccache_qindex[grinder->tccache_w] = qindex + 12;
        grinder->tccache_w += (b[3] != 0);


@@ -1774,8 +1774,8 @@ grinder_next_tc(struct rte_sched_port *port, uint32_t pos)
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
        struct rte_mbuf **qbase;
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
        struct rte_mbuf **qbase;

-       uint32_t qindex; 
-       uint16_t qsize; 
+       uint32_t qindex;
+       uint16_t qsize;

 
        if (grinder->tccache_r == grinder->tccache_w) {
                return 0;
 
        if (grinder->tccache_r == grinder->tccache_w) {
                return 0;


@@ -1788,7 +1788,7 @@ grinder_next_tc(struct rte_sched_port *port, uint32_t pos)
        grinder->tc_index = (qindex >> 2) & 0x3;
        grinder->qmask = grinder->tccache_qmask[grinder->tccache_r];
        grinder->qsize = qsize;
        grinder->tc_index = (qindex >> 2) & 0x3;
        grinder->qmask = grinder->tccache_qmask[grinder->tccache_r];
        grinder->qsize = qsize;

-       
+

        grinder->qindex[0] = qindex;
        grinder->qindex[1] = qindex + 1;
        grinder->qindex[2] = qindex + 2;
        grinder->qindex[0] = qindex;
        grinder->qindex[1] = qindex + 1;
        grinder->qindex[2] = qindex + 2;


@@ -1803,7 +1803,7 @@ grinder_next_tc(struct rte_sched_port *port, uint32_t pos)
        grinder->qbase[1] = qbase + qsize;
        grinder->qbase[2] = qbase + 2 * qsize;
        grinder->qbase[3] = qbase + 3 * qsize;
        grinder->qbase[1] = qbase + qsize;
        grinder->qbase[2] = qbase + 2 * qsize;
        grinder->qbase[3] = qbase + 3 * qsize;

-       
+

        grinder->tccache_r ++;
        return 1;
 }
        grinder->tccache_r ++;
        return 1;
 }


@@ -1822,15 +1822,15 @@ grinder_next_pipe(struct rte_sched_port *port, uint32_t pos)
        } else {
                uint64_t bmp_slab = 0;
                uint32_t bmp_pos = 0;
        } else {
                uint64_t bmp_slab = 0;
                uint32_t bmp_pos = 0;

-               
-               /* Get another non-empty pipe group */          
+
+               /* Get another non-empty pipe group */

                if (unlikely(rte_bitmap_scan(port->bmp, &bmp_pos, &bmp_slab) <= 0)) {
                        return 0;
                }
                if (unlikely(rte_bitmap_scan(port->bmp, &bmp_pos, &bmp_slab) <= 0)) {
                        return 0;
                }

-               
+

 #if RTE_SCHED_DEBUG
                debug_check_queue_slab(port, bmp_pos, bmp_slab);
 #if RTE_SCHED_DEBUG
                debug_check_queue_slab(port, bmp_pos, bmp_slab);

-#endif 
+#endif

 
                /* Return if pipe group already in one of the other grinders */
                port->grinder_base_bmp_pos[pos] = RTE_SCHED_BMP_POS_INVALID;
 
                /* Return if pipe group already in one of the other grinders */
                port->grinder_base_bmp_pos[pos] = RTE_SCHED_BMP_POS_INVALID;


@@ -1838,7 +1838,7 @@ grinder_next_pipe(struct rte_sched_port *port, uint32_t pos)
                        return 0;
                }
                port->grinder_base_bmp_pos[pos] = bmp_pos;
                        return 0;
                }
                port->grinder_base_bmp_pos[pos] = bmp_pos;

-               
+

                /* Install new pipe group into grinder's pipe cache */
                grinder_pcache_populate(port, pos, bmp_pos, bmp_slab);
 
                /* Install new pipe group into grinder's pipe cache */
                grinder_pcache_populate(port, pos, bmp_pos, bmp_slab);
 


@@ -1846,7 +1846,7 @@ grinder_next_pipe(struct rte_sched_port *port, uint32_t pos)
                pipe_qindex = grinder->pcache_qindex[0];
                grinder->pcache_r = 1;
        }
                pipe_qindex = grinder->pcache_qindex[0];
                grinder->pcache_r = 1;
        }

-       
+

        /* Install new pipe in the grinder */
        grinder->pindex = pipe_qindex >> 4;
        grinder->subport = port->subport + (grinder->pindex / port->n_pipes_per_subport);
        /* Install new pipe in the grinder */
        grinder->pindex = pipe_qindex >> 4;
        grinder->subport = port->subport + (grinder->pindex / port->n_pipes_per_subport);


@@ -1856,14 +1856,14 @@ grinder_next_pipe(struct rte_sched_port *port, uint32_t pos)
 
        grinder_tccache_populate(port, pos, pipe_qindex, pipe_qmask);
        grinder_next_tc(port, pos);
 
        grinder_tccache_populate(port, pos, pipe_qindex, pipe_qmask);
        grinder_next_tc(port, pos);

-       
+

        /* Check for pipe exhaustion */
        if (grinder->pindex == port->pipe_loop) {
                port->pipe_exhaustion = 1;
                port->pipe_loop = RTE_SCHED_PIPE_INVALID;
        }
        /* Check for pipe exhaustion */
        if (grinder->pindex == port->pipe_loop) {
                port->pipe_exhaustion = 1;
                port->pipe_loop = RTE_SCHED_PIPE_INVALID;
        }

-       
-       return 1;       
+
+       return 1;

 }
 
 #if RTE_SCHED_WRR == 0
 }
 
 #if RTE_SCHED_WRR == 0


@@ -1877,7 +1877,7 @@ grinder_wrr(struct rte_sched_port *port, uint32_t pos)
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
        uint64_t slab = grinder->qmask;
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
        uint64_t slab = grinder->qmask;

-       
+

        if (rte_bsf64(slab, &grinder->qpos) == 0) {
                rte_panic("grinder wrr\n");
        }
        if (rte_bsf64(slab, &grinder->qpos) == 0) {
                rte_panic("grinder wrr\n");
        }


@@ -1894,19 +1894,19 @@ grinder_wrr_load(struct rte_sched_port *port, uint32_t pos)
        uint32_t tc_index = grinder->tc_index;
        uint32_t qmask = grinder->qmask;
        uint32_t qindex;
        uint32_t tc_index = grinder->tc_index;
        uint32_t qmask = grinder->qmask;
        uint32_t qindex;

-       
+

        qindex = tc_index * 4;
        qindex = tc_index * 4;

-       
+

        grinder->wrr_tokens[0] = ((uint16_t) pipe->wrr_tokens[qindex]) << RTE_SCHED_WRR_SHIFT;
        grinder->wrr_tokens[1] = ((uint16_t) pipe->wrr_tokens[qindex + 1]) << RTE_SCHED_WRR_SHIFT;
        grinder->wrr_tokens[2] = ((uint16_t) pipe->wrr_tokens[qindex + 2]) << RTE_SCHED_WRR_SHIFT;
        grinder->wrr_tokens[3] = ((uint16_t) pipe->wrr_tokens[qindex + 3]) << RTE_SCHED_WRR_SHIFT;
        grinder->wrr_tokens[0] = ((uint16_t) pipe->wrr_tokens[qindex]) << RTE_SCHED_WRR_SHIFT;
        grinder->wrr_tokens[1] = ((uint16_t) pipe->wrr_tokens[qindex + 1]) << RTE_SCHED_WRR_SHIFT;
        grinder->wrr_tokens[2] = ((uint16_t) pipe->wrr_tokens[qindex + 2]) << RTE_SCHED_WRR_SHIFT;
        grinder->wrr_tokens[3] = ((uint16_t) pipe->wrr_tokens[qindex + 3]) << RTE_SCHED_WRR_SHIFT;

-       
+

        grinder->wrr_mask[0] = (qmask & 0x1) * 0xFFFF;
        grinder->wrr_mask[1] = ((qmask >> 1) & 0x1) * 0xFFFF;
        grinder->wrr_mask[2] = ((qmask >> 2) & 0x1) * 0xFFFF;
        grinder->wrr_mask[3] = ((qmask >> 3) & 0x1) * 0xFFFF;
        grinder->wrr_mask[0] = (qmask & 0x1) * 0xFFFF;
        grinder->wrr_mask[1] = ((qmask >> 1) & 0x1) * 0xFFFF;
        grinder->wrr_mask[2] = ((qmask >> 2) & 0x1) * 0xFFFF;
        grinder->wrr_mask[3] = ((qmask >> 3) & 0x1) * 0xFFFF;

-       
+

        grinder->wrr_cost[0] = pipe_params->wrr_cost[qindex];
        grinder->wrr_cost[1] = pipe_params->wrr_cost[qindex + 1];
        grinder->wrr_cost[2] = pipe_params->wrr_cost[qindex + 2];
        grinder->wrr_cost[0] = pipe_params->wrr_cost[qindex];
        grinder->wrr_cost[1] = pipe_params->wrr_cost[qindex + 1];
        grinder->wrr_cost[2] = pipe_params->wrr_cost[qindex + 2];


@@ -1920,9 +1920,9 @@ grinder_wrr_store(struct rte_sched_port *port, uint32_t pos)
        struct rte_sched_pipe *pipe = grinder->pipe;
        uint32_t tc_index = grinder->tc_index;
        uint32_t qindex;
        struct rte_sched_pipe *pipe = grinder->pipe;
        uint32_t tc_index = grinder->tc_index;
        uint32_t qindex;

-       
+

        qindex = tc_index * 4;
        qindex = tc_index * 4;

-       
+

        pipe->wrr_tokens[qindex] = (uint8_t) ((grinder->wrr_tokens[0] & grinder->wrr_mask[0]) >> RTE_SCHED_WRR_SHIFT);
        pipe->wrr_tokens[qindex + 1] = (uint8_t) ((grinder->wrr_tokens[1] & grinder->wrr_mask[1]) >> RTE_SCHED_WRR_SHIFT);
        pipe->wrr_tokens[qindex + 2] = (uint8_t) ((grinder->wrr_tokens[2] & grinder->wrr_mask[2]) >> RTE_SCHED_WRR_SHIFT);
        pipe->wrr_tokens[qindex] = (uint8_t) ((grinder->wrr_tokens[0] & grinder->wrr_mask[0]) >> RTE_SCHED_WRR_SHIFT);
        pipe->wrr_tokens[qindex + 1] = (uint8_t) ((grinder->wrr_tokens[1] & grinder->wrr_mask[1]) >> RTE_SCHED_WRR_SHIFT);
        pipe->wrr_tokens[qindex + 2] = (uint8_t) ((grinder->wrr_tokens[2] & grinder->wrr_mask[2]) >> RTE_SCHED_WRR_SHIFT);


@@ -1939,10 +1939,10 @@ grinder_wrr(struct rte_sched_port *port, uint32_t pos)
        grinder->wrr_tokens[1] |= ~grinder->wrr_mask[1];
        grinder->wrr_tokens[2] |= ~grinder->wrr_mask[2];
        grinder->wrr_tokens[3] |= ~grinder->wrr_mask[3];
        grinder->wrr_tokens[1] |= ~grinder->wrr_mask[1];
        grinder->wrr_tokens[2] |= ~grinder->wrr_mask[2];
        grinder->wrr_tokens[3] |= ~grinder->wrr_mask[3];

-       
+

        grinder->qpos = rte_min_pos_4_u16(grinder->wrr_tokens);
        wrr_tokens_min = grinder->wrr_tokens[grinder->qpos];
        grinder->qpos = rte_min_pos_4_u16(grinder->wrr_tokens);
        wrr_tokens_min = grinder->wrr_tokens[grinder->qpos];

-       
+

        grinder->wrr_tokens[0] -= wrr_tokens_min;
        grinder->wrr_tokens[1] -= wrr_tokens_min;
        grinder->wrr_tokens[2] -= wrr_tokens_min;
        grinder->wrr_tokens[0] -= wrr_tokens_min;
        grinder->wrr_tokens[1] -= wrr_tokens_min;
        grinder->wrr_tokens[2] -= wrr_tokens_min;


@@ -1961,7 +1961,7 @@ static inline void
 grinder_prefetch_pipe(struct rte_sched_port *port, uint32_t pos)
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
 grinder_prefetch_pipe(struct rte_sched_port *port, uint32_t pos)
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;

-       
+

        rte_prefetch0(grinder->pipe);
        rte_prefetch0(grinder->queue[0]);
 }
        rte_prefetch0(grinder->pipe);
        rte_prefetch0(grinder->queue[0]);
 }


@@ -1971,21 +1971,21 @@ grinder_prefetch_tc_queue_arrays(struct rte_sched_port *port, uint32_t pos)
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
        uint16_t qsize, qr[4];
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
        uint16_t qsize, qr[4];

-       
+

        qsize = grinder->qsize;
        qr[0] = grinder->queue[0]->qr & (qsize - 1);
        qr[1] = grinder->queue[1]->qr & (qsize - 1);
        qr[2] = grinder->queue[2]->qr & (qsize - 1);
        qr[3] = grinder->queue[3]->qr & (qsize - 1);
        qsize = grinder->qsize;
        qr[0] = grinder->queue[0]->qr & (qsize - 1);
        qr[1] = grinder->queue[1]->qr & (qsize - 1);
        qr[2] = grinder->queue[2]->qr & (qsize - 1);
        qr[3] = grinder->queue[3]->qr & (qsize - 1);

-       
+

        rte_prefetch0(grinder->qbase[0] + qr[0]);
        rte_prefetch0(grinder->qbase[1] + qr[1]);
 
        grinder_wrr_load(port, pos);
        grinder_wrr(port, pos);
        rte_prefetch0(grinder->qbase[0] + qr[0]);
        rte_prefetch0(grinder->qbase[1] + qr[1]);
 
        grinder_wrr_load(port, pos);
        grinder_wrr(port, pos);

-       
+

        rte_prefetch0(grinder->qbase[2] + qr[2]);
        rte_prefetch0(grinder->qbase[2] + qr[2]);

-       rte_prefetch0(grinder->qbase[3] + qr[3]);       
+       rte_prefetch0(grinder->qbase[3] + qr[3]);

 }
 
 static inline void
 }
 
 static inline void


@@ -1996,13 +1996,13 @@ grinder_prefetch_mbuf(struct rte_sched_port *port, uint32_t pos)
        struct rte_mbuf **qbase = grinder->qbase[qpos];
        uint16_t qsize = grinder->qsize;
        uint16_t qr = grinder->queue[qpos]->qr & (qsize - 1);
        struct rte_mbuf **qbase = grinder->qbase[qpos];
        uint16_t qsize = grinder->qsize;
        uint16_t qr = grinder->queue[qpos]->qr & (qsize - 1);

-       
+

        grinder->pkt = qbase[qr];
        rte_prefetch0(grinder->pkt);
        grinder->pkt = qbase[qr];
        rte_prefetch0(grinder->pkt);

-       
+

        if (unlikely((qr & 0x7) == 7)) {
                uint16_t qr_next = (grinder->queue[qpos]->qr + 1) & (qsize - 1);
        if (unlikely((qr & 0x7) == 7)) {
                uint16_t qr_next = (grinder->queue[qpos]->qr + 1) & (qsize - 1);

-               
+

                rte_prefetch0(qbase + qr_next);
        }
 }
                rte_prefetch0(qbase + qr_next);
        }
 }


@@ -2011,96 +2011,96 @@ static inline uint32_t
 grinder_handle(struct rte_sched_port *port, uint32_t pos)
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;
 grinder_handle(struct rte_sched_port *port, uint32_t pos)
 {
        struct rte_sched_grinder *grinder = port->grinder + pos;

-       
+

        switch (grinder->state) {
        case e_GRINDER_PREFETCH_PIPE:
        {
                if (grinder_next_pipe(port, pos)) {
                        grinder_prefetch_pipe(port, pos);
                        port->busy_grinders ++;
        switch (grinder->state) {
        case e_GRINDER_PREFETCH_PIPE:
        {
                if (grinder_next_pipe(port, pos)) {
                        grinder_prefetch_pipe(port, pos);
                        port->busy_grinders ++;

-                       
+

                        grinder->state = e_GRINDER_PREFETCH_TC_QUEUE_ARRAYS;
                        return 0;
                }
                        grinder->state = e_GRINDER_PREFETCH_TC_QUEUE_ARRAYS;
                        return 0;
                }

-               
+

                return 0;
        }
 
        case e_GRINDER_PREFETCH_TC_QUEUE_ARRAYS:
        {
                struct rte_sched_pipe *pipe = grinder->pipe;
                return 0;
        }
 
        case e_GRINDER_PREFETCH_TC_QUEUE_ARRAYS:
        {
                struct rte_sched_pipe *pipe = grinder->pipe;

-               
+

                grinder->pipe_params = port->pipe_profiles + pipe->profile;
                grinder_prefetch_tc_queue_arrays(port, pos);
                grinder_credits_update(port, pos);
                grinder->pipe_params = port->pipe_profiles + pipe->profile;
                grinder_prefetch_tc_queue_arrays(port, pos);
                grinder_credits_update(port, pos);

-               
+

                grinder->state = e_GRINDER_PREFETCH_MBUF;
                return 0;
        }
                grinder->state = e_GRINDER_PREFETCH_MBUF;
                return 0;
        }

-       
+

        case e_GRINDER_PREFETCH_MBUF:
        {
                grinder_prefetch_mbuf(port, pos);
        case e_GRINDER_PREFETCH_MBUF:
        {
                grinder_prefetch_mbuf(port, pos);

-               
+

                grinder->state = e_GRINDER_READ_MBUF;
                return 0;
        }
                grinder->state = e_GRINDER_READ_MBUF;
                return 0;
        }

-       
+

        case e_GRINDER_READ_MBUF:
        {
                uint32_t result = 0;
        case e_GRINDER_READ_MBUF:
        {
                uint32_t result = 0;

-               
+

                result = grinder_schedule(port, pos);
                result = grinder_schedule(port, pos);

-               
+

                /* Look for next packet within the same TC */
                if (result && grinder->qmask) {
                        grinder_wrr(port, pos);
                        grinder_prefetch_mbuf(port, pos);
                /* Look for next packet within the same TC */
                if (result && grinder->qmask) {
                        grinder_wrr(port, pos);
                        grinder_prefetch_mbuf(port, pos);

-                       
+

                        return 1;
                }
                grinder_wrr_store(port, pos);
                        return 1;
                }
                grinder_wrr_store(port, pos);

-               
+

                /* Look for another active TC within same pipe */
                if (grinder_next_tc(port, pos)) {
                        grinder_prefetch_tc_queue_arrays(port, pos);
                /* Look for another active TC within same pipe */
                if (grinder_next_tc(port, pos)) {
                        grinder_prefetch_tc_queue_arrays(port, pos);

-                       
+

                        grinder->state = e_GRINDER_PREFETCH_MBUF;
                        return result;
                        grinder->state = e_GRINDER_PREFETCH_MBUF;
                        return result;

-               }               
+               }

                if ((grinder->productive == 0) && (port->pipe_loop == RTE_SCHED_PIPE_INVALID)) {
                        port->pipe_loop = grinder->pindex;
                }
                grinder_evict(port, pos);
                if ((grinder->productive == 0) && (port->pipe_loop == RTE_SCHED_PIPE_INVALID)) {
                        port->pipe_loop = grinder->pindex;
                }
                grinder_evict(port, pos);

-               
+

                /* Look for another active pipe */
                if (grinder_next_pipe(port, pos)) {
                        grinder_prefetch_pipe(port, pos);
                /* Look for another active pipe */
                if (grinder_next_pipe(port, pos)) {
                        grinder_prefetch_pipe(port, pos);

-                       
+

                        grinder->state = e_GRINDER_PREFETCH_TC_QUEUE_ARRAYS;
                        return result;
                }
                        grinder->state = e_GRINDER_PREFETCH_TC_QUEUE_ARRAYS;
                        return result;
                }

-               
+

                /* No active pipe found */
                port->busy_grinders --;
                /* No active pipe found */
                port->busy_grinders --;

-               
+

                grinder->state = e_GRINDER_PREFETCH_PIPE;
                return result;
        }
                grinder->state = e_GRINDER_PREFETCH_PIPE;
                return result;
        }

-       
+

        default:
                rte_panic("Algorithmic error (invalid state)\n");
                return 0;
        }
 }
 
        default:
                rte_panic("Algorithmic error (invalid state)\n");
                return 0;
        }
 }
 

-static inline void 
+static inline void

 rte_sched_port_time_resync(struct rte_sched_port *port)
 {
        uint64_t cycles = rte_get_tsc_cycles();
        uint64_t cycles_diff = cycles - port->time_cpu_cycles;
        double bytes_diff = ((double) cycles_diff) / port->cycles_per_byte;
 rte_sched_port_time_resync(struct rte_sched_port *port)
 {
        uint64_t cycles = rte_get_tsc_cycles();
        uint64_t cycles_diff = cycles - port->time_cpu_cycles;
        double bytes_diff = ((double) cycles_diff) / port->cycles_per_byte;

-       
+

        /* Advance port time */
        port->time_cpu_cycles = cycles;
        port->time_cpu_bytes += (uint64_t) bytes_diff;
        /* Advance port time */
        port->time_cpu_cycles = cycles;
        port->time_cpu_bytes += (uint64_t) bytes_diff;


@@ -2120,10 +2120,10 @@ rte_sched_port_exceptions(struct rte_sched_port *port, int second_pass)
        /* Check if any exception flag is set */
        exceptions = (second_pass && port->busy_grinders == 0) ||
                (port->pipe_exhaustion == 1);
        /* Check if any exception flag is set */
        exceptions = (second_pass && port->busy_grinders == 0) ||
                (port->pipe_exhaustion == 1);

-       
+

        /* Clear exception flags */
        port->pipe_exhaustion = 0;
        /* Clear exception flags */
        port->pipe_exhaustion = 0;

-       
+

        return exceptions;
 }
 
        return exceptions;
 }
 


@@ -2131,12 +2131,12 @@ int
 rte_sched_port_dequeue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint32_t n_pkts)
 {
        uint32_t i, count;
 rte_sched_port_dequeue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint32_t n_pkts)
 {
        uint32_t i, count;

-       
+

        port->pkts_out = pkts;
        port->n_pkts_out = 0;
        port->pkts_out = pkts;
        port->n_pkts_out = 0;

-       
+

        rte_sched_port_time_resync(port);
        rte_sched_port_time_resync(port);

-       
+

        /* Take each queue in the grinder one step further */
        for (i = 0, count = 0; ; i ++)  {
                count += grinder_handle(port, i & (RTE_SCHED_PORT_N_GRINDERS - 1));
        /* Take each queue in the grinder one step further */
        for (i = 0, count = 0; ; i ++)  {
                count += grinder_handle(port, i & (RTE_SCHED_PORT_N_GRINDERS - 1));


@@ -2145,6 +2145,6 @@ rte_sched_port_dequeue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint
                        break;
                }
        }
                        break;
                }
        }

-       
+

        return count;
 }
        return count;
 }

diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h
index 1c4ebc5..3f27755 100644 (file)
--- a/lib/librte_sched/rte_sched.h
+++ b/lib/librte_sched/rte_sched.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -47,7 +47,7 @@ extern "C" {
  * for the current network node.
  *
  * The scheduler supports thousands of packet queues grouped under a 5-level hierarchy:
  * for the current network node.
  *
  * The scheduler supports thousands of packet queues grouped under a 5-level hierarchy:

- *     1. Port: 
+ *     1. Port:

  *           - Typical usage: output Ethernet port;
  *           - Multiple ports are scheduled in round robin order with equal priority;
  *     2. Subport:
  *           - Typical usage: output Ethernet port;
  *           - Multiple ports are scheduled in round robin order with equal priority;
  *     2. Subport:


@@ -56,11 +56,11 @@ extern "C" {
  *           - Upper limit enforced per traffic class at subport level;
  *           - Lower priority traffic classes able to reuse subport bandwidth currently
  *             unused by higher priority traffic classes of the same subport;
  *           - Upper limit enforced per traffic class at subport level;
  *           - Lower priority traffic classes able to reuse subport bandwidth currently
  *             unused by higher priority traffic classes of the same subport;

- *           - When any subport traffic class is oversubscribed (configuration time 
- *             event), the usage of subport member pipes with high demand for that 
- *             traffic class pipes is truncated to a dynamically adjusted value with no 
+ *           - When any subport traffic class is oversubscribed (configuration time
+ *             event), the usage of subport member pipes with high demand for that
+ *             traffic class pipes is truncated to a dynamically adjusted value with no

  *             impact to low demand pipes;
  *             impact to low demand pipes;

- *     3. Pipe: 
+ *     3. Pipe:

  *           - Typical usage: individual user/subscriber;
  *           - Traffic shaping using the token bucket algorithm (one bucket per pipe);
  *     4. Traffic class:
  *           - Typical usage: individual user/subscriber;
  *           - Traffic shaping using the token bucket algorithm (one bucket per pipe);
  *     4. Traffic class:


@@ -69,9 +69,9 @@ extern "C" {
  *           - Lower priority traffic classes able to reuse pipe bandwidth currently
  *             unused by higher priority traffic classes of the same pipe;
  *     5. Queue:
  *           - Lower priority traffic classes able to reuse pipe bandwidth currently
  *             unused by higher priority traffic classes of the same pipe;
  *     5. Queue:

- *           - Typical usage: queue hosting packets from one or multiple connections 
+ *           - Typical usage: queue hosting packets from one or multiple connections

  *             of same traffic class belonging to the same user;
  *             of same traffic class belonging to the same user;

- *           - Weighted Round Robin (WRR) is used to service the queues within same 
+ *           - Weighted Round Robin (WRR) is used to service the queues within same

  *             pipe traffic class.
  *
  ***/
  *             pipe traffic class.
  *
  ***/


@@ -113,15 +113,15 @@ of struct rte_mbuf). */
 #endif
 
 /** Subport configuration parameters. The period and credits_per_period parameters are measured
 #endif
 
 /** Subport configuration parameters. The period and credits_per_period parameters are measured

-in bytes, with one byte meaning the time duration associated with the transmission of one byte 
-on the physical medium of the output port, with pipe or pipe traffic class rate (measured as 
+in bytes, with one byte meaning the time duration associated with the transmission of one byte
+on the physical medium of the output port, with pipe or pipe traffic class rate (measured as

 percentage of output port rate) determined as credits_per_period divided by period. One credit
 represents one byte. */
 struct rte_sched_subport_params {
        /* Subport token bucket */
        uint32_t tb_rate;                /**< Subport token bucket rate (measured in bytes per second) */
        uint32_t tb_size;                /**< Subport token bucket size (measured in credits) */
 percentage of output port rate) determined as credits_per_period divided by period. One credit
 represents one byte. */
 struct rte_sched_subport_params {
        /* Subport token bucket */
        uint32_t tb_rate;                /**< Subport token bucket rate (measured in bytes per second) */
        uint32_t tb_size;                /**< Subport token bucket size (measured in credits) */

-       
+

        /* Subport traffic classes */
        uint32_t tc_rate[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Subport traffic class rates (measured in bytes per second) */
        uint32_t tc_period;              /**< Enforcement period for traffic class rates (measured in milliseconds) */
        /* Subport traffic classes */
        uint32_t tc_rate[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Subport traffic class rates (measured in bytes per second) */
        uint32_t tc_period;              /**< Enforcement period for traffic class rates (measured in milliseconds) */


@@ -134,31 +134,31 @@ struct rte_sched_subport_stats {
                                              subport for each traffic class */
        uint32_t n_pkts_tc_dropped[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Number of packets dropped by the current
                                              subport for each traffic class due to subport queues being full or congested*/
                                              subport for each traffic class */
        uint32_t n_pkts_tc_dropped[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Number of packets dropped by the current
                                              subport for each traffic class due to subport queues being full or congested*/

-       
+

        /* Bytes */
        /* Bytes */

-       uint32_t n_bytes_tc[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Number of bytes successfully written to current 
+       uint32_t n_bytes_tc[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Number of bytes successfully written to current

                                              subport for each traffic class*/
                                              subport for each traffic class*/

-       uint32_t n_bytes_tc_dropped[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Number of bytes dropped by the current 
+       uint32_t n_bytes_tc_dropped[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Number of bytes dropped by the current

                                           subport for each traffic class due to subport queues being full or congested */
 };
 
 /** Pipe configuration parameters. The period and credits_per_period parameters are measured
                                           subport for each traffic class due to subport queues being full or congested */
 };
 
 /** Pipe configuration parameters. The period and credits_per_period parameters are measured

-in bytes, with one byte meaning the time duration associated with the transmission of one byte 
-on the physical medium of the output port, with pipe or pipe traffic class rate (measured as 
+in bytes, with one byte meaning the time duration associated with the transmission of one byte
+on the physical medium of the output port, with pipe or pipe traffic class rate (measured as

 percentage of output port rate) determined as credits_per_period divided by period. One credit
 represents one byte. */
 struct rte_sched_pipe_params {
        /* Pipe token bucket */
        uint32_t tb_rate;                /**< Pipe token bucket rate (measured in bytes per second) */
        uint32_t tb_size;                /**< Pipe token bucket size (measured in credits) */
 percentage of output port rate) determined as credits_per_period divided by period. One credit
 represents one byte. */
 struct rte_sched_pipe_params {
        /* Pipe token bucket */
        uint32_t tb_rate;                /**< Pipe token bucket rate (measured in bytes per second) */
        uint32_t tb_size;                /**< Pipe token bucket size (measured in credits) */

-       
+

        /* Pipe traffic classes */
        uint32_t tc_rate[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Pipe traffic class rates (measured in bytes per second) */
        uint32_t tc_period;              /**< Enforcement period for pipe traffic class rates (measured in milliseconds) */
 #ifdef RTE_SCHED_SUBPORT_TC_OV
        uint8_t tc_ov_weight;            /**< Weight for the current pipe in the event of subport traffic class 3 oversubscription */
 #endif
        /* Pipe traffic classes */
        uint32_t tc_rate[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Pipe traffic class rates (measured in bytes per second) */
        uint32_t tc_period;              /**< Enforcement period for pipe traffic class rates (measured in milliseconds) */
 #ifdef RTE_SCHED_SUBPORT_TC_OV
        uint8_t tc_ov_weight;            /**< Weight for the current pipe in the event of subport traffic class 3 oversubscription */
 #endif

-       
+

        /* Pipe queues */
        uint8_t  wrr_weights[RTE_SCHED_QUEUES_PER_PIPE]; /**< WRR weights for the queues of the current pipe */
 };
        /* Pipe queues */
        uint8_t  wrr_weights[RTE_SCHED_QUEUES_PER_PIPE]; /**< WRR weights for the queues of the current pipe */
 };


@@ -168,10 +168,10 @@ struct rte_sched_queue_stats {
        /* Packets */
        uint32_t n_pkts;                 /**< Number of packets successfully written to current queue */
        uint32_t n_pkts_dropped;         /**< Number of packets dropped due to current queue being full or congested */
        /* Packets */
        uint32_t n_pkts;                 /**< Number of packets successfully written to current queue */
        uint32_t n_pkts_dropped;         /**< Number of packets dropped due to current queue being full or congested */

-       
+

        /* Bytes */
        uint32_t n_bytes;                /**< Number of bytes successfully written to current queue */
        /* Bytes */
        uint32_t n_bytes;                /**< Number of bytes successfully written to current queue */

-       uint32_t n_bytes_dropped;        /**< Number of bytes dropped due to current queue being full or congested */   
+       uint32_t n_bytes_dropped;        /**< Number of bytes dropped due to current queue being full or congested */

 };
 
 /** Port configuration parameters. */
 };
 
 /** Port configuration parameters. */


@@ -183,8 +183,8 @@ struct rte_sched_port_params {
        uint32_t frame_overhead;         /**< Framing overhead per packet (measured in bytes) */
        uint32_t n_subports_per_port;    /**< Number of subports for the current port scheduler instance*/
        uint32_t n_pipes_per_subport;    /**< Number of pipes for each port scheduler subport */
        uint32_t frame_overhead;         /**< Framing overhead per packet (measured in bytes) */
        uint32_t n_subports_per_port;    /**< Number of subports for the current port scheduler instance*/
        uint32_t n_pipes_per_subport;    /**< Number of pipes for each port scheduler subport */

-       uint16_t qsize[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Packet queue size for each traffic class. All queues 
-                                             within the same pipe traffic class have the same size. Queues from 
+       uint16_t qsize[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; /**< Packet queue size for each traffic class. All queues
+                                             within the same pipe traffic class have the same size. Queues from

                                                                                  different pipes serving the same traffic class have the same size. */
        struct rte_sched_pipe_params *pipe_profiles; /**< Pipe profile table defined for current port scheduler instance.
                                           Every pipe of the current port scheduler is configured using one of the
                                                                                  different pipes serving the same traffic class have the same size. */
        struct rte_sched_pipe_params *pipe_profiles; /**< Pipe profile table defined for current port scheduler instance.
                                           Every pipe of the current port scheduler is configured using one of the


@@ -197,7 +197,7 @@ struct rte_sched_port_params {
 
 /** Path through the scheduler hierarchy used by the scheduler enqueue operation to
 identify the destination queue for the current packet. Stored in the field pkt.hash.sched
 
 /** Path through the scheduler hierarchy used by the scheduler enqueue operation to
 identify the destination queue for the current packet. Stored in the field pkt.hash.sched

-of struct rte_mbuf of each packet, typically written by the classification stage and read by 
+of struct rte_mbuf of each packet, typically written by the classification stage and read by

 scheduler enqueue.*/
 struct rte_sched_port_hierarchy {
        uint32_t queue:2;                /**< Queue ID (0 .. 3) */
 scheduler enqueue.*/
 struct rte_sched_port_hierarchy {
        uint32_t queue:2;                /**< Queue ID (0 .. 3) */


@@ -220,7 +220,7 @@ struct rte_sched_port_hierarchy {
  * @return
  *   Handle to port scheduler instance upon success or NULL otherwise.
  */
  * @return
  *   Handle to port scheduler instance upon success or NULL otherwise.
  */

-struct rte_sched_port * 
+struct rte_sched_port *

 rte_sched_port_config(struct rte_sched_port_params *params);
 
 /**
 rte_sched_port_config(struct rte_sched_port_params *params);
 
 /**


@@ -245,7 +245,7 @@ rte_sched_port_free(struct rte_sched_port *port);
  *   0 upon success, error code otherwise
  */
 int
  *   0 upon success, error code otherwise
  */
 int

-rte_sched_subport_config(struct rte_sched_port *port, 
+rte_sched_subport_config(struct rte_sched_port *port,

        uint32_t subport_id,
        struct rte_sched_subport_params *params);
 
        uint32_t subport_id,
        struct rte_sched_subport_params *params);
 


@@ -265,7 +265,7 @@ rte_sched_subport_config(struct rte_sched_port *port,
  */
 int
 rte_sched_pipe_config(struct rte_sched_port *port,
  */
 int
 rte_sched_pipe_config(struct rte_sched_port *port,

-       uint32_t subport_id, 
+       uint32_t subport_id,

        uint32_t pipe_id,
        int32_t pipe_profile);
 
        uint32_t pipe_id,
        int32_t pipe_profile);
 


@@ -281,7 +281,7 @@ uint32_t
 rte_sched_port_get_memory_footprint(struct rte_sched_port_params *params);
 
 /*
 rte_sched_port_get_memory_footprint(struct rte_sched_port_params *params);
 
 /*

- * Statistics 
+ * Statistics

  *
  ***/
 
  *
  ***/
 


@@ -293,7 +293,7 @@ rte_sched_port_get_memory_footprint(struct rte_sched_port_params *params);
  * @param subport_id
  *   Subport ID
  * @param stats
  * @param subport_id
  *   Subport ID
  * @param stats

- *   Pointer to pre-allocated subport statistics structure where the statistics 
+ *   Pointer to pre-allocated subport statistics structure where the statistics

  *   counters should be stored
  * @param tc_ov
  *   Pointer to pre-allocated 4-entry array where the oversubscription status for
  *   counters should be stored
  * @param tc_ov
  *   Pointer to pre-allocated 4-entry array where the oversubscription status for


@@ -315,7 +315,7 @@ rte_sched_subport_read_stats(struct rte_sched_port *port,
  * @param queue_id
  *   Queue ID within port scheduler
  * @param stats
  * @param queue_id
  *   Queue ID within port scheduler
  * @param stats

- *   Pointer to pre-allocated subport statistics structure where the statistics 
+ *   Pointer to pre-allocated subport statistics structure where the statistics

  *   counters should be stored
  * @param qlen
  *   Pointer to pre-allocated variable where the current queue length should be stored.
  *   counters should be stored
  * @param qlen
  *   Pointer to pre-allocated variable where the current queue length should be stored.


@@ -328,15 +328,15 @@ rte_sched_queue_read_stats(struct rte_sched_port *port,
        struct rte_sched_queue_stats *stats,
        uint16_t *qlen);
 
        struct rte_sched_queue_stats *stats,
        uint16_t *qlen);
 

-/* 
- * Run-time 
+/*
+ * Run-time

  *
  ***/
 
 /**
  *
  ***/
 
 /**

- * Scheduler hierarchy path write to packet descriptor. Typically called by the 
+ * Scheduler hierarchy path write to packet descriptor. Typically called by the

  * packet classification stage.
  * packet classification stage.

- * 
+ *

  * @param pkt
  *   Packet descriptor handle
  * @param subport
  * @param pkt
  *   Packet descriptor handle
  * @param subport


@@ -349,11 +349,11 @@ rte_sched_queue_read_stats(struct rte_sched_port *port,
  *   Queue ID within pipe traffic class (0 .. 3)
  */
 static inline void
  *   Queue ID within pipe traffic class (0 .. 3)
  */
 static inline void

-rte_sched_port_pkt_write(struct rte_mbuf *pkt, 
+rte_sched_port_pkt_write(struct rte_mbuf *pkt,

        uint32_t subport, uint32_t pipe, uint32_t traffic_class, uint32_t queue, enum rte_meter_color color)
 {
        struct rte_sched_port_hierarchy *sched = (struct rte_sched_port_hierarchy *) &pkt->pkt.hash.sched;
        uint32_t subport, uint32_t pipe, uint32_t traffic_class, uint32_t queue, enum rte_meter_color color)
 {
        struct rte_sched_port_hierarchy *sched = (struct rte_sched_port_hierarchy *) &pkt->pkt.hash.sched;

-       
+

        sched->color = (uint32_t) color;
        sched->subport = subport;
        sched->pipe = pipe;
        sched->color = (uint32_t) color;
        sched->subport = subport;
        sched->pipe = pipe;


@@ -363,7 +363,7 @@ rte_sched_port_pkt_write(struct rte_mbuf *pkt,
 
 /**
  * Scheduler hierarchy path read from packet descriptor (struct rte_mbuf). Typically
 
 /**
  * Scheduler hierarchy path read from packet descriptor (struct rte_mbuf). Typically

- * called as part of the hierarchical scheduler enqueue operation. The subport, 
+ * called as part of the hierarchical scheduler enqueue operation. The subport,

  * pipe, traffic class and queue parameters need to be pre-allocated by the caller.
  *
  * @param pkt
  * pipe, traffic class and queue parameters need to be pre-allocated by the caller.
  *
  * @param pkt


@@ -376,13 +376,13 @@ rte_sched_port_pkt_write(struct rte_mbuf *pkt,
  *   Traffic class ID within pipe (0 .. 3)
  * @param queue
  *   Queue ID within pipe traffic class (0 .. 3)
  *   Traffic class ID within pipe (0 .. 3)
  * @param queue
  *   Queue ID within pipe traffic class (0 .. 3)

- *   
+ *

  */
 static inline void
 rte_sched_port_pkt_read_tree_path(struct rte_mbuf *pkt, uint32_t *subport, uint32_t *pipe, uint32_t *traffic_class, uint32_t *queue)
 {
        struct rte_sched_port_hierarchy *sched = (struct rte_sched_port_hierarchy *) &pkt->pkt.hash.sched;
  */
 static inline void
 rte_sched_port_pkt_read_tree_path(struct rte_mbuf *pkt, uint32_t *subport, uint32_t *pipe, uint32_t *traffic_class, uint32_t *queue)
 {
        struct rte_sched_port_hierarchy *sched = (struct rte_sched_port_hierarchy *) &pkt->pkt.hash.sched;

-       
+

        *subport = sched->subport;
        *pipe = sched->pipe;
        *traffic_class = sched->traffic_class;
        *subport = sched->subport;
        *pipe = sched->pipe;
        *traffic_class = sched->traffic_class;


@@ -398,11 +398,11 @@ rte_sched_port_pkt_read_color(struct rte_mbuf *pkt)
 }
 
 /**
 }
 
 /**

- * Hierarchical scheduler port enqueue. Writes up to n_pkts to port scheduler and 
+ * Hierarchical scheduler port enqueue. Writes up to n_pkts to port scheduler and

  * returns the number of packets actually written. For each packet, the port scheduler
  * returns the number of packets actually written. For each packet, the port scheduler

- * queue to write the packet to is identified by reading the hierarchy path from the 
- * packet descriptor; if the queue is full or congested and the packet is not written 
- * to the queue, then the packet is automatically dropped without any action required 
+ * queue to write the packet to is identified by reading the hierarchy path from the
+ * packet descriptor; if the queue is full or congested and the packet is not written
+ * to the queue, then the packet is automatically dropped without any action required

  * from the caller.
  *
  * @param port
  * from the caller.
  *
  * @param port


@@ -418,14 +418,14 @@ int
 rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint32_t n_pkts);
 
 /**
 rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint32_t n_pkts);
 
 /**

- * Hierarchical scheduler port dequeue. Reads up to n_pkts from the port scheduler 
- * and stores them in the pkts array and returns the number of packets actually read. 
+ * Hierarchical scheduler port dequeue. Reads up to n_pkts from the port scheduler
+ * and stores them in the pkts array and returns the number of packets actually read.

  * The pkts array needs to be pre-allocated by the caller with at least n_pkts entries.
  *
  * @param port
  *   Handle to port scheduler instance
  * @param pkts
  * The pkts array needs to be pre-allocated by the caller with at least n_pkts entries.
  *
  * @param port
  *   Handle to port scheduler instance
  * @param pkts

- *   Pre-allocated packet descriptor array where the packets dequeued from the port 
+ *   Pre-allocated packet descriptor array where the packets dequeued from the port

  *   scheduler should be stored
  * @param n_pkts
  *   Number of packets to dequeue from the port scheduler
  *   scheduler should be stored
  * @param n_pkts
  *   Number of packets to dequeue from the port scheduler

diff --git a/lib/librte_sched/rte_sched_common.h b/lib/librte_sched/rte_sched_common.h
index 21c1000..8920ade 100644 (file)
--- a/lib/librte_sched/rte_sched_common.h
+++ b/lib/librte_sched/rte_sched_common.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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


@@ -53,7 +53,7 @@ static inline uint32_t
 rte_min_pos_4_u16(uint16_t *x)
 {
        uint32_t pos0, pos1;
 rte_min_pos_4_u16(uint16_t *x)
 {
        uint32_t pos0, pos1;

-               
+

        pos0 = (x[0] <= x[1])? 0 : 1;
        pos1 = (x[2] <= x[3])? 2 : 3;
 
        pos0 = (x[0] <= x[1])? 0 : 1;
        pos1 = (x[2] <= x[3])? 2 : 3;
 


@@ -89,24 +89,24 @@ static inline uint32_t
 rte_get_gcd(uint32_t a, uint32_t b)
 {
        uint32_t c;
 rte_get_gcd(uint32_t a, uint32_t b)
 {
        uint32_t c;

-       
+

        if (a == 0)
                return b;
        if (b == 0)
                return a;
        if (a == 0)
                return b;
        if (b == 0)
                return a;

-       
+

        if (a < b) {
                c = a;
                a = b;
                b = c;
        }
        if (a < b) {
                c = a;
                a = b;
                b = c;
        }

-       
+

        while (b != 0) {
                c = a % b;
                a = b;
                b = c;
        }
        while (b != 0) {
                c = a % b;
                a = b;
                b = c;
        }

-       
+

        return a;
 }
 
        return a;
 }
 

diff --git a/lib/librte_timer/Makefile b/lib/librte_timer/Makefile
index 4ba5c3a..07eb0c6 100644 (file)
--- a/lib/librte_timer/Makefile
+++ b/lib/librte_timer/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index f0f0c2f..269a992 100755 (executable)
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/lib/librte_timer/rte_timer.h b/lib/librte_timer/rte_timer.h
index 70f0573..4907cf5 100755 (executable)
--- a/lib/librte_timer/rte_timer.h
+++ b/lib/librte_timer/rte_timer.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/mk/arch/i686/rte.vars.mk b/mk/arch/i686/rte.vars.mk
index 752aa2f..8d56ca7 100644 (file)
--- a/mk/arch/i686/rte.vars.mk
+++ b/mk/arch/i686/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/arch/x86_64/rte.vars.mk b/mk/arch/x86_64/rte.vars.mk
index 796fa35..51bd477 100644 (file)
--- a/mk/arch/x86_64/rte.vars.mk
+++ b/mk/arch/x86_64/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -51,7 +51,7 @@ ARCH  ?= x86_64
 CROSS ?=
 
 CPU_CFLAGS  ?= -m64
 CROSS ?=
 
 CPU_CFLAGS  ?= -m64

-CPU_LDFLAGS ?= 
+CPU_LDFLAGS ?=

 CPU_ASFLAGS ?= -felf64
 
 export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS
 CPU_ASFLAGS ?= -felf64
 
 export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS

diff --git a/mk/exec-env/bsdapp/rte.app.mk b/mk/exec-env/bsdapp/rte.app.mk
index 1e2297d..df21af9 100644 (file)
--- a/mk/exec-env/bsdapp/rte.app.mk
+++ b/mk/exec-env/bsdapp/rte.app.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/exec-env/bsdapp/rte.vars.mk b/mk/exec-env/bsdapp/rte.vars.mk
index a3fb71f..fef9579 100644 (file)
--- a/mk/exec-env/bsdapp/rte.vars.mk
+++ b/mk/exec-env/bsdapp/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -45,7 +45,7 @@ else
 EXECENV_CFLAGS  = -pthread
 endif
 
 EXECENV_CFLAGS  = -pthread
 endif
 

-EXECENV_LDFLAGS = 
+EXECENV_LDFLAGS =

 EXECENV_LDLIBS  = -lexecinfo
 EXECENV_ASFLAGS =
 
 EXECENV_LDLIBS  = -lexecinfo
 EXECENV_ASFLAGS =
 

diff --git a/mk/exec-env/linuxapp/rte.app.mk b/mk/exec-env/linuxapp/rte.app.mk
index 1e2297d..df21af9 100644 (file)
--- a/mk/exec-env/linuxapp/rte.app.mk
+++ b/mk/exec-env/linuxapp/rte.app.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/exec-env/linuxapp/rte.vars.mk b/mk/exec-env/linuxapp/rte.vars.mk
index 68edaab..d4808c2 100644 (file)
--- a/mk/exec-env/linuxapp/rte.vars.mk
+++ b/mk/exec-env/linuxapp/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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


@@ -45,7 +45,7 @@ else
 EXECENV_CFLAGS  = -pthread
 endif
 
 EXECENV_CFLAGS  = -pthread
 endif
 

-EXECENV_LDFLAGS = 
+EXECENV_LDFLAGS =

 EXECENV_LDLIBS  = -lrt -lm
 EXECENV_ASFLAGS =
 
 EXECENV_LDLIBS  = -lrt -lm
 EXECENV_ASFLAGS =
 

diff --git a/mk/internal/rte.build-post.mk b/mk/internal/rte.build-post.mk
index f526362..62b1129 100644 (file)
--- a/mk/internal/rte.build-post.mk
+++ b/mk/internal/rte.build-post.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/internal/rte.build-pre.mk b/mk/internal/rte.build-pre.mk
index d5ddbfa..560cf82 100644 (file)
--- a/mk/internal/rte.build-pre.mk
+++ b/mk/internal/rte.build-pre.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/internal/rte.clean-post.mk b/mk/internal/rte.clean-post.mk
index 4979e2d..d6c98ab 100644 (file)
--- a/mk/internal/rte.clean-post.mk
+++ b/mk/internal/rte.clean-post.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/internal/rte.clean-pre.mk b/mk/internal/rte.clean-pre.mk
index 2615240..3147e23 100644 (file)
--- a/mk/internal/rte.clean-pre.mk
+++ b/mk/internal/rte.clean-pre.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/internal/rte.compile-post.mk b/mk/internal/rte.compile-post.mk
index 30ec225..fd366c6 100644 (file)
--- a/mk/internal/rte.compile-post.mk
+++ b/mk/internal/rte.compile-post.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk
index 8bffc21..b9bff4a 100644 (file)
--- a/mk/internal/rte.compile-pre.mk
+++ b/mk/internal/rte.compile-pre.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/internal/rte.depdirs-post.mk b/mk/internal/rte.depdirs-post.mk
index 4344ff1..fc6904d 100644 (file)
--- a/mk/internal/rte.depdirs-post.mk
+++ b/mk/internal/rte.depdirs-post.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/internal/rte.depdirs-pre.mk b/mk/internal/rte.depdirs-pre.mk
index 0cb272e..8825db0 100644 (file)
--- a/mk/internal/rte.depdirs-pre.mk
+++ b/mk/internal/rte.depdirs-pre.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/internal/rte.install-post.mk b/mk/internal/rte.install-post.mk
index 7b946c7..77addee 100644 (file)
--- a/mk/internal/rte.install-post.mk
+++ b/mk/internal/rte.install-post.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/internal/rte.install-pre.mk b/mk/internal/rte.install-pre.mk
index 999ebc4..0a8712f 100644 (file)
--- a/mk/internal/rte.install-pre.mk
+++ b/mk/internal/rte.install-pre.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/machine/atm/rte.vars.mk b/mk/machine/atm/rte.vars.mk
index 5cdf6c4..d6fbba0 100644 (file)
--- a/mk/machine/atm/rte.vars.mk
+++ b/mk/machine/atm/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/machine/default/rte.vars.mk b/mk/machine/default/rte.vars.mk
index f05105a..53c6af6 100644 (file)
--- a/mk/machine/default/rte.vars.mk
+++ b/mk/machine/default/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/machine/hsw/rte.vars.mk b/mk/machine/hsw/rte.vars.mk
index a46f99a..eedc5d0 100644 (file)
--- a/mk/machine/hsw/rte.vars.mk
+++ b/mk/machine/hsw/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/machine/ivb/rte.vars.mk b/mk/machine/ivb/rte.vars.mk
index 057e933..932241a 100644 (file)
--- a/mk/machine/ivb/rte.vars.mk
+++ b/mk/machine/ivb/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/machine/native/rte.vars.mk b/mk/machine/native/rte.vars.mk
index 0e55b85..da9aa71 100644 (file)
--- a/mk/machine/native/rte.vars.mk
+++ b/mk/machine/native/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/machine/nhm/rte.vars.mk b/mk/machine/nhm/rte.vars.mk
index 9a30203..9566efd 100644 (file)
--- a/mk/machine/nhm/rte.vars.mk
+++ b/mk/machine/nhm/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/machine/snb/rte.vars.mk b/mk/machine/snb/rte.vars.mk
index 1fadd81..a9c1b7c 100644 (file)
--- a/mk/machine/snb/rte.vars.mk
+++ b/mk/machine/snb/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/machine/wsm/rte.vars.mk b/mk/machine/wsm/rte.vars.mk
index 7d69a78..c8a266c 100644 (file)
--- a/mk/machine/wsm/rte.vars.mk
+++ b/mk/machine/wsm/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index a836577..7a27a3a 100644 (file)
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -1,13 +1,13 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   Copyright(c) 2014 6WIND S.A.
 #   All rights reserved.
 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   Copyright(c) 2014 6WIND S.A.
 #   All rights reserved.

-# 
+#

 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #   are met:
 #   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
 #     * 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.
 #     * 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
 #   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

diff --git a/mk/rte.bsdmodule.mk b/mk/rte.bsdmodule.mk
index 28b5189..247ea2c 100644 (file)
--- a/mk/rte.bsdmodule.mk
+++ b/mk/rte.bsdmodule.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk
index b8248a5..65332e1 100644 (file)
--- a/mk/rte.cpuflags.mk
+++ b/mk/rte.cpuflags.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.extapp.mk b/mk/rte.extapp.mk
index cf33178..40ff82c 100644 (file)
--- a/mk/rte.extapp.mk
+++ b/mk/rte.extapp.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.extlib.mk b/mk/rte.extlib.mk
index 8fe216b..ac5e84f 100644 (file)
--- a/mk/rte.extlib.mk
+++ b/mk/rte.extlib.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.extobj.mk b/mk/rte.extobj.mk
index 566d608..cb2f996 100644 (file)
--- a/mk/rte.extobj.mk
+++ b/mk/rte.extobj.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.extvars.mk b/mk/rte.extvars.mk
index 0bdaf2f..3e5a990 100644 (file)
--- a/mk/rte.extvars.mk
+++ b/mk/rte.extvars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.gnuconfigure.mk b/mk/rte.gnuconfigure.mk
index 7f79eeb..65b658c 100644 (file)
--- a/mk/rte.gnuconfigure.mk
+++ b/mk/rte.gnuconfigure.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.hostapp.mk b/mk/rte.hostapp.mk
index 40d088a..c44d0f8 100644 (file)
--- a/mk/rte.hostapp.mk
+++ b/mk/rte.hostapp.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.hostlib.mk b/mk/rte.hostlib.mk
index f5745fc..fe24049 100644 (file)
--- a/mk/rte.hostlib.mk
+++ b/mk/rte.hostlib.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.install.mk b/mk/rte.install.mk
index 79b9716..e7ac4d5 100644 (file)
--- a/mk/rte.install.mk
+++ b/mk/rte.install.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk
index c58e68e..f458258 100644 (file)
--- a/mk/rte.lib.mk
+++ b/mk/rte.lib.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.module.mk b/mk/rte.module.mk
index ffbd94c..c4ca3fd 100644 (file)
--- a/mk/rte.module.mk
+++ b/mk/rte.module.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.obj.mk b/mk/rte.obj.mk
index 4eaf2c7..5982227 100644 (file)
--- a/mk/rte.obj.mk
+++ b/mk/rte.obj.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk
index d4d6c05..3154457 100644 (file)
--- a/mk/rte.sdkbuild.mk
+++ b/mk/rte.sdkbuild.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index 14d8051..c125fa1 100644 (file)
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.sdkdepdirs.mk b/mk/rte.sdkdepdirs.mk
index 1b8d02e..bebaf2a 100644 (file)
--- a/mk/rte.sdkdepdirs.mk
+++ b/mk/rte.sdkdepdirs.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk
index 30712f4..8861b05 100644 (file)
--- a/mk/rte.sdkdoc.mk
+++ b/mk/rte.sdkdoc.mk
@@ -1,13 +1,13 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   Copyright(c) 2013 6WIND S.A.
 #   All rights reserved.
 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   Copyright(c) 2013 6WIND S.A.
 #   All rights reserved.

-# 
+#

 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #   are met:
 #   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
 #     * 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.
 #     * 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
 #   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

diff --git a/mk/rte.sdkgcov.mk b/mk/rte.sdkgcov.mk
index 6c75d56..fd20fd7 100644 (file)
--- a/mk/rte.sdkgcov.mk
+++ b/mk/rte.sdkgcov.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 8571196..86c98a5 100644 (file)
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
index c443b8f..f7eab1d 100644 (file)
--- a/mk/rte.sdkroot.mk
+++ b/mk/rte.sdkroot.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
index 8c48509..2696142 100644 (file)
--- a/mk/rte.sdktest.mk
+++ b/mk/rte.sdktest.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.sdktestall.mk b/mk/rte.sdktestall.mk
index c88012e..9e7f775 100644 (file)
--- a/mk/rte.sdktestall.mk
+++ b/mk/rte.sdktestall.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.sharelib.mk b/mk/rte.sharelib.mk
index 429309f..c0a811a 100644 (file)
--- a/mk/rte.sharelib.mk
+++ b/mk/rte.sharelib.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.subdir.mk b/mk/rte.subdir.mk
index c3578d4..256e64e 100644 (file)
--- a/mk/rte.subdir.mk
+++ b/mk/rte.subdir.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
index 4257687..1e874ee 100644 (file)
--- a/mk/rte.vars.mk
+++ b/mk/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/target/generic/rte.app.mk b/mk/target/generic/rte.app.mk
index 5333064..000219f 100644 (file)
--- a/mk/target/generic/rte.app.mk
+++ b/mk/target/generic/rte.app.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk
index 796cca7..6020f20 100644 (file)
--- a/mk/target/generic/rte.vars.mk
+++ b/mk/target/generic/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk
index 12531e1..e40e103 100644 (file)
--- a/mk/toolchain/gcc/rte.toolchain-compat.mk
+++ b/mk/toolchain/gcc/rte.toolchain-compat.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
index 0edb93f..58faa39 100644 (file)
--- a/mk/toolchain/gcc/rte.vars.mk
+++ b/mk/toolchain/gcc/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/toolchain/icc/rte.toolchain-compat.mk b/mk/toolchain/icc/rte.toolchain-compat.mk
index f4b1969..621afcd 100644 (file)
--- a/mk/toolchain/icc/rte.toolchain-compat.mk
+++ b/mk/toolchain/icc/rte.toolchain-compat.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk
index 11bae0a..2c5bdad 100644 (file)
--- a/mk/toolchain/icc/rte.vars.mk
+++ b/mk/toolchain/icc/rte.vars.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/scripts/Makefile b/scripts/Makefile
index fd7d77f..437a801 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/scripts/depdirs-rule.sh b/scripts/depdirs-rule.sh
index 9d327a3..7aba088 100755 (executable)
--- a/scripts/depdirs-rule.sh
+++ b/scripts/depdirs-rule.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 #   BSD LICENSE
 #!/bin/sh
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/scripts/gen-build-mk.sh b/scripts/gen-build-mk.sh
index bd53c49..5c12813 100755 (executable)
--- a/scripts/gen-build-mk.sh
+++ b/scripts/gen-build-mk.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 #   BSD LICENSE
 #!/bin/sh
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/scripts/gen-config-h.sh b/scripts/gen-config-h.sh
index 009b5d2..86b41ab 100755 (executable)
--- a/scripts/gen-config-h.sh
+++ b/scripts/gen-config-h.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 #   BSD LICENSE
 #!/bin/sh
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/scripts/relpath.sh b/scripts/relpath.sh
index df8137e..00030e5 100755 (executable)
--- a/scripts/relpath.sh
+++ b/scripts/relpath.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 #   BSD LICENSE
 #!/bin/sh
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/scripts/test-framework.sh b/scripts/test-framework.sh
index 56179c6..6861451 100755 (executable)
--- a/scripts/test-framework.sh
+++ b/scripts/test-framework.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 #   BSD LICENSE
 #!/bin/sh
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/scripts/testhost/Makefile b/scripts/testhost/Makefile
index 7976da6..fca5534 100644 (file)
--- a/scripts/testhost/Makefile
+++ b/scripts/testhost/Makefile
@@ -1,12 +1,12 @@
 #   BSD LICENSE
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -16,7 +16,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.
 #     * 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
 #   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

diff --git a/scripts/testhost/testhost.c b/scripts/testhost/testhost.c
index 26cf62a..00cd35f 100644 (file)
--- a/scripts/testhost/testhost.c
+++ b/scripts/testhost/testhost.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
 /*-
  *   BSD LICENSE

- * 
+ *

  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   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
  *   are met:
  *   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
  *     * 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.
  *     * 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
  *   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

diff --git a/tools/cpu_layout.py b/tools/cpu_layout.py
index 9eff9d7..623fad9 100755 (executable)
--- a/tools/cpu_layout.py
+++ b/tools/cpu_layout.py
@@ -1,14 +1,14 @@
 #! /usr/bin/python
 #
 #   BSD LICENSE
 #! /usr/bin/python
 #
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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

diff --git a/tools/igb_uio_bind.py b/tools/igb_uio_bind.py
index 824aa2b..18dbeda 100755 (executable)
--- a/tools/igb_uio_bind.py
+++ b/tools/igb_uio_bind.py
@@ -1,14 +1,14 @@
 #! /usr/bin/python
 #
 #   BSD LICENSE
 #! /usr/bin/python
 #
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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


@@ -61,7 +61,7 @@ also be referred to by Linux interface name e.g. eth0, eth1, em0, em1, etc.
 Options:
     --help, --usage:
         Display usage information and quit
 Options:
     --help, --usage:
         Display usage information and quit

-        
+

     --status:
         Print the current status of all known network interfaces.
         For each device, it displays the PCI domain, bus, slot and function,
     --status:
         Print the current status of all known network interfaces.
         For each device, it displays the PCI domain, bus, slot and function,


@@ -70,44 +70,44 @@ Options:
         driver, other relevant information will be displayed:
         * the Linux interface name e.g. if=eth0
         * the driver being used e.g. drv=igb_uio
         driver, other relevant information will be displayed:
         * the Linux interface name e.g. if=eth0
         * the driver being used e.g. drv=igb_uio

-        * any suitable drivers not currently using that device 
-            e.g. unused=igb_uio 
+        * any suitable drivers not currently using that device
+            e.g. unused=igb_uio

         NOTE: if this flag is passed along with a bind/unbind option, the status
         display will always occur after the other operations have taken place.
         NOTE: if this flag is passed along with a bind/unbind option, the status
         display will always occur after the other operations have taken place.

-        
-    -b driver, --bind=driver: 
+
+    -b driver, --bind=driver:

         Select the driver to use or \"none\" to unbind the device
         Select the driver to use or \"none\" to unbind the device

-        
-    -u, --unbind: 
+
+    -u, --unbind:

         Unbind a device (Equivalent to \"-b none\")
         Unbind a device (Equivalent to \"-b none\")

-        
+

     --force:
         By default, devices which are used by Linux - as indicated by having
         routes in the routing table - cannot be modified. Using the --force
         flag overrides this behavior, allowing active links to be forcibly
     --force:
         By default, devices which are used by Linux - as indicated by having
         routes in the routing table - cannot be modified. Using the --force
         flag overrides this behavior, allowing active links to be forcibly

-        unbound. 
+        unbound.

         WARNING: This can lead to loss of network connection and should be used
         with caution.
         WARNING: This can lead to loss of network connection and should be used
         with caution.

-        
+

 Examples:
 ---------
 Examples:
 ---------

-    
+

 To display current device status:
         %(argv0)s --status
 To display current device status:
         %(argv0)s --status

-        
+

 To bind eth1 from the current driver and move to use igb_uio
         %(argv0)s --bind=igb_uio eth1
 To bind eth1 from the current driver and move to use igb_uio
         %(argv0)s --bind=igb_uio eth1

-        
+

 To unbind 0000:01:00.0 from using any driver
         %(argv0)s -u 0000:01:00.0
 To unbind 0000:01:00.0 from using any driver
         %(argv0)s -u 0000:01:00.0

-        
+

 To bind 0000:02:00.0 and 0000:02:00.1 to the ixgbe kernel driver
         %(argv0)s -b ixgbe 02:00.0 02:00.1
 To bind 0000:02:00.0 and 0000:02:00.1 to the ixgbe kernel driver
         %(argv0)s -b ixgbe 02:00.0 02:00.1

-    
+

     """ % locals() # replace items from local variables
 
 # This is roughly compatible with check_output function in subprocess module
     """ % locals() # replace items from local variables
 
 # This is roughly compatible with check_output function in subprocess module

-# which is only available in python 2.7. 
+# which is only available in python 2.7.

 def check_output(args, stderr=None):
     '''Run a command and capture its output'''
     return subprocess.Popen(args, stdout=subprocess.PIPE,
 def check_output(args, stderr=None):
     '''Run a command and capture its output'''
     return subprocess.Popen(args, stdout=subprocess.PIPE,


@@ -124,9 +124,9 @@ def find_module(mod):
                                      os.environ['RTE_TARGET'], mod)
         if exists(path):
             return path
                                      os.environ['RTE_TARGET'], mod)
         if exists(path):
             return path

-        
+

     # check using depmod
     # check using depmod

-    try: 
+    try:

         depmod_out = check_output(["modinfo", "-n", mod], \
                                   stderr=subprocess.STDOUT).lower()
         if "error" not in depmod_out:
         depmod_out = check_output(["modinfo", "-n", mod], \
                                   stderr=subprocess.STDOUT).lower()
         if "error" not in depmod_out:


@@ -135,7 +135,7 @@ def find_module(mod):
                 return path
     except: # if modinfo can't find module, it fails, so continue
         pass
                 return path
     except: # if modinfo can't find module, it fails, so continue
         pass

-    
+

     # check for a copy based off current path
     tools_dir = dirname(abspath(sys.argv[0]))
     if (tools_dir.endswith("tools")):
     # check for a copy based off current path
     tools_dir = dirname(abspath(sys.argv[0]))
     if (tools_dir.endswith("tools")):


@@ -150,12 +150,12 @@ def check_modules():
     '''Checks that the needed modules (igb_uio) is loaded, and then
     determine from the .ko file, what its supported device ids are'''
     global module_dev_ids
     '''Checks that the needed modules (igb_uio) is loaded, and then
     determine from the .ko file, what its supported device ids are'''
     global module_dev_ids

-    
+

     fd = file("/proc/modules")
     loaded_mods = fd.readlines()
     fd.close()
     mod = "igb_uio"
     fd = file("/proc/modules")
     loaded_mods = fd.readlines()
     fd.close()
     mod = "igb_uio"

-    
+

     # first check if module is loaded
     found = False
     for line in loaded_mods:
     # first check if module is loaded
     found = False
     for line in loaded_mods:


@@ -165,7 +165,7 @@ def check_modules():
     if not found:
         print "Error - module %s not loaded" %mod
         sys.exit(1)
     if not found:
         print "Error - module %s not loaded" %mod
         sys.exit(1)

-    
+

     # now find the .ko and get list of supported vendor/dev-ids
     modpath = find_module(mod)
     if modpath is None:
     # now find the .ko and get list of supported vendor/dev-ids
     modpath = find_module(mod)
     if modpath is None:


@@ -185,13 +185,13 @@ def check_modules():
         vendor = lineparts[1][:9]
         device = lineparts[1][9:18]
         if vendor.startswith("v") and device.startswith("d"):
         vendor = lineparts[1][:9]
         device = lineparts[1][9:18]
         if vendor.startswith("v") and device.startswith("d"):

-            module_dev_ids.append({"Vendor": int(vendor[1:],16), 
+            module_dev_ids.append({"Vendor": int(vendor[1:],16),

                                    "Device": int(device[1:],16)})
 
 def is_supported_device(dev_id):
     '''return true if device is supported by igb_uio, false otherwise'''
     for dev in module_dev_ids:
                                    "Device": int(device[1:],16)})
 
 def is_supported_device(dev_id):
     '''return true if device is supported by igb_uio, false otherwise'''
     for dev in module_dev_ids:

-        if (dev["Vendor"] == devices[dev_id]["Vendor"] and 
+        if (dev["Vendor"] == devices[dev_id]["Vendor"] and

             dev["Device"] == devices[dev_id]["Device"]):
             return True
     return False
             dev["Device"] == devices[dev_id]["Device"]):
             return True
     return False


@@ -205,9 +205,9 @@ def get_nic_details():
     the pci addresses (domain:bus:slot.func). The values are themselves
     dictionaries - one for each NIC.'''
     global devices
     the pci addresses (domain:bus:slot.func). The values are themselves
     dictionaries - one for each NIC.'''
     global devices

-    
+

     # clear any old data
     # clear any old data

-    devices = {} 
+    devices = {}

     # first loop through and read details for all devices
     # request machine readable format, with numeric IDs
     dev = {};
     # first loop through and read details for all devices
     # request machine readable format, with numeric IDs
     dev = {};


@@ -228,14 +228,14 @@ def get_nic_details():
     ssh_if = []
     route = check_output(["ip", "-o", "route"])
     # filter out all lines for 169.254 routes
     ssh_if = []
     route = check_output(["ip", "-o", "route"])
     # filter out all lines for 169.254 routes

-    route = "\n".join(filter(lambda ln: not ln.startswith("169.254"), 
+    route = "\n".join(filter(lambda ln: not ln.startswith("169.254"),

                              route.splitlines()))
     rt_info = route.split()
     for i in xrange(len(rt_info) - 1):
         if rt_info[i] == "dev":
             ssh_if.append(rt_info[i+1])
 
                              route.splitlines()))
     rt_info = route.split()
     for i in xrange(len(rt_info) - 1):
         if rt_info[i] == "dev":
             ssh_if.append(rt_info[i+1])
 

-    # based on the basic info, get extended text details            
+    # based on the basic info, get extended text details

     for d in devices.keys():
         extra_info = check_output(["lspci", "-vmmks", d]).splitlines()
         # parse lspci details
     for d in devices.keys():
         extra_info = check_output(["lspci", "-vmmks", d]).splitlines()
         # parse lspci details


@@ -254,7 +254,7 @@ def get_nic_details():
         # check if a port is used for ssh connection
         devices[d]["Ssh_if"] = False
         devices[d]["Active"] = ""
         # check if a port is used for ssh connection
         devices[d]["Ssh_if"] = False
         devices[d]["Active"] = ""

-        for _if in ssh_if: 
+        for _if in ssh_if:

             if _if in devices[d]["Interface"].split(","):
                 devices[d]["Ssh_if"] = True
                 devices[d]["Active"] = "*Active*"
             if _if in devices[d]["Interface"].split(","):
                 devices[d]["Ssh_if"] = True
                 devices[d]["Active"] = "*Active*"


@@ -275,7 +275,7 @@ def get_nic_details():
             if devices[d]["Driver_str"] in modules:
                 modules.remove(devices[d]["Driver_str"])
                 devices[d]["Module_str"] = ",".join(modules)
             if devices[d]["Driver_str"] in modules:
                 modules.remove(devices[d]["Driver_str"])
                 devices[d]["Module_str"] = ",".join(modules)

-    
+

 def dev_id_from_dev_name(dev_name):
     '''Take a device "name" - a string passed in by user to identify a NIC
     device, and determine the device id - i.e. the domain:bus:slot.func - for
 def dev_id_from_dev_name(dev_name):
     '''Take a device "name" - a string passed in by user to identify a NIC
     device, and determine the device id - i.e. the domain:bus:slot.func - for


@@ -284,7 +284,7 @@ def dev_id_from_dev_name(dev_name):
     # check if it's already a suitable index
     if dev_name in devices:
         return dev_name
     # check if it's already a suitable index
     if dev_name in devices:
         return dev_name

-    # check if it's an index just missing the domain part 
+    # check if it's an index just missing the domain part

     elif "0000:" + dev_name in devices:
         return "0000:" + dev_name
     else:
     elif "0000:" + dev_name in devices:
         return "0000:" + dev_name
     else:


@@ -304,13 +304,13 @@ def unbind_one(dev_id, force):
         print "%s %s %s is not currently managed by any driver\n" % \
             (dev["Slot"], dev["Device_str"], dev["Interface"])
         return
         print "%s %s %s is not currently managed by any driver\n" % \
             (dev["Slot"], dev["Device_str"], dev["Interface"])
         return

-    
+

     # prevent us disconnecting ourselves
     if dev["Ssh_if"] and not force:
         print "Routing table indicates that interface %s is active" \
             ". Skipping unbind" % (dev_id)
         return
     # prevent us disconnecting ourselves
     if dev["Ssh_if"] and not force:
         print "Routing table indicates that interface %s is active" \
             ". Skipping unbind" % (dev_id)
         return

-    
+

     # write to /sys to unbind
     filename = "/sys/bus/pci/drivers/%s/unbind" % dev["Driver_str"]
     try:
     # write to /sys to unbind
     filename = "/sys/bus/pci/drivers/%s/unbind" % dev["Driver_str"]
     try:


@@ -326,7 +326,7 @@ def bind_one(dev_id, driver, force):
     is already bound to a different driver, it will be unbound first'''
     dev = devices[dev_id]
     saved_driver = None # used to rollback any unbind in case of failure
     is already bound to a different driver, it will be unbound first'''
     dev = devices[dev_id]
     saved_driver = None # used to rollback any unbind in case of failure

-    
+

     # prevent disconnection of our ssh session
     if dev["Ssh_if"] and not force:
         print "Routing table indicates that interface %s is active" \
     # prevent disconnection of our ssh session
     if dev["Ssh_if"] and not force:
         print "Routing table indicates that interface %s is active" \


@@ -378,7 +378,7 @@ def display_devices(title, dev_list, extra_params = None):
     '''Displays to the user the details of a list of devices given in "dev_list"
     The "extra_params" parameter, if given, should contain a string with
     %()s fields in it for replacement by the named fields in each device's
     '''Displays to the user the details of a list of devices given in "dev_list"
     The "extra_params" parameter, if given, should contain a string with
     %()s fields in it for replacement by the named fields in each device's

-    dictionary.''' 
+    dictionary.'''

     strings = [] # this holds the strings to print. We sort before printing
     print "\n%s" % title
     print   "="*len(title)
     strings = [] # this holds the strings to print. We sort before printing
     print "\n%s" % title
     print   "="*len(title)


@@ -429,7 +429,7 @@ def parse_args():
     if len(sys.argv) <= 1:
         usage()
         sys.exit(0)
     if len(sys.argv) <= 1:
         usage()
         sys.exit(0)

-    
+

     try:
         opts, args = getopt.getopt(sys.argv[1:], "b:u",
                                ["help", "usage", "status", "force",
     try:
         opts, args = getopt.getopt(sys.argv[1:], "b:u",
                                ["help", "usage", "status", "force",


@@ -438,7 +438,7 @@ def parse_args():
         print str(error)
         print "Run '%s --usage' for further information" % sys.argv[0]
         sys.exit(1)
         print str(error)
         print "Run '%s --usage' for further information" % sys.argv[0]
         sys.exit(1)

-        
+

     for opt, arg in opts:
         if opt == "--help" or opt == "--usage":
             usage()
     for opt, arg in opts:
         if opt == "--help" or opt == "--usage":
             usage()


@@ -455,12 +455,12 @@ def parse_args():
                 b_flag = "none"
             else:
                 b_flag = arg
                 b_flag = "none"
             else:
                 b_flag = arg

-                
+

     if b_flag is None and not status_flag:
         print "Error: No action specified for devices. Please give a -b or -u option"
         print "Run '%s --usage' for further information" % sys.argv[0]
         sys.exit(1)
     if b_flag is None and not status_flag:
         print "Error: No action specified for devices. Please give a -b or -u option"
         print "Run '%s --usage' for further information" % sys.argv[0]
         sys.exit(1)

-    
+

     if b_flag is not None and len(args) == 0:
         print "Error: No devices specified."
         print "Run '%s --usage' for further information" % sys.argv[0]
     if b_flag is not None and len(args) == 0:
         print "Error: No devices specified."
         print "Run '%s --usage' for further information" % sys.argv[0]


@@ -474,7 +474,7 @@ def parse_args():
         if b_flag is not None:
             get_nic_details() # refresh if we have changed anything
         show_status()
         if b_flag is not None:
             get_nic_details() # refresh if we have changed anything
         show_status()

-                        
+

 def main():
     '''program main function'''
     check_modules()
 def main():
     '''program main function'''
     check_modules()

diff --git a/tools/setup.sh b/tools/setup.sh
index 39be8fc..c3fbd4d 100755 (executable)
--- a/tools/setup.sh
+++ b/tools/setup.sh
@@ -1,14 +1,14 @@
 #! /bin/bash
 
 #   BSD LICENSE
 #! /bin/bash
 
 #   BSD LICENSE

-# 
+#

 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   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
 #   are met:
 #   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
 #     * 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


@@ -18,7 +18,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.
 #     * 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
 #   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


@@ -329,9 +329,9 @@ grep_meminfo()
 #
 show_nics()
 {
 #
 show_nics()
 {

-       if  /sbin/lsmod  | grep -q igb_uio ; then 
+       if  /sbin/lsmod  | grep -q igb_uio ; then

                ${RTE_SDK}/tools/igb_uio_bind.py --status
                ${RTE_SDK}/tools/igb_uio_bind.py --status

-       else 
+       else

                echo "# Please load the 'igb_uio' kernel module before querying or "
                echo "# adjusting NIC device bindings"
        fi
                echo "# Please load the 'igb_uio' kernel module before querying or "
                echo "# adjusting NIC device bindings"
        fi


@@ -342,13 +342,13 @@ show_nics()
 #
 bind_nics()
 {
 #
 bind_nics()
 {

-       if  /sbin/lsmod  | grep -q igb_uio ; then 
+       if  /sbin/lsmod  | grep -q igb_uio ; then

                ${RTE_SDK}/tools/igb_uio_bind.py --status
                echo ""
                echo -n "Enter PCI address of device to bind to IGB UIO driver: "
                read PCI_PATH
                sudo ${RTE_SDK}/tools/igb_uio_bind.py -b igb_uio $PCI_PATH && echo "OK"
                ${RTE_SDK}/tools/igb_uio_bind.py --status
                echo ""
                echo -n "Enter PCI address of device to bind to IGB UIO driver: "
                read PCI_PATH
                sudo ${RTE_SDK}/tools/igb_uio_bind.py -b igb_uio $PCI_PATH && echo "OK"

-       else 
+       else

                echo "# Please load the 'igb_uio' kernel module before querying or "
                echo "# adjusting NIC device bindings"
        fi
                echo "# Please load the 'igb_uio' kernel module before querying or "
                echo "# adjusting NIC device bindings"
        fi