Commit d489ded1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

parents 86dd9868 3af409ca

Documentation/networking/ip-sysctl.rst

+3 −4
Original line number Diff line number Diff line
@@ -651,16 +651,15 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max 


	default: initial size of receive buffer used by TCP sockets.

	This value overrides net.core.rmem_default used by other protocols.

	Default: 87380 bytes. This value results in window of 65535 with

	default setting of tcp_adv_win_scale and tcp_app_win:0 and a bit

	less for default tcp_app_win. See below about these variables.

	Default: 131072 bytes.

	This value results in initial window of 65535.



	max: maximal size of receive buffer allowed for automatically

	selected receiver buffers for TCP socket. This value does not override

	net.core.rmem_max.  Calling setsockopt() with SO_RCVBUF disables

	automatic tuning of that socket's receive buffer size, in which

	case this value is ignored.

	Default: between 87380B and 6MB, depending on RAM size.

	Default: between 131072 and 6MB, depending on RAM size.



tcp_sack - BOOLEAN

	Enable select acknowledgments (SACKS).

Documentation/networking/netdev-FAQ.rst

+16 −0
Original line number Diff line number Diff line
@@ -272,6 +272,22 @@ to the mailing list, e.g.:: 
Posting as one thread is discouraged because it confuses patchwork

(as of patchwork 2.2.2).



Can I reproduce the checks from patchwork on my local machine?

--------------------------------------------------------------



Checks in patchwork are mostly simple wrappers around existing kernel

scripts, the sources are available at:



https://github.com/kuba-moo/nipa/tree/master/tests



Running all the builds and checks locally is a pain, can I post my patches and have the patchwork bot validate them?

--------------------------------------------------------------------------------------------------------------------



No, you must ensure that your patches are ready by testing them locally

before posting to the mailing list. The patchwork build bot instance

gets overloaded very easily and netdev@vger really doesn't need more

traffic if we can help it.



Any other tips to help ensure my net/net-next patch gets OK'd?

--------------------------------------------------------------

Attention to detail.  Re-read your own work as if you were the

drivers/atm/idt77252.c

+1 −10
Original line number Diff line number Diff line
@@ -3743,16 +3743,7 @@ static int __init idt77252_init(void) 
	struct sk_buff *skb;



	printk("%s: at %p\n", __func__, idt77252_init);



	if (sizeof(skb->cb) < sizeof(struct atm_skb_data) +

			      sizeof(struct idt77252_skb_prv)) {

		printk(KERN_ERR "%s: skb->cb is too small (%lu < %lu)\n",

		       __func__, (unsigned long) sizeof(skb->cb),

		       (unsigned long) sizeof(struct atm_skb_data) +

				       sizeof(struct idt77252_skb_prv));

		return -EIO;

	}



	BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct idt77252_skb_prv) + sizeof(struct atm_skb_data));

	return pci_register_driver(&idt77252_driver);

}

drivers/atm/idt77252.h

+1 −1
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ struct idt77252_skb_prv { 
	struct scqe	tbd;	/* Transmit Buffer Descriptor */

	dma_addr_t	paddr;	/* DMA handle */

	u32		pool;	/* sb_pool handle */

};

} __packed;



#define IDT77252_PRV_TBD(skb)	\

	(((struct idt77252_skb_prv *)(ATM_SKB(skb)+1))->tbd)

drivers/net/ethernet/amd/xgbe/xgbe-common.h

+14 −0
Original line number Diff line number Diff line
@@ -1279,10 +1279,18 @@ 
#define MDIO_PMA_10GBR_FECCTRL		0x00ab

#endif



#ifndef MDIO_PMA_RX_CTRL1

#define MDIO_PMA_RX_CTRL1		0x8051

#endif



#ifndef MDIO_PCS_DIG_CTRL

#define MDIO_PCS_DIG_CTRL		0x8000

#endif



#ifndef MDIO_PCS_DIGITAL_STAT

#define MDIO_PCS_DIGITAL_STAT		0x8010

#endif



#ifndef MDIO_AN_XNP

#define MDIO_AN_XNP			0x0016

#endif
@@ -1358,6 +1366,8 @@ 
#define XGBE_KR_TRAINING_ENABLE		BIT(1)



#define XGBE_PCS_CL37_BP		BIT(12)

#define XGBE_PCS_PSEQ_STATE_MASK	0x1c

#define XGBE_PCS_PSEQ_STATE_POWER_GOOD	0x10



#define XGBE_AN_CL37_INT_CMPLT		BIT(0)

#define XGBE_AN_CL37_INT_MASK		0x01
@@ -1375,6 +1385,10 @@ 
#define XGBE_PMA_CDR_TRACK_EN_OFF	0x00

#define XGBE_PMA_CDR_TRACK_EN_ON	0x01



#define XGBE_PMA_RX_RST_0_MASK		BIT(4)

#define XGBE_PMA_RX_RST_0_RESET_ON	0x10

#define XGBE_PMA_RX_RST_0_RESET_OFF	0x00



/* Bit setting and getting macros

 *  The get macro will extract the current bit field value from within

 *  the variable