Commit 60ca9758 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (42 commits)
  [PATCH] Fix section mismatch in de2104x.c
  [PATCH] sky2: set lower pause threshold to prevent overrun
  [PATCH] sky2: revert pci express extensions
  [PATCH] skge: version 1.9
  [PATCH] skge: better flow control negotiation
  [PATCH] skge: pause mapping for fiber
  [PATCH] skge: fix stuck irq when fiber down
  [PATCH] powerpc/cell spidernet release all descrs
  [PATCH] powerpc/cell spidernet DMA direction fix
  [PATCH] powerpc/cell spidernet variable name change
  [PATCH] powerpc/cell spidernet reduce DMA kicking
  [PATCH] powerpc/cell spidernet
  [PATCH] powerpc/cell spidernet refine locking
  [PATCH] powerpc/cell spidernet NAPI polling info.
  [PATCH] powerpc/cell spidernet low watermark patch.
  [PATCH] powerpc/cell spidernet incorrect offset
  [PATCH] powerpc/cell spidernet stop error printing patch.
  [PATCH] powerpc/cell spidernet fix error interrupt print
  [PATCH] powerpc/cell spidernet bogus rx interrupt bit
  [PATCH] Spidernet stop queue when queue is full.
  ...
parents f061c584 4a1d2d81

drivers/net/b44.c

+5 −4
Original line number Diff line number Diff line
@@ -1706,14 +1706,15 @@ static void __b44_set_rx_mode(struct net_device *dev) 


		__b44_set_mac_addr(bp);



		if (dev->flags & IFF_ALLMULTI)

		if ((dev->flags & IFF_ALLMULTI) ||

		    (dev->mc_count > B44_MCAST_TABLE_SIZE))

			val |= RXCONFIG_ALLMULTI;

		else

			i = __b44_load_mcast(bp, dev);



		for (; i < 64; i++) {

		for (; i < 64; i++)

			__b44_cam_write(bp, zero, i);

		}



		bw32(bp, B44_RXCONFIG, val);

        	val = br32(bp, B44_CAM_CTRL);

	        bw32(bp, B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
@@ -2055,7 +2056,7 @@ static int b44_read_eeprom(struct b44 *bp, u8 *data) 
	u16 *ptr = (u16 *) data;



	for (i = 0; i < 128; i += 2)

		ptr[i / 2] = readw(bp->regs + 4096 + i);

		ptr[i / 2] = cpu_to_le16(readw(bp->regs + 4096 + i));



	return 0;

}

drivers/net/bonding/bond_alb.c

+2 −2
Original line number Diff line number Diff line
@@ -1433,7 +1433,7 @@ void bond_alb_monitor(struct bonding *bond) 
		 * write lock to protect from other code that also

		 * sets the promiscuity.

		 */

		write_lock(&bond->curr_slave_lock);

		write_lock_bh(&bond->curr_slave_lock);



		if (bond_info->primary_is_promisc &&

		    (++bond_info->rlb_promisc_timeout_counter >= RLB_PROMISC_TIMEOUT)) {
@@ -1448,7 +1448,7 @@ void bond_alb_monitor(struct bonding *bond) 
			bond_info->primary_is_promisc = 0;

		}



		write_unlock(&bond->curr_slave_lock);

		write_unlock_bh(&bond->curr_slave_lock);



		if (bond_info->rlb_rebalance) {

			bond_info->rlb_rebalance = 0;

drivers/net/ehea/ehea.h

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



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0028"

#define DRV_VERSION	"EHEA_0034"



#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \

	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
@@ -50,6 +50,7 @@ 
#define EHEA_MAX_ENTRIES_SQ  32767

#define EHEA_MIN_ENTRIES_QP  127



#define EHEA_SMALL_QUEUES

#define EHEA_NUM_TX_QP 1



#ifdef EHEA_SMALL_QUEUES
@@ -59,11 +60,11 @@ 
#define EHEA_DEF_ENTRIES_RQ2    1023

#define EHEA_DEF_ENTRIES_RQ3    1023

#else

#define EHEA_MAX_CQE_COUNT     32000

#define EHEA_DEF_ENTRIES_SQ    16000

#define EHEA_DEF_ENTRIES_RQ1   32080

#define EHEA_DEF_ENTRIES_RQ2    4020

#define EHEA_DEF_ENTRIES_RQ3    4020

#define EHEA_MAX_CQE_COUNT      4080

#define EHEA_DEF_ENTRIES_SQ     4080

#define EHEA_DEF_ENTRIES_RQ1    8160

#define EHEA_DEF_ENTRIES_RQ2    2040

#define EHEA_DEF_ENTRIES_RQ3    2040

#endif



#define EHEA_MAX_ENTRIES_EQ 20

drivers/net/ehea/ehea_main.c

+3 −3
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe) 
		if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) {

			if (!netif_carrier_ok(port->netdev)) {

				ret = ehea_sense_port_attr(

					adapter->port[portnum]);

					port);

				if (ret) {

					ehea_error("failed resensing port "

						   "attributes");
@@ -818,7 +818,7 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe) 
		netif_stop_queue(port->netdev);

		break;

	default:

		ehea_error("unknown event code %x", ec);

		ehea_error("unknown event code %x, eqe=0x%lX", ec, eqe);

		break;

	}

}
@@ -1841,7 +1841,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) 


	if (netif_msg_tx_queued(port)) {

		ehea_info("post swqe on QP %d", pr->qp->init_attr.qp_nr);

		ehea_dump(swqe, sizeof(*swqe), "swqe");

		ehea_dump(swqe, 512, "swqe");

	}



	ehea_post_swqe(pr->qp, swqe);

drivers/net/ehea/ehea_phyp.c

+238 −335

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE