aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_policy.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-08 03:20:21 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:21:11 -0500
commit8c689a6eae2d83970e4f34753d513e96fb97a025 (patch)
tree50c67089a5a46dbde93fdcb6040227fb599d5110 /net/ipv4/xfrm4_policy.c
parentd2ecd9ccd0694278a8c1fa179d1d058ee66e2297 (diff)
[XFRM]: misc annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_policy.c')
-rw-r--r--net/ipv4/xfrm4_policy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 1bed0cdf53e3..da766234607b 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -72,8 +72,8 @@ __xfrm4_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
72 struct dst_entry *dst, *dst_prev; 72 struct dst_entry *dst, *dst_prev;
73 struct rtable *rt0 = (struct rtable*)(*dst_p); 73 struct rtable *rt0 = (struct rtable*)(*dst_p);
74 struct rtable *rt = rt0; 74 struct rtable *rt = rt0;
75 u32 remote = fl->fl4_dst; 75 __be32 remote = fl->fl4_dst;
76 u32 local = fl->fl4_src; 76 __be32 local = fl->fl4_src;
77 struct flowi fl_tunnel = { 77 struct flowi fl_tunnel = {
78 .nl_u = { 78 .nl_u = {
79 .ip4_u = { 79 .ip4_u = {
@@ -203,7 +203,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl)
203 case IPPROTO_SCTP: 203 case IPPROTO_SCTP:
204 case IPPROTO_DCCP: 204 case IPPROTO_DCCP:
205 if (pskb_may_pull(skb, xprth + 4 - skb->data)) { 205 if (pskb_may_pull(skb, xprth + 4 - skb->data)) {
206 u16 *ports = (u16 *)xprth; 206 __be16 *ports = (__be16 *)xprth;
207 207
208 fl->fl_ip_sport = ports[0]; 208 fl->fl_ip_sport = ports[0];
209 fl->fl_ip_dport = ports[1]; 209 fl->fl_ip_dport = ports[1];