[IPSEC] Turn km_event.data into a union
This patch turns km_event.data into a union. This makes code that
uses it clearer.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index aaa0f5f..fda356e 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -173,7 +173,12 @@
/* callback structure passed from either netlink or pfkey */
struct km_event
{
- u32 data;
+ union {
+ u32 hard;
+ u32 proto;
+ u32 byid;
+ } data;
+
u32 seq;
u32 pid;
u32 event;
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 560c93c..3fae5c4 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1293,13 +1293,6 @@
if (c->event == XFRM_SAP_DELETED)
hsc = 0;
- if (c->event == XFRM_SAP_EXPIRED) {
- if (c->data)
- hsc = 2;
- else
- hsc = 1;
- }
-
skb = pfkey_xfrm_state2msg(x, 0, hsc);
if (IS_ERR(skb))
@@ -1534,7 +1527,7 @@
if (!skb)
return -ENOBUFS;
hdr = (struct sadb_msg *) skb_put(skb, sizeof(struct sadb_msg));
- hdr->sadb_msg_satype = pfkey_proto2satype(c->data);
+ hdr->sadb_msg_satype = pfkey_proto2satype(c->data.proto);
hdr->sadb_msg_seq = c->seq;
hdr->sadb_msg_pid = c->pid;
hdr->sadb_msg_version = PF_KEY_V2;
@@ -1556,7 +1549,7 @@
return -EINVAL;
xfrm_state_flush(proto);
- c.data = proto;
+ c.data.proto = proto;
c.seq = hdr->sadb_msg_seq;
c.pid = hdr->sadb_msg_pid;
c.event = XFRM_SAP_FLUSHED;
@@ -1969,7 +1962,7 @@
out_hdr = (struct sadb_msg *) out_skb->data;
out_hdr->sadb_msg_version = PF_KEY_V2;
- if (c->data && c->event == XFRM_SAP_DELETED)
+ if (c->data.byid && c->event == XFRM_SAP_DELETED)
out_hdr->sadb_msg_type = SADB_X_SPDDELETE2;
else
out_hdr->sadb_msg_type = event2poltype(c->event);
@@ -2180,7 +2173,7 @@
c.seq = hdr->sadb_msg_seq;
c.pid = hdr->sadb_msg_pid;
if (hdr->sadb_msg_type == SADB_X_SPDDELETE2) {
- c.data = 1; // to signal pfkey of SADB_X_SPDDELETE2
+ c.data.byid = 1;
c.event = XFRM_SAP_DELETED;
km_policy_notify(xp, pol->sadb_x_policy_dir-1, &c);
} else {
@@ -2460,7 +2453,7 @@
int hard;
int hsc;
- hard = c->data;
+ hard = c->data.hard;
if (hard)
hsc = 2;
else
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 94f7416..e068bd7 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -835,7 +835,7 @@
{
struct km_event c;
- c.data = hard;
+ c.data.hard = hard;
c.event = XFRM_SAP_EXPIRED;
km_state_notify(x, &c);
@@ -883,8 +883,7 @@
{
struct km_event c;
- c.data = hard;
- c.data = hard;
+ c.data.hard = hard;
c.event = XFRM_SAP_EXPIRED;
km_policy_notify(pol, dir, &c);
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index bd8e688..4d3237d 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -900,7 +900,7 @@
struct xfrm_usersa_flush *p = NLMSG_DATA(nlh);
xfrm_state_flush(p->proto);
- c.data = p->proto;
+ c.data.proto = p->proto;
c.event = XFRM_SAP_FLUSHED;
c.seq = nlh->nlmsg_seq;
c.pid = nlh->nlmsg_pid;
@@ -1129,14 +1129,13 @@
static int xfrm_exp_state_notify(struct xfrm_state *x, struct km_event *c)
{
struct sk_buff *skb;
- int hard = c ->data;
/* fix to do alloc using NLM macros */
skb = alloc_skb(sizeof(struct xfrm_user_expire) + 16, GFP_ATOMIC);
if (skb == NULL)
return -ENOMEM;
- if (build_expire(skb, x, hard) < 0)
+ if (build_expire(skb, x, c->data.hard) < 0)
BUG();
NETLINK_CB(skb).dst_groups = XFRMGRP_EXPIRE;
@@ -1162,7 +1161,7 @@
nlh->nlmsg_flags = 0;
p = NLMSG_DATA(nlh);
- p->proto = c->data;
+ p->proto = c->data.proto;
nlh->nlmsg_len = skb->tail - b;
@@ -1404,7 +1403,7 @@
if (skb == NULL)
return -ENOMEM;
- if (build_polexpire(skb, xp, dir, c->data) < 0)
+ if (build_polexpire(skb, xp, dir, c->data.hard) < 0)
BUG();
NETLINK_CB(skb).dst_groups = XFRMGRP_EXPIRE;