Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (04488734) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/networking/ip-sysctl.txt

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1126,10 +1126,10 @@ regen_max_retry - INTEGER
	Default: 5		Default: 5

	max_addresses - INTEGER		max_addresses - INTEGER
	Number of maximum addresses per interface. 0 disables limitation.		Maximum number of autoconfigured addresses per interface. Setting
	It is recommended not set too large value (or 0) because it would		to zero disables the limitation. It is not recommended to set this
	be too easy way to crash kernel to allow to create too much of		value too large (or to zero) because it would be an easy way to
	autoconfigured addresses.		crash the kernel by allowing too many addresses to be created.
	Default: 16		Default: 16

	disable_ipv6 - BOOLEAN		disable_ipv6 - BOOLEAN

MAINTAINERS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3495,9 +3495,9 @@ S: Maintained
	F: drivers/net/wireless/libertas/		F: drivers/net/wireless/libertas/

	MARVELL MV643XX ETHERNET DRIVER		MARVELL MV643XX ETHERNET DRIVER
	M: Lennert Buytenhek <buytenh@marvell.com>		M: Lennert Buytenhek <buytenh@wantstofly.org>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Supported		S: Maintained
	F: drivers/net/mv643xx_eth.*		F: drivers/net/mv643xx_eth.*
	F: include/linux/mv643xx.h		F: include/linux/mv643xx.h

drivers/net/e1000/e1000_main.c

+18 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4005,11 +4005,21 @@ e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
	}		}
	}		}

	if (!buffer_info->dma)		if (!buffer_info->dma) {
	buffer_info->dma = pci_map_page(pdev,		buffer_info->dma = pci_map_page(pdev,
	buffer_info->page, 0,		buffer_info->page, 0,
	buffer_info->length,		buffer_info->length,
	PCI_DMA_FROMDEVICE);		PCI_DMA_FROMDEVICE);
			if (pci_dma_mapping_error(pdev, buffer_info->dma)) {
			put_page(buffer_info->page);
			dev_kfree_skb(skb);
			buffer_info->page = NULL;
			buffer_info->skb = NULL;
			buffer_info->dma = 0;
			adapter->alloc_rx_buff_failed++;
			break; /* while !buffer_info->skb */
			}
			}

	rx_desc = E1000_RX_DESC(*rx_ring, i);		rx_desc = E1000_RX_DESC(*rx_ring, i);
	rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);		rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
	@@ -4100,6 +4110,13 @@ static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
	skb->data,		skb->data,
	buffer_info->length,		buffer_info->length,
	PCI_DMA_FROMDEVICE);		PCI_DMA_FROMDEVICE);
			if (pci_dma_mapping_error(pdev, buffer_info->dma)) {
			dev_kfree_skb(skb);
			buffer_info->skb = NULL;
			buffer_info->dma = 0;
			adapter->alloc_rx_buff_failed++;
			break; /* while !buffer_info->skb */
			}

	/*		/*
	* XXX if it was allocated cleanly it will never map to a		* XXX if it was allocated cleanly it will never map to a

drivers/net/sfc/falcon_boards.c

+27 −18

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,15 @@
	#define FALCON_BOARD_SFN4111T 0x51		#define FALCON_BOARD_SFN4111T 0x51
	#define FALCON_BOARD_SFN4112F 0x52		#define FALCON_BOARD_SFN4112F 0x52

			/* Board temperature is about 15°C above ambient when air flow is
			* limited. */
			#define FALCON_BOARD_TEMP_BIAS 15

			/* SFC4000 datasheet says: 'The maximum permitted junction temperature
			* is 125°C; the thermal design of the environment for the SFC4000
			* should aim to keep this well below 100°C.' */
			#define FALCON_JUNC_TEMP_MAX 90

	/*****************************************************************************		/*****************************************************************************
	* Support for LM87 sensor chip used on several boards		* Support for LM87 sensor chip used on several boards
	*/		*/
	@@ -548,16 +557,16 @@ static int sfn4111t_init(struct efx_nic *efx)
	static u8 sfe4002_lm87_channel = 0x03; /* use AIN not FAN inputs */		static u8 sfe4002_lm87_channel = 0x03; /* use AIN not FAN inputs */

	static const u8 sfe4002_lm87_regs[] = {		static const u8 sfe4002_lm87_regs[] = {
	LM87_IN_LIMITS(0, 0x83, 0x91), /* 2.5V: 1.8V +/- 5% */		LM87_IN_LIMITS(0, 0x7c, 0x99), /* 2.5V: 1.8V +/- 10% */
	LM87_IN_LIMITS(1, 0x51, 0x5a), /* Vccp1: 1.2V +/- 5% */		LM87_IN_LIMITS(1, 0x4c, 0x5e), /* Vccp1: 1.2V +/- 10% */
	LM87_IN_LIMITS(2, 0xb6, 0xca), /* 3.3V: 3.3V +/- 5% */		LM87_IN_LIMITS(2, 0xac, 0xd4), /* 3.3V: 3.3V +/- 10% */
	LM87_IN_LIMITS(3, 0xb0, 0xc9), /* 5V: 4.6-5.2V */		LM87_IN_LIMITS(3, 0xac, 0xd4), /* 5V: 5.0V +/- 10% */
	LM87_IN_LIMITS(4, 0xb0, 0xe0), /* 12V: 11-14V */		LM87_IN_LIMITS(4, 0xac, 0xe0), /* 12V: 10.8-14V */
	LM87_IN_LIMITS(5, 0x44, 0x4b), /* Vccp2: 1.0V +/- 5% */		LM87_IN_LIMITS(5, 0x3f, 0x4f), /* Vccp2: 1.0V +/- 10% */
	LM87_AIN_LIMITS(0, 0xa0, 0xb2), /* AIN1: 1.66V +/- 5% */		LM87_AIN_LIMITS(0, 0x98, 0xbb), /* AIN1: 1.66V +/- 10% */
	LM87_AIN_LIMITS(1, 0x91, 0xa1), /* AIN2: 1.5V +/- 5% */		LM87_AIN_LIMITS(1, 0x8a, 0xa9), /* AIN2: 1.5V +/- 10% */
	LM87_TEMP_INT_LIMITS(10, 60), /* board */		LM87_TEMP_INT_LIMITS(0, 80 + FALCON_BOARD_TEMP_BIAS),
	LM87_TEMP_EXT1_LIMITS(10, 70), /* Falcon */		LM87_TEMP_EXT1_LIMITS(0, FALCON_JUNC_TEMP_MAX),
	0		0
	};		};

	@@ -619,14 +628,14 @@ static int sfe4002_init(struct efx_nic *efx)
	static u8 sfn4112f_lm87_channel = 0x03; /* use AIN not FAN inputs */		static u8 sfn4112f_lm87_channel = 0x03; /* use AIN not FAN inputs */

	static const u8 sfn4112f_lm87_regs[] = {		static const u8 sfn4112f_lm87_regs[] = {
	LM87_IN_LIMITS(0, 0x83, 0x91), /* 2.5V: 1.8V +/- 5% */		LM87_IN_LIMITS(0, 0x7c, 0x99), /* 2.5V: 1.8V +/- 10% */
	LM87_IN_LIMITS(1, 0x51, 0x5a), /* Vccp1: 1.2V +/- 5% */		LM87_IN_LIMITS(1, 0x4c, 0x5e), /* Vccp1: 1.2V +/- 10% */
	LM87_IN_LIMITS(2, 0xb6, 0xca), /* 3.3V: 3.3V +/- 5% */		LM87_IN_LIMITS(2, 0xac, 0xd4), /* 3.3V: 3.3V +/- 10% */
	LM87_IN_LIMITS(4, 0xb0, 0xe0), /* 12V: 11-14V */		LM87_IN_LIMITS(4, 0xac, 0xe0), /* 12V: 10.8-14V */
	LM87_IN_LIMITS(5, 0x44, 0x4b), /* Vccp2: 1.0V +/- 5% */		LM87_IN_LIMITS(5, 0x3f, 0x4f), /* Vccp2: 1.0V +/- 10% */
	LM87_AIN_LIMITS(1, 0x91, 0xa1), /* AIN2: 1.5V +/- 5% */		LM87_AIN_LIMITS(1, 0x8a, 0xa9), /* AIN2: 1.5V +/- 10% */
	LM87_TEMP_INT_LIMITS(10, 60), /* board */		LM87_TEMP_INT_LIMITS(0, 60 + FALCON_BOARD_TEMP_BIAS),
	LM87_TEMP_EXT1_LIMITS(10, 70), /* Falcon */		LM87_TEMP_EXT1_LIMITS(0, FALCON_JUNC_TEMP_MAX),
	0		0
	};		};

drivers/net/sfc/mcdi.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -127,7 +127,7 @@ static int efx_mcdi_poll(struct efx_nic *efx)
	efx_dword_t reg;		efx_dword_t reg;

	/* Check for a reboot atomically with respect to efx_mcdi_copyout() */		/* Check for a reboot atomically with respect to efx_mcdi_copyout() */
	rc = efx_mcdi_poll_reboot(efx);		rc = -efx_mcdi_poll_reboot(efx);
	if (rc)		if (rc)
	goto out;		goto out;