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

Commit 22f6dacd 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:
	include/net/tcp.h
parents 928f308f 9b05126b

drivers/net/bnx2.c

+4 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ 


#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"2.0.0"

#define DRV_MODULE_RELDATE	"April 2, 2009"

#define DRV_MODULE_VERSION	"2.0.1"

#define DRV_MODULE_RELDATE	"May 6, 2009"

#define FW_MIPS_FILE_06		"bnx2/bnx2-mips-06-4.6.16.fw"

#define FW_RV2P_FILE_06		"bnx2/bnx2-rv2p-06-4.6.16.fw"

#define FW_MIPS_FILE_09		"bnx2/bnx2-mips-09-4.6.17.fw"
@@ -2600,6 +2600,7 @@ bnx2_get_hw_tx_cons(struct bnx2_napi *bnapi) 
	/* Tell compiler that status block fields can change. */

	barrier();

	cons = *bnapi->hw_tx_cons_ptr;

	barrier();

	if (unlikely((cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT))

		cons++;

	return cons;
@@ -2879,6 +2880,7 @@ bnx2_get_hw_rx_cons(struct bnx2_napi *bnapi) 
	/* Tell compiler that status block fields can change. */

	barrier();

	cons = *bnapi->hw_rx_cons_ptr;

	barrier();

	if (unlikely((cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT))

		cons++;

	return cons;

drivers/net/bonding/bond_alb.c

+3 −9
Original line number Diff line number Diff line
@@ -1706,10 +1706,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
 * Called with RTNL

 */

int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)

	__releases(&bond->curr_slave_lock)

	__releases(&bond->lock)

	__acquires(&bond->lock)

	__acquires(&bond->curr_slave_lock)

	__releases(&bond->lock)

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct sockaddr *sa = addr;
@@ -1745,9 +1743,6 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) 
		}

	}



	write_unlock_bh(&bond->curr_slave_lock);

	read_unlock(&bond->lock);



	if (swap_slave) {

		alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave);

		alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave);
@@ -1755,16 +1750,15 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) 
		alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr,

				       bond->alb_info.rlb_enabled);



		read_lock(&bond->lock);

		alb_send_learning_packets(bond->curr_active_slave, bond_dev->dev_addr);

		if (bond->alb_info.rlb_enabled) {

			/* inform clients mac address has changed */

			rlb_req_update_slave_clients(bond, bond->curr_active_slave);

		}

		read_unlock(&bond->lock);

	}



	read_lock(&bond->lock);

	write_lock_bh(&bond->curr_slave_lock);



	return 0;

}

drivers/net/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3741,7 +3741,7 @@ static irqreturn_t e1000_intr(int irq, void *data) 
	struct e1000_hw *hw = &adapter->hw;

	u32 rctl, icr = er32(ICR);



	if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags)))

	if (unlikely((!icr) || test_bit(__E1000_DOWN, &adapter->flags)))

		return IRQ_NONE;  /* Not our interrupt */



	/* IMS will not auto-mask if INT_ASSERTED is not set, and if it is

drivers/net/ehea/ehea.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <asm/io.h>



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0100"

#define DRV_VERSION	"EHEA_0101"



/* eHEA capability flags */

#define DLPAR_PORT_ADD_REM 1

drivers/net/ehea/ehea_main.c

+18 −13
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ static inline struct sk_buff *get_skb_by_index(struct sk_buff **skb_array, 
	x &= (arr_len - 1);



	pref = skb_array[x];

	if (pref) {

		prefetchw(pref);

		prefetchw(pref + EHEA_CACHE_LINE);
@@ -553,6 +554,8 @@ static inline struct sk_buff *get_skb_by_index(struct sk_buff **skb_array, 
		prefetch(pref + EHEA_CACHE_LINE);

		prefetch(pref + EHEA_CACHE_LINE * 2);

		prefetch(pref + EHEA_CACHE_LINE * 3);

	}



	skb = skb_array[skb_index];

	skb_array[skb_index] = NULL;

	return skb;
@@ -569,12 +572,14 @@ static inline struct sk_buff *get_skb_by_index_ll(struct sk_buff **skb_array, 
	x &= (arr_len - 1);



	pref = skb_array[x];

	if (pref) {

		prefetchw(pref);

		prefetchw(pref + EHEA_CACHE_LINE);



		pref = (skb_array[x]->data);

		prefetchw(pref);

		prefetchw(pref + EHEA_CACHE_LINE);

	}



	skb = skb_array[wqe_index];

	skb_array[wqe_index] = NULL;