MINOR: stream-int: replace si_cant_put() with si_rx_room_{blk,rdy}()
Remaining calls to si_cant_put() were all for lack of room and were
turned to si_rx_room_blk(). A few places where SI_FL_RXBLK_ROOM was
cleared by hand were converted to si_rx_room_rdy().
The now unused si_cant_put() function was removed.
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index d1c022c..90e3956 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -259,13 +259,6 @@
return !(si->flags & SI_FL_RX_WAIT_EP);
}
-/* Report that a stream interface failed to put some data into the input buffer */
-static inline void si_cant_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)
{
@@ -306,6 +299,22 @@
si->flags |= SI_FL_RXBLK_BUFF;
}
+/* Tell a stream interface some room was made in the input buffer */
+static inline void si_rx_room_rdy(struct stream_interface *si)
+{
+ si->flags &= ~SI_FL_RXBLK_ROOM;
+}
+
+/* The stream interface announces it failed to put data into the input buffer
+ * by lack of room. Since it indicates a willingness to deliver data to the
+ * buffer that will have to be retried, we automatically clear RXBLK_ENDP to
+ * be called again as soon as RXBLK_ROOM is cleared.
+ */
+static inline void si_rx_room_blk(struct stream_interface *si)
+{
+ si->flags |= SI_FL_RXBLK_ROOM;
+}
+
/* 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.