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

Commit 6631424f 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: (33 commits)
  r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
  ipv6: Don't drop cache route entry unless timer actually expired.
  tulip: Add missing parens.
  r8169: fix broken register writes
  pcnet_cs: add new id
  bonding: fix broken multicast with round-robin mode
  drivers/net: Fix continuation lines
  e1000: do not modify tx_queue_len on link speed change
  net: ipmr/ip6mr: prevent out-of-bounds vif_table access
  ixgbe: Do not run all Diagnostic offline tests when VFs are active
  igb: use correct bits to identify if managability is enabled
  benet: Fix compile warnnings in drivers/net/benet/be_ethtool.c
  net: Add MSG_WAITFORONE flag to recvmmsg
  e1000e: do not modify tx_queue_len on link speed change
  igbvf: do not modify tx_queue_len on link speed change
  ipv4: Restart rt_intern_hash after emergency rebuild (v2)
  ipv4: Cleanup struct net dereference in rt_intern_hash
  net: fix netlink address dumping in IPv4/IPv6
  tulip: Fix null dereference in uli526x_rx_packet()
  gianfar: fix undo of reserve()
  ...
parents c45140a9 c0cd884a

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3083,6 +3083,7 @@ F: include/scsi/*iscsi* 
ISDN SUBSYSTEM

M:	Karsten Keil <isdn@linux-pingi.de>

L:	isdn4linux@listserv.isdn4linux.de (subscribers-only)

L:	netdev@vger.kernel.org

W:	http://www.isdn4linux.de

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git

S:	Maintained

drivers/net/benet/be_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ be_test_ddr_dma(struct be_adapter *adapter) 
{

	int ret, i;

	struct be_dma_mem ddrdma_cmd;

	u64 pattern[2] = {0x5a5a5a5a5a5a5a5a, 0xa5a5a5a5a5a5a5a5};

	u64 pattern[2] = {0x5a5a5a5a5a5a5a5aULL, 0xa5a5a5a5a5a5a5a5ULL};



	ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test);

	ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size,

drivers/net/bonding/bond_main.c

+32 −8
Original line number Diff line number Diff line
@@ -1235,6 +1235,11 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) 
			write_lock_bh(&bond->curr_slave_lock);

		}

	}



	/* resend IGMP joins since all were sent on curr_active_slave */

	if (bond->params.mode == BOND_MODE_ROUNDROBIN) {

		bond_resend_igmp_join_requests(bond);

	}

}



/**
@@ -4138,15 +4143,33 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev 
	struct bonding *bond = netdev_priv(bond_dev);

	struct slave *slave, *start_at;

	int i, slave_no, res = 1;

	struct iphdr *iph = ip_hdr(skb);



	read_lock(&bond->lock);



	if (!BOND_IS_OK(bond))

		goto out;

	/*

	 * Start with the curr_active_slave that joined the bond as the

	 * default for sending IGMP traffic.  For failover purposes one

	 * needs to maintain some consistency for the interface that will

	 * send the join/membership reports.  The curr_active_slave found

	 * will send all of this type of traffic.

	 */

	if ((iph->protocol == htons(IPPROTO_IGMP)) &&

	    (skb->protocol == htons(ETH_P_IP))) {



		read_lock(&bond->curr_slave_lock);

		slave = bond->curr_active_slave;

		read_unlock(&bond->curr_slave_lock);



		if (!slave)

			goto out;

	} else {

		/*

	 * Concurrent TX may collide on rr_tx_counter; we accept that

	 * as being rare enough not to justify using an atomic op here

		 * Concurrent TX may collide on rr_tx_counter; we accept

		 * that as being rare enough not to justify using an

		 * atomic op here.

		 */

		slave_no = bond->rr_tx_counter++ % bond->slave_cnt;
@@ -4155,6 +4178,7 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev 
			if (slave_no < 0)

				break;

		}

	}



	start_at = slave;

	bond_for_each_slave_from(bond, slave, i, start_at) {

drivers/net/e1000/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ struct e1000_adapter { 
	/* TX */

	struct e1000_tx_ring *tx_ring;      /* One per active queue */

	unsigned int restart_queue;

	unsigned long tx_queue_len;

	u32 txd_cmd;

	u32 tx_int_delay;

	u32 tx_abs_int_delay;

drivers/net/e1000/e1000_main.c

+1 −8
Original line number Diff line number Diff line
@@ -383,8 +383,6 @@ static void e1000_configure(struct e1000_adapter *adapter) 
		adapter->alloc_rx_buf(adapter, ring,

		                      E1000_DESC_UNUSED(ring));

	}



	adapter->tx_queue_len = netdev->tx_queue_len;

}



int e1000_up(struct e1000_adapter *adapter)
@@ -503,7 +501,6 @@ void e1000_down(struct e1000_adapter *adapter) 
	del_timer_sync(&adapter->watchdog_timer);

	del_timer_sync(&adapter->phy_info_timer);



	netdev->tx_queue_len = adapter->tx_queue_len;

	adapter->link_speed = 0;

	adapter->link_duplex = 0;

	netif_carrier_off(netdev);
@@ -2316,19 +2313,15 @@ static void e1000_watchdog(unsigned long data) 
			        E1000_CTRL_RFCE) ? "RX" : ((ctrl &

			        E1000_CTRL_TFCE) ? "TX" : "None" )));



			/* tweak tx_queue_len according to speed/duplex

			 * and adjust the timeout factor */

			netdev->tx_queue_len = adapter->tx_queue_len;

			/* adjust timeout factor according to speed/duplex */

			adapter->tx_timeout_factor = 1;

			switch (adapter->link_speed) {

			case SPEED_10:

				txb2b = false;

				netdev->tx_queue_len = 10;

				adapter->tx_timeout_factor = 16;

				break;

			case SPEED_100:

				txb2b = false;

				netdev->tx_queue_len = 100;

				/* maybe add some timeout factor ? */

				break;

			}