diff options
| author | David S. Miller <davem@davemloft.net> | 2020-04-25 19:24:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-25 20:18:53 -0700 |
| commit | d483389678f9e03d53f226641ea39679debcbc81 (patch) | |
| tree | e33c9e59627e806ef97be9ef66c48afb1e4ab393 /net/mptcp/options.c | |
| parent | 6033cebdfff9b10192eb254e8cc60fedd595ea7f (diff) | |
| parent | b2768df24ec400dd4f7fa79542f797e904812053 (diff) | |
| download | lwn-d483389678f9e03d53f226641ea39679debcbc81.tar.gz lwn-d483389678f9e03d53f226641ea39679debcbc81.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Simple overlapping changes to linux/vermagic.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/options.c')
| -rw-r--r-- | net/mptcp/options.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index faf57585b892..4a7c467b99db 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -876,12 +876,11 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb, mpext->data_seq = mp_opt->data_seq; mpext->subflow_seq = mp_opt->subflow_seq; mpext->dsn64 = mp_opt->dsn64; + mpext->data_fin = mp_opt->data_fin; } mpext->data_len = mp_opt->data_len; mpext->use_map = 1; } - - mpext->data_fin = mp_opt->data_fin; } void mptcp_write_options(__be32 *ptr, struct mptcp_out_options *opts) |