Commit 72da3bc0 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: (22 commits)
  netlink: bug fix: wrong size was calculated for vfinfo list blob
  netlink: bug fix: don't overrun skbs on vf_port dump
  xt_tee: use skb_dst_drop()
  netdev/fec: fix ifconfig eth0 down hang issue
  cnic: Fix context memory init. on 5709.
  drivers/net: Eliminate a NULL pointer dereference
  drivers/net/hamradio: Eliminate a NULL pointer dereference
  be2net: Patch removes redundant while statement in loop.
  ipv6: Add GSO support on forwarding path
  net: fix __neigh_event_send()
  vhost: fix the memory leak which will happen when memory_access_ok fails
  vhost-net: fix to check the return value of copy_to/from_user() correctly
  vhost: fix to check the return value of copy_to/from_user() correctly
  vhost: Fix host panic if ioctl called with wrong index
  net: fix lock_sock_bh/unlock_sock_bh
  net/iucv: Add missing spin_unlock
  net: ll_temac: fix checksum offload logic
  net: ll_temac: fix interrupt bug when interrupt 0 is used
  sctp: dubious bitfields in sctp_transport
  ipmr: off by one in __ipmr_fill_mroute()
  ...
parents 8507bb00 045de01a

drivers/net/3c507.c

+1 −2
Original line number Diff line number Diff line
@@ -551,8 +551,7 @@ static irqreturn_t el16_interrupt(int irq, void *dev_id) 
	void __iomem *shmem;



	if (dev == NULL) {

		pr_err("%s: net_interrupt(): irq %d for unknown device.\n",

			dev->name, irq);

		pr_err("net_interrupt(): irq %d for unknown device.\n", irq);

		return IRQ_NONE;

	}

drivers/net/benet/be_cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ int be_cmd_POST(struct be_adapter *adapter) 
		} else {

			return 0;

		}

	} while (timeout < 20);

	} while (timeout < 40);



	dev_err(&adapter->pdev->dev, "POST timeout; stage=0x%x\n", stage);

	return -1;

drivers/net/benet/be_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ static int be_setup(struct be_adapter *adapter) 
				goto if_destroy;

			}

			vf++;

		} while (vf < num_vfs);

		}

	} else if (!be_physfn(adapter)) {

		status = be_cmd_mac_addr_query(adapter, mac,

			MAC_ADDRESS_TYPE_NETWORK, false, adapter->if_handle);

drivers/net/cnic.c

+3 −7
Original line number Diff line number Diff line
@@ -3367,13 +3367,9 @@ static int cnic_cm_shutdown(struct cnic_dev *dev) 


static void cnic_init_context(struct cnic_dev *dev, u32 cid)

{

	struct cnic_local *cp = dev->cnic_priv;

	u32 cid_addr;

	int i;



	if (CHIP_NUM(cp) == CHIP_NUM_5709)

		return;



	cid_addr = GET_CID_ADDR(cid);



	for (i = 0; i < CTX_SIZE; i += 4)
@@ -3530,14 +3526,11 @@ static void cnic_init_bnx2_tx_ring(struct cnic_dev *dev) 


	sb_id = cp->status_blk_num;

	tx_cid = 20;

	cnic_init_context(dev, tx_cid);

	cnic_init_context(dev, tx_cid + 1);

	cp->tx_cons_ptr = &s_blk->status_tx_quick_consumer_index2;

	if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) {

		struct status_block_msix *sblk = cp->status_blk.bnx2;



		tx_cid = TX_TSS_CID + sb_id - 1;

		cnic_init_context(dev, tx_cid);

		CNIC_WR(dev, BNX2_TSCH_TSS_CFG, (sb_id << 24) |

			(TX_TSS_CID << 7));

		cp->tx_cons_ptr = &sblk->status_tx_quick_consumer_index;
@@ -3556,6 +3549,9 @@ static void cnic_init_bnx2_tx_ring(struct cnic_dev *dev) 
		offset2 = BNX2_L2CTX_TBDR_BHADDR_HI_XI;

		offset3 = BNX2_L2CTX_TBDR_BHADDR_LO_XI;

	} else {

		cnic_init_context(dev, tx_cid);

		cnic_init_context(dev, tx_cid + 1);



		offset0 = BNX2_L2CTX_TYPE;

		offset1 = BNX2_L2CTX_CMD_TYPE;

		offset2 = BNX2_L2CTX_TBDR_BHADDR_HI;

drivers/net/cnic_if.h

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
#ifndef CNIC_IF_H

#define CNIC_IF_H



#define CNIC_MODULE_VERSION	"2.1.1"

#define CNIC_MODULE_RELDATE	"Feb 22, 2010"

#define CNIC_MODULE_VERSION	"2.1.2"

#define CNIC_MODULE_RELDATE	"May 26, 2010"



#define CNIC_ULP_RDMA		0

#define CNIC_ULP_ISCSI		1

CRA Git | Maintained and supported by SUSTech CRA and CCSE