diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-10 10:16:17 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-10 10:16:17 +0000 |
| commit | d79aab2852cd89ed8b792d633c9bebc0c6af74ac (patch) | |
| tree | 029dec967090ff96578df1fcf70d358a34c2dc3e /net/ipv4/xfrm4_state.c | |
| parent | 039d35267d79b9feae3a850f54b2677dea019f0a (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmk-next
Diffstat (limited to 'net/ipv4/xfrm4_state.c')
| -rw-r--r-- | net/ipv4/xfrm4_state.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c index 07735ed280d..55dc6beab9a 100644 --- a/net/ipv4/xfrm4_state.c +++ b/net/ipv4/xfrm4_state.c @@ -33,6 +33,7 @@ __xfrm4_init_tempsel(struct xfrm_state *x, struct flowi *fl, x->sel.dport_mask = htons(0xffff); x->sel.sport = xfrm_flowi_sport(fl); x->sel.sport_mask = htons(0xffff); + x->sel.family = AF_INET; x->sel.prefixlen_d = 32; x->sel.prefixlen_s = 32; x->sel.proto = fl->proto; |