Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	drivers/net/benet/be_cmds.h
	include/linux/sysctl.h
parents bdbec4b8 fa15e99b

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/3c507.c

+2 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ static const char version[] = 
#include <linux/errno.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/if_ether.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/init.h>
@@ -734,8 +735,7 @@ static void init_82586_mem(struct net_device *dev) 
	memcpy_toio(lp->base, init_words + 5, sizeof(init_words) - 10);



	/* Fill in the station address. */

	memcpy_toio(lp->base+SA_OFFSET, dev->dev_addr,

		   sizeof(dev->dev_addr));

	memcpy_toio(lp->base+SA_OFFSET, dev->dev_addr, ETH_ALEN);



	/* The Tx-block list is written as needed.  We just set up the values. */

	lp->tx_cmd_link = IDLELOOP + 4;

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/benet/be.h

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ struct be_adapter { 
	u32 tx_fc;		/* Tx flow control */

	int link_speed;

	u8 port_type;

	u8 transceiver;

};



extern const struct ethtool_ops be_ethtool_ops;