PERFORCE change 123437 for review

[Ana Kukec]

http://perforce.freebsd.org/chv.cgi?CH=123437

Change 123437 by anchie at anchie_malimis on 2007/07/13 12:47:28

		Some small fixes. 	

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#7 edit
.. //depot/projects/vimage/src/sys/netipsec/vipsec.h#2 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#7 (text+ko) ====

@@ -63,7 +63,6 @@
 #include <netipsec/xform.h>
 #include <netipsec/key.h>
 #include <netipsec/vipsec.h>
-#include <netipsec/vipsec.h>
 #endif /*IPSEC*/
 
 extern	struct protosw inetsw[];
@@ -96,7 +95,6 @@
 ip_ipsec_fwd(struct mbuf *m)
 {
 #ifdef IPSEC
-	INIT_VNET_IPSEC(curvnet);
 	INIT_VNET_INET(curvnet);
 	INIT_VNET_IPSEC(curvnet);
 	struct m_tag *mtag;
@@ -142,7 +140,6 @@
  * 1 = drop packet, 0 = continue processing packet.
  */
 int
-	INIT_VNET_IPSEC(curvnet);
 ip_ipsec_input(struct mbuf *m)
 {
 	INIT_VNET_IPSEC(curvnet);

==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#2 (text+ko) ====

@@ -109,9 +109,9 @@
 #define V_ip4_def_policy		VNET_IPSEC(ip4_def_policy)
 #define V_ip4_ah_offsetmask		VNET_IPSEC(ip4_ah_offsetmask)
 #define V_ip4_ipsec_dfbit		VNET_IPSEC(ip4_ipsec_dfbit)
-#define V_ip4_esp_trans_deflev	VNET_IPSEC(ip4_esp_trans_deflev)
-#define V_ip4_esp_net_deflev	VNET_IPSEC(ip4_esp_net_deflev)
-#define V_ip4_ah_trans_deflev	VNET_IPSEC(ip4_ah_trans_deflev)
+#define V_ip4_esp_trans_deflev		VNET_IPSEC(ip4_esp_trans_deflev)
+#define V_ip4_esp_net_deflev		VNET_IPSEC(ip4_esp_net_deflev)
+#define V_ip4_ah_trans_deflev		VNET_IPSEC(ip4_ah_trans_deflev)
 #define V_ip4_ah_net_deflev		VNET_IPSEC(ip4_ah_net_deflev)
 #define V_ip4_ipsec_ecn			VNET_IPSEC(ip4_ipsec_ecn)
 #define V_ip4_esp_randpad		VNET_IPSEC(ip4_esp_randpad)
@@ -122,21 +122,21 @@
 #define V_key_spi_trycnt		VNET_IPSEC(key_spi_trycnt)
 #define V_key_spi_minval		VNET_IPSEC(key_spi_minval)
 #define V_key_spi_maxval		VNET_IPSEC(key_spi_maxval)	
-#define V_policy_id				VNET_IPSEC(policy_id)
+#define V_policy_id			VNET_IPSEC(policy_id)
 #define V_key_int_random		VNET_IPSEC(key_int_random)
-#define V_key_larval_lifetime	VNET_IPSEC(key_larval_lifetime)
-#define V_key_blockacq_count	VNET_IPSEC(key_blockacq_count)
-#define V_key_blockacq_lifetime	VNET_IPSEC(key_blockacq_lifetime)
-#define V_key_preferred_oldsa	VNET_IPSEC(key_preferred_oldsa)
-#define V_acq_seq				VNET_IPSEC(acq_seq)
-#define V_saorder_state_alive	VNET_IPSEC(saorder_state_alive)
+#define V_key_larval_lifetime		VNET_IPSEC(key_larval_lifetime)
+#define V_key_blockacq_count		VNET_IPSEC(key_blockacq_count)
+#define V_key_blockacq_lifetime		VNET_IPSEC(key_blockacq_lifetime)
+#define V_key_preferred_oldsa		VNET_IPSEC(key_preferred_oldsa)
+#define V_acq_seq			VNET_IPSEC(acq_seq)
+#define V_saorder_state_alive		VNET_IPSEC(saorder_state_alive)
 #define V_saorder_state_any		VNET_IPSEC(saorder_state_any)
 #define V_esp_enable			VNET_IPSEC(esp_enable)
-#define V_espstat				VNET_IPSEC(espstat)
+#define V_espstat			VNET_IPSEC(espstat)
 #define V_esp_max_ivlen			VNET_IPSEC(esp_max_ivlen)
 #define V_ipsec_esp_keymin		VNET_IPSEC(ipsec_esp_keymin)
 #define V_ipsec_esp_auth		VNET_IPSEC(ipsec_esp_auth)
 #define V_ipsec_ah_keymin		VNET_IPSEC(ipsec_ah_keymin)
 #define V_ipip_allow			VNET_IPSEC(ipip_allow)
-#define V_ipipstat				VNET_IPSEC(ipipstat)
+#define V_ipipstat			VNET_IPSEC(ipipstat)
 #endif /* !_NETIPSEC_VIPSEC_H_ */