diff options
| author | Tejun Heo <tj@kernel.org> | 2016-05-09 19:34:39 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-05-09 19:34:39 +0300 |
| commit | 698f6700a6f19ba4550a722eaacf9f9d212b3fd9 (patch) | |
| tree | ff63c9a23fe47870df8788ff5e7d9a552f6d4ed1 /net/ipv6/udp.c | |
| parent | 7780081c1f04a4ea31331b5579ca010cc1f26c74 (diff) | |
| parent | 13f307711b127d30fcf333a04365a217baf9ca2b (diff) | |
| download | linux-698f6700a6f19ba4550a722eaacf9f9d212b3fd9.tar.xz | |
Merge branch '4.7/scsi-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi into for-4.7-zac
Pulling in the dependencies for further ZAC changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index fd25e447a5fa..8125931106be 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -843,8 +843,8 @@ start_lookup: flush_stack(stack, count, skb, count - 1); } else { if (!inner_flushed) - UDP_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI, - proto == IPPROTO_UDPLITE); + UDP6_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI, + proto == IPPROTO_UDPLITE); consume_skb(skb); } return 0; |