diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
commit | c91925db4925ba0d145478f02c093369196936e9 (patch) | |
tree | 0e5da4211de3c18b65337c3094ec15994cf2534a /net/xfrm/xfrm_user.c | |
parent | ALSA: hda - Set up COEFs for ALC269 to avoid click noises at power-saving (diff) | |
parent | ALSA: patch_nvhdmi.c: Fix supported sample rate list. (diff) | |
download | linux-dev-c91925db4925ba0d145478f02c093369196936e9.tar.xz linux-dev-c91925db4925ba0d145478f02c093369196936e9.zip |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'net/xfrm/xfrm_user.c')
-rw-r--r-- | net/xfrm/xfrm_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index b14ed4b1f27c..8bae6b22c846 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1801,7 +1801,7 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh, struct xfrm_user_expire *ue = nlmsg_data(nlh); struct xfrm_usersa_info *p = &ue->state; struct xfrm_mark m; - u32 mark = xfrm_mark_get(attrs, &m);; + u32 mark = xfrm_mark_get(attrs, &m); x = xfrm_state_lookup(net, mark, &p->id.daddr, p->id.spi, p->id.proto, p->family); |