rxrpc: Move some miscellaneous bits out into their own file (8e688d9c) · Commits · e / devices / android_kernel_oneplus_sm7250

include/net/af_rxrpc.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,7 @@
	#ifndef _NET_RXRPC_H		#ifndef _NET_RXRPC_H
	#define _NET_RXRPC_H		#define _NET_RXRPC_H

			#include <linux/skbuff.h>
	#include <linux/rxrpc.h>		#include <linux/rxrpc.h>

	struct rxrpc_call;		struct rxrpc_call;

net/rxrpc/Makefile

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,8 @@ af-rxrpc-y := \
	ar-recvmsg.o \		ar-recvmsg.o \
	ar-security.o \		ar-security.o \
	ar-skbuff.o \		ar-skbuff.o \
	ar-transport.o		ar-transport.o \
			misc.o

	af-rxrpc-$(CONFIG_PROC_FS) += ar-proc.o		af-rxrpc-$(CONFIG_PROC_FS) += ar-proc.o
	af-rxrpc-$(CONFIG_SYSCTL) += sysctl.o		af-rxrpc-$(CONFIG_SYSCTL) += sysctl.o

net/rxrpc/ar-ack.c

+0 −68

Original line number	Original line	Diff line number	Diff line
	@@ -19,74 +19,6 @@
	#include <net/af_rxrpc.h>		#include <net/af_rxrpc.h>
	#include "ar-internal.h"		#include "ar-internal.h"

	/*
	* How long to wait before scheduling ACK generation after seeing a
	* packet with RXRPC_REQUEST_ACK set (in jiffies).
	*/
	unsigned int rxrpc_requested_ack_delay = 1;

	/*
	* How long to wait before scheduling an ACK with subtype DELAY (in jiffies).
	*
	* We use this when we've received new data packets. If those packets aren't
	* all consumed within this time we will send a DELAY ACK if an ACK was not
	* requested to let the sender know it doesn't need to resend.
	*/
	unsigned int rxrpc_soft_ack_delay = 1 * HZ;

	/*
	* How long to wait before scheduling an ACK with subtype IDLE (in jiffies).
	*
	* We use this when we've consumed some previously soft-ACK'd packets when
	* further packets aren't immediately received to decide when to send an IDLE
	* ACK let the other end know that it can free up its Tx buffer space.
	*/
	unsigned int rxrpc_idle_ack_delay = 0.5 * HZ;

	/*
	* Receive window size in packets. This indicates the maximum number of
	* unconsumed received packets we're willing to retain in memory. Once this
	* limit is hit, we should generate an EXCEEDS_WINDOW ACK and discard further
	* packets.
	*/
	unsigned int rxrpc_rx_window_size = 32;

	/*
	* Maximum Rx MTU size. This indicates to the sender the size of jumbo packet
	* made by gluing normal packets together that we're willing to handle.
	*/
	unsigned int rxrpc_rx_mtu = 5692;

	/*
	* The maximum number of fragments in a received jumbo packet that we tell the
	* sender that we're willing to handle.
	*/
	unsigned int rxrpc_rx_jumbo_max = 4;

	static const char *rxrpc_acks(u8 reason)
	{
	static const char *const str[] = {
	"---", "REQ", "DUP", "OOS", "WIN", "MEM", "PNG", "PNR", "DLY",
	"IDL", "-?-"
	};

	if (reason >= ARRAY_SIZE(str))
	reason = ARRAY_SIZE(str) - 1;
	return str[reason];
	}

	static const s8 rxrpc_ack_priority[] = {
	[0] = 0,
	[RXRPC_ACK_DELAY] = 1,
	[RXRPC_ACK_REQUESTED] = 2,
	[RXRPC_ACK_IDLE] = 3,
	[RXRPC_ACK_PING_RESPONSE] = 4,
	[RXRPC_ACK_DUPLICATE] = 5,
	[RXRPC_ACK_OUT_OF_SEQUENCE] = 6,
	[RXRPC_ACK_EXCEEDS_WINDOW] = 7,
	[RXRPC_ACK_NOSPACE] = 8,
	};

	/*		/*
	* propose an ACK be sent		* propose an ACK be sent
	*/		*/

net/rxrpc/ar-input.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -25,12 +25,6 @@
	#include <net/net_namespace.h>		#include <net/net_namespace.h>
	#include "ar-internal.h"		#include "ar-internal.h"

	const char *rxrpc_pkts[] = {
	"?00",
	"DATA", "ACK", "BUSY", "ABORT", "ACKALL", "CHALL", "RESP", "DEBUG",
	"?09", "?10", "?11", "?12", "VERSION", "?14", "?15"
	};

	/*		/*
	* queue a packet for recvmsg to pass to userspace		* queue a packet for recvmsg to pass to userspace
	* - the caller must hold a lock on call->lock		* - the caller must hold a lock on call->lock

net/rxrpc/ar-internal.h

+15 −9

Original line number	Original line	Diff line number	Diff line
	@@ -478,13 +478,6 @@ int rxrpc_reject_call(struct rxrpc_sock *);
	/*		/*
	* ar-ack.c		* ar-ack.c
	*/		*/
	extern unsigned int rxrpc_requested_ack_delay;
	extern unsigned int rxrpc_soft_ack_delay;
	extern unsigned int rxrpc_idle_ack_delay;
	extern unsigned int rxrpc_rx_window_size;
	extern unsigned int rxrpc_rx_mtu;
	extern unsigned int rxrpc_rx_jumbo_max;

	void __rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);		void __rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);
	void rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);		void rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);
	void rxrpc_process_call(struct work_struct *);		void rxrpc_process_call(struct work_struct *);
	@@ -550,8 +543,6 @@ void rxrpc_UDP_error_handler(struct work_struct *);
	/*		/*
	* ar-input.c		* ar-input.c
	*/		*/
	extern const char *rxrpc_pkts[];

	void rxrpc_data_ready(struct sock *);		void rxrpc_data_ready(struct sock *);
	int rxrpc_queue_rcv_skb(struct rxrpc_call , struct sk_buff , bool, bool);		int rxrpc_queue_rcv_skb(struct rxrpc_call , struct sk_buff , bool, bool);
	void rxrpc_fast_process_packet(struct rxrpc_call , struct sk_buff );		void rxrpc_fast_process_packet(struct rxrpc_call , struct sk_buff );
	@@ -636,6 +627,21 @@ void __exit rxrpc_destroy_all_transports(void);
	struct rxrpc_transport rxrpc_find_transport(struct rxrpc_local ,		struct rxrpc_transport rxrpc_find_transport(struct rxrpc_local ,
	struct rxrpc_peer *);		struct rxrpc_peer *);

			/*
			* misc.c
			*/
			extern unsigned int rxrpc_requested_ack_delay;
			extern unsigned int rxrpc_soft_ack_delay;
			extern unsigned int rxrpc_idle_ack_delay;
			extern unsigned int rxrpc_rx_window_size;
			extern unsigned int rxrpc_rx_mtu;
			extern unsigned int rxrpc_rx_jumbo_max;

			extern const char *rxrpc_pkts[];
			extern const s8 rxrpc_ack_priority[];

			extern const char *rxrpc_acks(u8 reason);

	/*		/*
	* sysctl.c		* sysctl.c
	*/		*/