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

Commit 0519d83d 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

parents 38bfd8f5 b5dd884e

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4303,7 +4303,7 @@ F: drivers/video/aty/aty128fb.c 
RALINK RT2X00 WIRELESS LAN DRIVER

P:	rt2x00 project

L:	linux-wireless@vger.kernel.org

L:	users@rt2x00.serialmonkey.com

L:	users@rt2x00.serialmonkey.com (moderated for non-subscribers)

W:	http://rt2x00.serialmonkey.com/

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git

drivers/net/bnx2.h

+6 −3
Original line number Diff line number Diff line
@@ -361,9 +361,12 @@ struct l2_fhdr { 
#define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_VALUE	 (1<<28)



#define BNX2_L2CTX_HOST_BDIDX				0x00000004

#define BNX2_L2CTX_STATUSB_NUM_SHIFT			 16

#define BNX2_L2CTX_STATUSB_NUM(sb_id)			 \

	(((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_STATUSB_NUM_SHIFT) : 0)

#define BNX2_L2CTX_L5_STATUSB_NUM_SHIFT			 16

#define BNX2_L2CTX_L2_STATUSB_NUM_SHIFT			 24

#define BNX2_L2CTX_L5_STATUSB_NUM(sb_id)		\

	(((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_L5_STATUSB_NUM_SHIFT) : 0)

#define BNX2_L2CTX_L2_STATUSB_NUM(sb_id)		\

	(((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_L2_STATUSB_NUM_SHIFT) : 0)

#define BNX2_L2CTX_HOST_BSEQ				0x00000008

#define BNX2_L2CTX_NX_BSEQ				0x0000000c

#define BNX2_L2CTX_NX_BDHADDR_HI			0x00000010

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ static int bond_check_dev_link(struct bonding *bond, 
			       struct net_device *slave_dev, int reporting)

{

	const struct net_device_ops *slave_ops = slave_dev->netdev_ops;

	static int (*ioctl)(struct net_device *, struct ifreq *, int);

	int (*ioctl)(struct net_device *, struct ifreq *, int);

	struct ifreq ifr;

	struct mii_ioctl_data *mii;

drivers/net/cnic.c

+3 −3
Original line number Diff line number Diff line
@@ -3560,9 +3560,9 @@ static void cnic_init_bnx2_rx_ring(struct cnic_dev *dev) 
	cnic_ctx_wr(dev, cid_addr, BNX2_L2CTX_CTX_TYPE, val);



	if (sb_id == 0)

		val = 2 << BNX2_L2CTX_STATUSB_NUM_SHIFT;

		val = 2 << BNX2_L2CTX_L2_STATUSB_NUM_SHIFT;

	else

		val = BNX2_L2CTX_STATUSB_NUM(sb_id);

		val = BNX2_L2CTX_L2_STATUSB_NUM(sb_id);

	cnic_ctx_wr(dev, cid_addr, BNX2_L2CTX_HOST_BDIDX, val);



	rxbd = (struct rx_bd *) (cp->l2_ring + BCM_PAGE_SIZE);
@@ -3719,7 +3719,7 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev) 
	cp->int_num = 0;

	if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) {

		u32 sb_id = cp->status_blk_num;

		u32 sb = BNX2_L2CTX_STATUSB_NUM(sb_id);

		u32 sb = BNX2_L2CTX_L5_STATUSB_NUM(sb_id);



		cp->int_num = sb_id << BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT;

		cnic_ctx_wr(dev, cp->kwq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);

drivers/net/qlge/qlge.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ enum { 


	/* Misc. stuff */

	MAILBOX_COUNT = 16,

	MAILBOX_TIMEOUT = 5,



	PROC_ADDR_RDY = (1 << 31),

	PROC_ADDR_R = (1 << 30),