[PATCH net-2.6.25] [XFRM] Remove unused definition XFRM_POLICY_LOCALOK in linux/xfrm.h + typos in net/xfrm.h

[PATCH net-2.6.25] [XFRM] Remove unused definition XFRM_POLICY_LOCALOK in linux/xfrm.h + typos in net/xfrm.h

[Rami Rosen]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

Hi,
- XFRM_POLICY_LOCALOK in linux/xfrm.h is unused definition.
- correct 4 typos in net/xfrm.h

Regards,
Rami Rosen


Signed-off-by: Rami Rosen <ramirose@gmail.com>

[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1742 bytes --]

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 9b5b00c..f5cfb75 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -363,7 +363,6 @@ struct xfrm_userpolicy_info {
 #define XFRM_POLICY_ALLOW	0
 #define XFRM_POLICY_BLOCK	1
 	__u8				flags;
-#define XFRM_POLICY_LOCALOK	1	/* Allow user to override global policy */
 	/* Automatically expand selector to include matching ICMP payloads. */
 #define XFRM_POLICY_ICMP	2
 	__u8				share;
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 5ebb9ba..09b9bda 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -73,7 +73,7 @@ extern struct mutex xfrm_cfg_mutex;
    Lookup is plain linear search until the first match with selector.
 
    If "action" is "block", then we prohibit the flow, otherwise:
-   if "xfrms_nr" is zero, the flow passes untransformed. Otherwise,
+   if "xfrm_nr" is zero, the flow passes untransformed. Otherwise,
    policy entry has list of up to XFRM_MAX_DEPTH transformations,
    described by templates xfrm_tmpl. Each template is resolved
    to a complete xfrm_state (see below) and we pack bundle of transformations
@@ -84,10 +84,10 @@ extern struct mutex xfrm_cfg_mutex;
                      |---. child .-> dst -. xfrm .-> xfrm_state #3
                                       |---. child .-> NULL
 
-   Bundles are cached at xrfm_policy struct (field ->bundles).
+   Bundles are cached at xfrm_policy struct (field ->bundles).
 
 
-   Resolution of xrfm_tmpl
+   Resolution of xfrm_tmpl
    -----------------------
    Template contains:
    1. ->mode		Mode: transport or tunnel
@@ -133,7 +133,7 @@ struct xfrm_state
 
 	u32			genid;
 
-	/* Key manger bits */
+	/* Key manager bits */
 	struct {
 		u8		state;
 		u8		dying;

Re: [PATCH net-2.6.25] [XFRM] Remove unused definition XFRM_POLICY_LOCALOK in linux/xfrm.h + typos in net/xfrm.h

[David Miller]

From: "Rami Rosen" <ramirose@gmail.com>
Date: Tue, 15 Jan 2008 10:17:37 +0200

> Hi,
> - XFRM_POLICY_LOCALOK in linux/xfrm.h is unused definition.
> - correct 4 typos in net/xfrm.h

Values in linux/xfrm.h are user visible, so I am worried that this
might break the build of some userland application.

Herbert explained that this value is unused inside of the
kernel, and that is true, but I'm not so sure that there
are no applications using the value.

We might have to keep it there.