MEDIUM: stream-int: use si_rx_shut_blk() to indicate the SI is closed
Till now we were using si_done_put() upon shutr, but these flags could
be reset upon next activity. Now let's switch to SI_FL_RXBLK_SHUT which
doesn't go away. It's also set in stream_int_update() in case a shutr
condition is detected.
The now unused si_done_put() was removed.
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index c726f87..e7293d7 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -266,13 +266,6 @@
si->flags &= ~SI_FL_RX_WAIT_EP;
}
-/* Report that a stream interface won't put any more data into the input buffer */
-static inline void si_done_put(struct stream_interface *si)
-{
- si->flags &= ~SI_FL_RXBLK_ROOM;
- si->flags |= SI_FL_RX_WAIT_EP;
-}
-
/* The stream interface announces it is ready to try to deliver more data to the input buffer */
static inline void si_rx_endp_more(struct stream_interface *si)
{
@@ -301,6 +294,15 @@
si->flags |= SI_FL_RXBLK_BUFF;
}
+/* The stream interface announces it will never put new data into the input
+ * buffer and that it's not waiting for its endpoint to deliver anything else.
+ * This function obviously doesn't have a _rdy equivalent.
+ */
+static inline void si_rx_shut_blk(struct stream_interface *si)
+{
+ si->flags |= SI_FL_RXBLK_SHUT;
+}
+
/* Returns non-zero if the stream interface's Rx path is blocked */
static inline int si_tx_blocked(const struct stream_interface *si)
{