diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-24 20:02:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-24 20:02:53 -0700 |
| commit | 25d590e3f8fd84dfbeb23cec0c786df92ee3112c (patch) | |
| tree | 6c2b38aa65695b643c6fdda18732ffe87b9a79ae /include | |
| parent | b3ede85de2db1fd39a653863cba4e9a968765e45 (diff) | |
| parent | 709d3a4e3edcb0963185f9481b178c9cfb9aab55 (diff) | |
Merge "net: restore upstream changes which break routing in tunnel scenarios"
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/xfrm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index c81d806e415f..185fb037b332 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -285,10 +285,11 @@ struct xfrm_policy_afinfo { unsigned short family; struct dst_ops *dst_ops; void (*garbage_collect)(struct net *net); - struct dst_entry *(*dst_lookup)(struct net *net, int tos, + struct dst_entry *(*dst_lookup)(struct net *net, + int tos, int oif, const xfrm_address_t *saddr, const xfrm_address_t *daddr); - int (*get_saddr)(struct net *net, + int (*get_saddr)(struct net *net, int oif, xfrm_address_t *saddr, xfrm_address_t *daddr); void (*decode_session)(struct sk_buff *skb, |