diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-02-28 13:30:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-02-28 13:30:55 +0100 |
| commit | 70395a96bd882d8dba669f99b5cec0008690accd (patch) | |
| tree | 37f3a4c2cf35828f153f3ce59c3daa4f39241c32 /net/xfrm/xfrm_interface.c | |
| parent | f97a0944a72b26a2bece72516294e112a890f98a (diff) | |
| parent | 3146089d235b304e665dc551472ae9cb9ab58572 (diff) | |
| download | talos-op-linux-70395a96bd882d8dba669f99b5cec0008690accd.tar.gz talos-op-linux-70395a96bd882d8dba669f99b5cec0008690accd.zip | |
Merge tag 'asoc-v5.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More changes for v5.1
Another batch of changes for ASoC, no big core changes - it's mainly
small fixes and improvements for individual drivers.
- A big refresh and cleanup of the Samsung drivers, fixing a number of
issues which allow the driver to be used with a wider range of
userspaces.
- Fixes for the Intel drivers to make them more standard so less likely
to get bitten by core issues.
- New driver for Cirrus Logic CS35L26.
Diffstat (limited to 'net/xfrm/xfrm_interface.c')
| -rw-r--r-- | net/xfrm/xfrm_interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index 6be8c7df15bb..dbb3c1945b5c 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -76,10 +76,10 @@ static struct xfrm_if *xfrmi_decode_session(struct sk_buff *skb) int ifindex; struct xfrm_if *xi; - if (!skb->dev) + if (!secpath_exists(skb) || !skb->dev) return NULL; - xfrmn = net_generic(dev_net(skb->dev), xfrmi_net_id); + xfrmn = net_generic(xs_net(xfrm_input_state(skb)), xfrmi_net_id); ifindex = skb->dev->ifindex; for_each_xfrmi_rcu(xfrmn->xfrmi[0], xi) { |
