From: Thomas Egerer <hakke_007@gmx•de>
To: netdev@vger•kernel.org
Cc: stephen.hemminger@vyatta•com
Subject: Re: [PATCH] ip xfrm state: Allow different selector family
Date: Wed, 20 Mar 2013 10:18:57 +0100 [thread overview]
Message-ID: <51497F01.9030702@gmx.de> (raw)
In-Reply-To: <5145A141.8000707@gmx.de>
My previous commit introduced a patch to allow for states with different
ip address families for selector and id. The must have somehow been a
mixup of the patch I tested and the one I send, so the patch sent breaks
the iproute2 build. This patch fixes this. My apologies.
Signed-off-by: Thomas Egerer <hakke_007@gmx•de>
---
Hi Stephen, *,
my sincere apologies for breaking the build. But I somehow build and tested
one commit and sent the wrong one to the list. The assignment was wrong.
This commit fixes this bug. My bad,
Thomas
ip/xfrm_state.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
0001-ip-xfrm-state-Fix-assignment-of-preferred_family.patch
diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index 6ff5b51..c0cf88c 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -296,7 +296,7 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
NEXT_ARG();
preferred_family = AF_UNSPEC;
xfrm_selector_parse(&req.xsinfo.sel, &argc, &argv);
- preferred_family = req.xsinfo.sel;
+ preferred_family = req.xsinfo.sel.family;
} else if (strcmp(*argv, "limit") == 0) {
NEXT_ARG();
xfrm_lifetime_cfg_parse(&req.xsinfo.lft, &argc, &argv);
prev parent reply other threads:[~2013-03-20 9:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-17 10:56 [PATCH] ip xfrm state: Allow different selector family Thomas Egerer
2013-03-20 9:18 ` Thomas Egerer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51497F01.9030702@gmx.de \
--to=hakke_007@gmx$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
--cc=stephen.hemminger@vyatta$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox