projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-3.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[firefly-linux-kernel-4.4.55.git]
/
net
/
dccp
/
ipv6.c
diff --git
a/net/dccp/ipv6.c
b/net/dccp/ipv6.c
index ad2acfe1ca61004e1276e388fdde95c93716d26a..6bcaa33cd804d2d18e569e921c8b43b2e3ae94e9 100644
(file)
--- a/
net/dccp/ipv6.c
+++ b/
net/dccp/ipv6.c
@@
-757,7
+757,8
@@
static int dccp_v6_rcv(struct sk_buff *skb)
/* Step 2:
* Look up flow ID in table and get corresponding socket */
sk = __inet6_lookup_skb(&dccp_hashinfo, skb,
- dh->dccph_sport, dh->dccph_dport);
+ dh->dccph_sport, dh->dccph_dport,
+ inet6_iif(skb));
/*
* Step 2:
* If no socket ...