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

Commit dad1e54b 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/pcmcia/smc91c92_cs.c
	drivers/net/virtio_net.c
parents 1253332f 0110d6f2

drivers/net/e1000e/netdev.c

+2 −0
Original line number Diff line number Diff line
@@ -664,6 +664,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) 
				i = 0;

		}



		if (i == tx_ring->next_to_use)

			break;

		eop = tx_ring->buffer_info[i].next_to_watch;

		eop_desc = E1000_TX_DESC(*tx_ring, eop);

	}

drivers/net/forcedeth.c

+1 −1
Original line number Diff line number Diff line
@@ -5901,7 +5901,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 
	/* Limit the number of tx's outstanding for hw bug */

	if (id->driver_data & DEV_NEED_TX_LIMIT) {

		np->tx_limit = 1;

		if ((id->driver_data & DEV_NEED_TX_LIMIT2) &&

		if (((id->driver_data & DEV_NEED_TX_LIMIT2) == DEV_NEED_TX_LIMIT2) &&

		    pci_dev->revision >= 0xA2)

			np->tx_limit = 0;

	}

drivers/net/igb/igb_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -1864,6 +1864,7 @@ static int igb_wol_exclusion(struct igb_adapter *adapter, 
		retval = 0;

		break;

	case E1000_DEV_ID_82576_QUAD_COPPER:

	case E1000_DEV_ID_82576_QUAD_COPPER_ET2:

		/* quad port adapters only support WoL on port A */

		if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) {

			wol->supported = 0;

drivers/net/igb/igb_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1594,6 +1594,7 @@ static int __devinit igb_probe(struct pci_dev *pdev, 
			adapter->eeprom_wol = 0;

		break;

	case E1000_DEV_ID_82576_QUAD_COPPER:

	case E1000_DEV_ID_82576_QUAD_COPPER_ET2:

		/* if quad port adapter, disable WoL on all but port A */

		if (global_quad_port_a != 0)

			adapter->eeprom_wol = 0;

drivers/net/pcmcia/smc91c92_cs.c

+6 −7
Original line number Diff line number Diff line
@@ -1608,9 +1608,12 @@ static void set_rx_mode(struct net_device *dev) 
{

    unsigned int ioaddr = dev->base_addr;

    struct smc_private *smc = netdev_priv(dev);

    u_int multicast_table[ 2 ] = { 0, };

    unsigned char multicast_table[8];

    unsigned long flags;

    u_short rx_cfg_setting;

    int i;



    memset(multicast_table, 0, sizeof(multicast_table));



    if (dev->flags & IFF_PROMISC) {

	rx_cfg_setting = RxStripCRC | RxEnable | RxPromisc | RxAllMulti;
@@ -1622,10 +1625,6 @@ static void set_rx_mode(struct net_device *dev) 


	    netdev_for_each_mc_addr(ha, dev) {

		u_int position = ether_crc(6, ha->addr);

#ifndef final_version		/* Verify multicast address. */

		if ((ha->addr[0] & 1) == 0)

		    continue;

#endif

		multicast_table[position >> 29] |= 1 << ((position >> 26) & 7);

	    }

	}
@@ -1635,8 +1634,8 @@ static void set_rx_mode(struct net_device *dev) 
    /* Load MC table and Rx setting into the chip without interrupts. */

    spin_lock_irqsave(&smc->lock, flags);

    SMC_SELECT_BANK(3);

    outl(multicast_table[0], ioaddr + MULTICAST0);

    outl(multicast_table[1], ioaddr + MULTICAST4);

    for (i = 0; i < 8; i++)

	outb(multicast_table[i], ioaddr + MULTICAST0 + i);

    SMC_SELECT_BANK(0);

    outw(rx_cfg_setting, ioaddr + RCR);

    SMC_SELECT_BANK(2);