diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
| commit | d2800e9cfd6bb876f597adbb806de21774067413 (patch) | |
| tree | 5236f073d5af51d5060a46d09884a55b36ea3440 /include/net/inet_sock.h | |
| parent | 3fe26611bb4999c3717d3aface0bac722b9d2653 (diff) | |
| parent | afabf37012e839802f9f3819f621e16aa4acefd2 (diff) | |
| download | kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.zip kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.gz kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.bz2 | |
Merge commit 'afabf37012e839802f9f3819f621e16aa4acefd2' into upstreaming
update from cm-13.0
Conflicts:
Makefile
crypto/algapi.c
drivers/char/diag/diagchar.h
drivers/char/diag/diagchar_core.c
drivers/misc/Makefile
kernel/timeconst.pl
Diffstat (limited to 'include/net/inet_sock.h')
| -rw-r--r-- | include/net/inet_sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 26490b3..ee4ee91 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -241,7 +241,7 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk) { __u8 flags = 0; - if (inet_sk(sk)->transparent) + if (inet_sk(sk)->transparent || inet_sk(sk)->hdrincl) flags |= FLOWI_FLAG_ANYSRC; if (sk->sk_protocol == IPPROTO_TCP) flags |= FLOWI_FLAG_PRECOW_METRICS; |