xfrm_user.c (221df1ed33c9284fc7a6f6e47ca7f8d5f3665d43) | xfrm_user.c (5447c5e401c49aba0c36bb1066f2d25b152553b7) |
---|---|
1/* xfrm_user.c: User interface to configure xfrm engine. 2 * 3 * Copyright (C) 2002 David S. Miller (davem@redhat.com) 4 * 5 * Changes: 6 * Mitsuru KANDA @USAGI 7 * Kazunori MIYAZAWA @USAGI 8 * Kunihiro Ishiguro <kunihiro@ipinfusion.com> --- 823 unchanged lines hidden (view full) --- 832 if (err) 833 goto out_noput; 834 835 family = p->info.family; 836 daddr = &p->info.id.daddr; 837 838 x = NULL; 839 if (p->info.seq) { | 1/* xfrm_user.c: User interface to configure xfrm engine. 2 * 3 * Copyright (C) 2002 David S. Miller (davem@redhat.com) 4 * 5 * Changes: 6 * Mitsuru KANDA @USAGI 7 * Kazunori MIYAZAWA @USAGI 8 * Kunihiro Ishiguro <kunihiro@ipinfusion.com> --- 823 unchanged lines hidden (view full) --- 832 if (err) 833 goto out_noput; 834 835 family = p->info.family; 836 daddr = &p->info.id.daddr; 837 838 x = NULL; 839 if (p->info.seq) { |
840 x = xfrm_find_acq_byseq(p->info.seq); | 840 x = xfrm_find_acq_byseq(&init_net, p->info.seq); |
841 if (x && xfrm_addr_cmp(&x->id.daddr, daddr, family)) { 842 xfrm_state_put(x); 843 x = NULL; 844 } 845 } 846 847 if (!x) | 841 if (x && xfrm_addr_cmp(&x->id.daddr, daddr, family)) { 842 xfrm_state_put(x); 843 x = NULL; 844 } 845 } 846 847 if (!x) |
848 x = xfrm_find_acq(p->info.mode, p->info.reqid, | 848 x = xfrm_find_acq(&init_net, p->info.mode, p->info.reqid, |
849 p->info.id.proto, daddr, 850 &p->info.saddr, 1, 851 family); 852 err = -ENOENT; 853 if (x == NULL) 854 goto out_noput; 855 856 err = xfrm_alloc_spi(x, p->min, p->max); --- 1743 unchanged lines hidden --- | 849 p->info.id.proto, daddr, 850 &p->info.saddr, 1, 851 family); 852 err = -ENOENT; 853 if (x == NULL) 854 goto out_noput; 855 856 err = xfrm_alloc_spi(x, p->min, p->max); --- 1743 unchanged lines hidden --- |