diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-23 01:22:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-23 01:22:35 -0400 |
| commit | 36583eb54d46c36a447afd6c379839f292397429 (patch) | |
| tree | 70f5399529dc2135a986947b37c655194da60e9d /net/ipv4/tcp_minisocks.c | |
| parent | fa7912be967102cdbecd8ef172571b28eb22099e (diff) | |
| parent | cf539cbd8a81e12880735a0912de8b99f46c84fd (diff) | |
| download | linux-stable-36583eb54d46c36a447afd6c379839f292397429.tar.gz linux-stable-36583eb54d46c36a447afd6c379839f292397429.tar.bz2 linux-stable-36583eb54d46c36a447afd6c379839f292397429.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/cadence/macb.c
drivers/net/phy/phy.c
include/linux/skbuff.h
net/ipv4/tcp.c
net/switchdev/switchdev.c
Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.
phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.
tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.
macb.c involved the addition of two zyncq device entries.
skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_minisocks.c')
| -rw-r--r-- | net/ipv4/tcp_minisocks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index b62d15c86946..df7fe3c31162 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -300,7 +300,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo) tw->tw_v6_daddr = sk->sk_v6_daddr; tw->tw_v6_rcv_saddr = sk->sk_v6_rcv_saddr; tw->tw_tclass = np->tclass; - tw->tw_flowlabel = np->flow_label >> 12; + tw->tw_flowlabel = be32_to_cpu(np->flow_label & IPV6_FLOWLABEL_MASK); tw->tw_ipv6only = sk->sk_ipv6only; } #endif |