diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /include/net/xfrm.h | |
| parent | 3f17522ce461a31e7ced6311b28fcf5b8a763316 (diff) | |
| parent | 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index a7df3275b860..d74e080ba6c9 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
| @@ -275,7 +275,8 @@ struct xfrm_policy_afinfo { | |||
| 275 | struct dst_entry *dst, | 275 | struct dst_entry *dst, |
| 276 | int nfheader_len); | 276 | int nfheader_len); |
| 277 | int (*fill_dst)(struct xfrm_dst *xdst, | 277 | int (*fill_dst)(struct xfrm_dst *xdst, |
| 278 | struct net_device *dev); | 278 | struct net_device *dev, |
| 279 | struct flowi *fl); | ||
| 279 | }; | 280 | }; |
| 280 | 281 | ||
| 281 | extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo); | 282 | extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo); |