Merge branch 'net-simple-kerneldoc-fixes' (e1d82f7a) · Commits · 戴 / test

net/9p/client.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -811,7 +811,7 @@ reterr:
		* @uodata: source for zero copy write
		* @inlen: read buffer size
		* @olen: write buffer size
		* @hdrlen: reader header size, This is the size of response protocol data
		* @in_hdrlen: reader header size, This is the size of response protocol data
		* @fmt: protocol format string (see protocol.c)
		*
		* Returns request structure (which client must free using p9_tag_remove)

+4 −3

Original line number	Diff line number	Diff line
		@@ -94,14 +94,15 @@ struct p9_trans_rdma {
		struct completion cm_done;
		};

		struct p9_rdma_req;

		/**
		* p9_rdma_context - Keeps track of in-process WR
		* struct p9_rdma_context - Keeps track of in-process WR
		*
		* @busa: Bus address to unmap when the WR completes
		* @req: Keeps track of requests (send)
		* @rc: Keepts track of replies (receive)
		*/
		struct p9_rdma_req;
		struct p9_rdma_context {
		struct ib_cqe cqe;
		dma_addr_t busa;
		@@ -112,7 +113,7 @@ struct p9_rdma_context {
		};

		/**
		* p9_rdma_opts - Collection of mount options
		* struct p9_rdma_opts - Collection of mount options
		* @port: port of connection
		* @sq_depth: The requested depth of the SQ. This really doesn't need
		* to be any deeper than the number of threads used in the client

+2 −0

Original line number	Diff line number	Diff line
		@@ -410,6 +410,7 @@ static struct hlist_head can_rcv_list_find(canid_t can_id, canid_t *mask,

		/**
		* can_rx_register - subscribe CAN frames from a specific interface
		* @net: the applicable net namespace
		* @dev: pointer to netdevice (NULL => subcribe from 'all' CAN devices list)
		* @can_id: CAN identifier (see description)
		* @mask: CAN mask (see description)
		@@ -498,6 +499,7 @@ static void can_rx_delete_receiver(struct rcu_head *rp)

		/**
		* can_rx_unregister - unsubscribe CAN frames from a specific interface
		* @net: the applicable net namespace
		* @dev: pointer to netdevice (NULL => unsubscribe from 'all' CAN devices list)
		* @can_id: CAN identifier
		* @mask: CAN mask

+1 −0

Original line number	Diff line number	Diff line
		@@ -7908,6 +7908,7 @@ EXPORT_SYMBOL(netdev_bonding_info_change);

		/**
		* netdev_get_xmit_slave - Get the xmit slave of master device
		* @dev: device
		* @skb: The packet
		* @all_slaves: assume all the slaves are active
		*

+2 −0

Original line number	Diff line number	Diff line
		@@ -365,6 +365,7 @@ void tfrc_rx_hist_purge(struct tfrc_rx_hist *h)

		/**
		* tfrc_rx_hist_rtt_last_s - reference entry to compute RTT samples against
		* @h: The non-empty RX history object
		*/
		static inline struct tfrc_rx_hist_entry *
		tfrc_rx_hist_rtt_last_s(const struct tfrc_rx_hist *h)
		@@ -374,6 +375,7 @@ static inline struct tfrc_rx_hist_entry *

		/**
		* tfrc_rx_hist_rtt_prev_s - previously suitable (wrt rtt_last_s) RTT-sampling entry
		* @h: The non-empty RX history object
		*/
		static inline struct tfrc_rx_hist_entry *
		tfrc_rx_hist_rtt_prev_s(const struct tfrc_rx_hist *h)