diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-10-05 15:08:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-10-05 15:08:57 +0200 |
| commit | 3a9fce327ff9cabf7f89d3f20616a83af28393da (patch) | |
| tree | c516d3e7023e7fe2dc8d4cf60e2ec03f3c9b5958 /net/smc/smc.h | |
| parent | e195a331c4124a6527e5e1b6fbd93a6b4a984d7b (diff) | |
| parent | 394ca81cb4c1518e9463fe342fb1ae8a9f46a82d (diff) | |
Merge branch 'topic/timer-api' into for-next
Diffstat (limited to 'net/smc/smc.h')
| -rw-r--r-- | net/smc/smc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/smc/smc.h b/net/smc/smc.h index 6e44313e4467..0ccd6fa387ad 100644 --- a/net/smc/smc.h +++ b/net/smc/smc.h @@ -149,7 +149,7 @@ struct smc_connection { atomic_t sndbuf_space; /* remaining space in sndbuf */ u16 tx_cdc_seq; /* sequence # for CDC send */ spinlock_t send_lock; /* protect wr_sends */ - struct work_struct tx_work; /* retry of smc_cdc_msg_send */ + struct delayed_work tx_work; /* retry of smc_cdc_msg_send */ struct smc_host_cdc_msg local_rx_ctrl; /* filled during event_handl. * .prod cf. TCP rcv_nxt |