Commit 597d8c71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
  sky2: Fix oops in sky2_xmit_frame() after TX timeout
  Documentation/3c509: document ethtool support
  af_packet: Don't use skb after dev_queue_xmit()
  vxge: use pci_dma_mapping_error to test return value
  netfilter: ebtables: enforce CAP_NET_ADMIN
  e1000e: fix and commonize code for setting the receive address registers
  e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value
  e1000e: perform 10/100 adaptive IFS only on parts that support it
  e1000e: don't accumulate PHY statistics on PHY read failure
  e1000e: call pci_save_state() after pci_restore_state()
  netxen: update version to 4.0.72
  netxen: fix set mac addr
  netxen: fix smatch warning
  netxen: fix tx ring memory leak
  tcp: update the netstamp_needed counter when cloning sockets
  TI DaVinci EMAC: Handle emac module clock correctly.
  dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
  ixgbe: Fix compiler warning about variable being used uninitialized
  netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()
  mv643xx_eth: don't include cache padding in rx desc buffer size
  ...

Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c
parents 682137f7 9db2f1be

Documentation/networking/3c509.txt

+8 −4
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ for LILO parameters for doing this: 
This configures the first found 3c509 card for IRQ 10, base I/O 0x310, and

transceiver type 3 (10base2). The flag "0x3c509" must be set to avoid conflicts

with other card types when overriding the I/O address. When the driver is

loaded as a module, only the IRQ and transceiver setting may be overridden.

For example, setting two cards to 10base2/IRQ10 and AUI/IRQ11 is done by using

the xcvr and irq module options:

loaded as a module, only the IRQ may be overridden. For example,

setting two cards to IRQ10 and IRQ11 is done by using the irq module

option:



   options 3c509 xcvr=3,1 irq=10,11

   options 3c509 irq=10,11





(2) Full-duplex mode
@@ -78,6 +78,8 @@ itself full-duplex capable. This is almost certainly one of two things: a full- 
duplex-capable  Ethernet switch (*not* a hub), or a full-duplex-capable NIC on

another system that's connected directly to the 3c509B via a crossover cable.



Full-duplex mode can be enabled using 'ethtool'.

 

/////Extremely important caution concerning full-duplex mode/////

Understand that the 3c509B's hardware's full-duplex support is much more

limited than that provide by more modern network interface cards. Although
@@ -114,6 +116,8 @@ never automatically enable full-duplex mode in an existing installation; 
it must always be explicitly enabled via one of these code in order to be

activated.



The transceiver type can be changed using 'ethtool'.

  



(4a) Interpretation of error messages and common problems

drivers/isdn/hardware/mISDN/hfcmulti.c

+1 −1
Original line number Diff line number Diff line
@@ -3152,7 +3152,7 @@ static void 
hfcmulti_pcm(struct hfc_multi *hc, int ch, int slot_tx, int bank_tx,

    int slot_rx, int bank_rx)

{

	if (slot_rx < 0 || slot_rx < 0 || bank_tx < 0 || bank_rx < 0) {

	if (slot_tx < 0 || slot_rx < 0 || bank_tx < 0 || bank_rx < 0) {

		/* disable PCM */

		mode_hfcmulti(hc, ch, hc->chan[ch].protocol, -1, 0, -1, 0);

		return;

drivers/net/atarilance.c

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ static int lance_open( struct net_device *dev ) 
	while (--i > 0)

		if (DREG & CSR0_IDON)

			break;

	if (i < 0 || (DREG & CSR0_ERR)) {

	if (i <= 0 || (DREG & CSR0_ERR)) {

		DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n",

					  dev->name, i, DREG ));

		DREG = CSR0_STOP;

drivers/net/atlx/atl2.c

+5 −2
Original line number Diff line number Diff line
@@ -1959,12 +1959,15 @@ static int atl2_get_eeprom(struct net_device *netdev, 
		return -ENOMEM;



	for (i = first_dword; i < last_dword; i++) {

		if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword])))

			return -EIO;

		if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword]))) {

			ret_val = -EIO;

			goto free;

		}

	}



	memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 3),

		eeprom->len);

free:

	kfree(eeprom_buff);



	return ret_val;

drivers/net/can/mcp251x.c

+1 −1
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi) 
			goto error_tx_buf;

		}

		priv->spi_rx_buf = kmalloc(SPI_TRANSFER_BUF_LEN, GFP_KERNEL);

		if (!priv->spi_tx_buf) {

		if (!priv->spi_rx_buf) {

			ret = -ENOMEM;

			goto error_rx_buf;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE