Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 1cf5bb5b73c4..e52b2128e43b 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -547,7 +547,7 @@ static void sctp_do_8_2_transport_strike(struct sctp_cmd_seq *commands,
         if (net->sctp.pf_enable &&
            (transport->state == SCTP_ACTIVE) &&
            (transport->error_count < transport->pathmaxrxt) &&
-           (transport->error_count > asoc->pf_retrans)) {
+           (transport->error_count > transport->pf_retrans)) {
 
                 sctp_assoc_control_transport(asoc, transport,
                                              SCTP_TRANSPORT_PF,