[hipl-commit] [trunk] Rev 4221: cosmetics: Merge two consecutive preprocessor blocks under the same condition.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Fri, 9 Apr 2010 19:44:53 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 09/04/2010 at 19:44:53
Revision: 4221
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  cosmetics: Merge two consecutive preprocessor blocks under the same condition.

Modified:
  M  hipd/init.c

=== modified file 'hipd/init.c'
--- hipd/init.c 2010-04-09 16:43:35 +0000
+++ hipd/init.c 2010-04-09 16:44:19 +0000
@@ -311,9 +311,6 @@
         hip_xfrm_set_beet(4);         /* BEET mode */
         hip_xfrm_set_algo_names(1);
     }
-#endif
-
-#ifndef CONFIG_HIP_PFKEY
     /* This requires new kernel versions (the 2.6.18 patch) - jk */
     hip_xfrm_set_default_sa_prefix_len(128);
 #endif

Other related posts:

  • » [hipl-commit] [trunk] Rev 4221: cosmetics: Merge two consecutive preprocessor blocks under the same condition. - Diego Biurrun