aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/xfrm6_policy.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-12 16:36:19 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-12 18:08:55 -0500
commit1958b856c1a59c0f1e892b92debb8c9fe4f364dc (patch)
tree679e060ad7c1e36ee2e5aec0c686921c66c9bc2c /net/ipv6/xfrm6_policy.c
parent4c9483b2fb5d2548c3cc1fe03cdd4484ceeb5d1c (diff)
net: Put fl6_* macros to struct flowi6 and use them again.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_policy.c')
-rw-r--r--net/ipv6/xfrm6_policy.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index bef62005c0ed..05e34c8ec913 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -160,8 +160,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
160 pskb_may_pull(skb, nh + offset + 4 - skb->data))) { 160 pskb_may_pull(skb, nh + offset + 4 - skb->data))) {
161 __be16 *ports = (__be16 *)exthdr; 161 __be16 *ports = (__be16 *)exthdr;
162 162
163 fl6->uli.ports.sport = ports[!!reverse]; 163 fl6->fl6_sport = ports[!!reverse];
164 fl6->uli.ports.dport = ports[!reverse]; 164 fl6->fl6_dport = ports[!reverse];
165 } 165 }
166 fl6->flowi6_proto = nexthdr; 166 fl6->flowi6_proto = nexthdr;
167 return; 167 return;
@@ -170,8 +170,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
170 if (!onlyproto && pskb_may_pull(skb, nh + offset + 2 - skb->data)) { 170 if (!onlyproto && pskb_may_pull(skb, nh + offset + 2 - skb->data)) {
171 u8 *icmp = (u8 *)exthdr; 171 u8 *icmp = (u8 *)exthdr;
172 172
173 fl6->uli.icmpt.type = icmp[0]; 173 fl6->fl6_icmp_type = icmp[0];
174 fl6->uli.icmpt.code = icmp[1]; 174 fl6->fl6_icmp_code = icmp[1];
175 } 175 }
176 fl6->flowi6_proto = nexthdr; 176 fl6->flowi6_proto = nexthdr;
177 return; 177 return;
@@ -182,7 +182,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
182 struct ip6_mh *mh; 182 struct ip6_mh *mh;
183 mh = (struct ip6_mh *)exthdr; 183 mh = (struct ip6_mh *)exthdr;
184 184
185 fl6->uli.mht.type = mh->ip6mh_type; 185 fl6->fl6_mh_type = mh->ip6mh_type;
186 } 186 }
187 fl6->flowi6_proto = nexthdr; 187 fl6->flowi6_proto = nexthdr;
188 return; 188 return;
@@ -193,7 +193,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
193 case IPPROTO_ESP: 193 case IPPROTO_ESP:
194 case IPPROTO_COMP: 194 case IPPROTO_COMP:
195 default: 195 default:
196 fl6->uli.spi = 0; 196 fl6->fl6_ipsec_spi = 0;
197 fl6->flowi6_proto = nexthdr; 197 fl6->flowi6_proto = nexthdr;
198 return; 198 return;
199 } 199 }