Merge in the fixes we had queued in case there was another -rc.
Showing the changes to include (2 of 19 files). Show all
Unified · Split
| @@ -287,6 +287,7 @@ enum flow_dissector_key_id { · 286 unmodified lines | |||
| 287 | #define FLOW_DISSECTOR_F_PARSE_1ST_FRAG BIT(0) | 287 | #define FLOW_DISSECTOR_F_PARSE_1ST_FRAG BIT(0) |
| 288 | #define FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL BIT(1) | 288 | #define FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL BIT(1) |
| 289 | #define FLOW_DISSECTOR_F_STOP_AT_ENCAP BIT(2) | 289 | #define FLOW_DISSECTOR_F_STOP_AT_ENCAP BIT(2) |
| 290 | #define FLOW_DISSECTOR_F_STOP_BEFORE_ENCAP BIT(3) | ||
| 290 | 291 | ||
| 291 | struct flow_dissector_key { | 292 | struct flow_dissector_key { |
| 292 | enum flow_dissector_key_id key_id; | 293 | enum flow_dissector_key_id key_id; |
| @@ -626,7 +626,8 @@ static inline __u32 sctp_min_frag_point(struct sctp_sock *sp, __u16 datasize) · 625 unmodified lines | |||
| 626 | 626 | ||
| 627 | static inline int sctp_transport_pl_hlen(struct sctp_transport *t) | 627 | static inline int sctp_transport_pl_hlen(struct sctp_transport *t) |
| 628 | { | 628 | { |
| 629 | return __sctp_mtu_payload(sctp_sk(t->asoc->base.sk), t, 0, 0); | 629 | return __sctp_mtu_payload(sctp_sk(t->asoc->base.sk), t, 0, 0) - |
| 630 | sizeof(struct sctphdr); | ||
| 630 | } | 631 | } |
| 631 | 632 | ||
| 632 | static inline void sctp_transport_pl_reset(struct sctp_transport *t) | 633 | static inline void sctp_transport_pl_reset(struct sctp_transport *t) |
| @@ -653,12 +654,10 @@ static inline void sctp_transport_pl_update(struct sctp_transport *t) · 20 unmodified lines | |||
| 653 | if (t->pl.state == SCTP_PL_DISABLED) | 654 | if (t->pl.state == SCTP_PL_DISABLED) |
| 654 | return; | 655 | return; |
| 655 | 656 | ||
| 656 | if (del_timer(&t->probe_timer)) | ||
| 657 | sctp_transport_put(t); | ||
| 658 | |||
| 659 | t->pl.state = SCTP_PL_BASE; | 657 | t->pl.state = SCTP_PL_BASE; |
| 660 | t->pl.pmtu = SCTP_BASE_PLPMTU; | 658 | t->pl.pmtu = SCTP_BASE_PLPMTU; |
| 661 | t->pl.probe_size = SCTP_BASE_PLPMTU; | 659 | t->pl.probe_size = SCTP_BASE_PLPMTU; |
| 660 | sctp_transport_reset_probe_timer(t); | ||
| 662 | } | 661 | } |
| 663 | 662 | ||
| 664 | static inline bool sctp_transport_pl_enabled(struct sctp_transport *t) | 663 | static inline bool sctp_transport_pl_enabled(struct sctp_transport *t) |