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

Commit b1cdc467 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: (63 commits)
  drivers/net/usb/asix.c: Fix pointer cast.
  be2net: Bug fix to avoid disabling bottom half during firmware upgrade.
  proc_dointvec: write a single value
  hso: add support for new products
  Phonet: fix potential use-after-free in pep_sock_close()
  ath9k: remove VEOL support for ad-hoc
  ath9k: change beacon allocation to prefer the first beacon slot
  sock.h: fix kernel-doc warning
  cls_cgroup: Fix build error when built-in
  macvlan: do proper cleanup in macvlan_common_newlink() V2
  be2net: Bug fix in init code in probe
  net/dccp: expansion of error code size
  ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep
  wireless: fix sta_info.h kernel-doc warnings
  wireless: fix mac80211.h kernel-doc warnings
  iwlwifi: testing the wrong variable in iwl_add_bssid_station()
  ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs()
  ath9k_htc: dereferencing before check in hif_usb_tx_cb()
  rt2x00: Fix rt2800usb TX descriptor writing.
  rt2x00: Fix failed SLEEP->AWAKE and AWAKE->SLEEP transitions.
  ...
parents ce7d0226 f925b130

drivers/isdn/capi/kcapi.c

+6 −0
Original line number Diff line number Diff line
@@ -1147,6 +1147,12 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data) 
		if (ctr->state == CAPI_CTR_DETECTED)

			goto reset_unlock_out;



		if (ctr->reset_ctr == NULL) {

			printk(KERN_DEBUG "kcapi: reset: no reset function\n");

			retval = -ESRCH;

			goto reset_unlock_out;

		}



		ctr->reset_ctr(ctr);



		retval = wait_on_ctr_state(ctr, CAPI_CTR_DETECTED);

drivers/isdn/gigaset/capi.c

+2 −26
Original line number Diff line number Diff line
@@ -921,30 +921,6 @@ void gigaset_isdn_stop(struct cardstate *cs) 
 * ============================

 */



/*

 * load firmware

 */

static int gigaset_load_firmware(struct capi_ctr *ctr, capiloaddata *data)

{

	struct cardstate *cs = ctr->driverdata;



	/* AVM specific operation, not needed for Gigaset -- ignore */

	dev_notice(cs->dev, "load_firmware ignored\n");



	return 0;

}



/*

 * reset (deactivate) controller

 */

static void gigaset_reset_ctr(struct capi_ctr *ctr)

{

	struct cardstate *cs = ctr->driverdata;



	/* AVM specific operation, not needed for Gigaset -- ignore */

	dev_notice(cs->dev, "reset_ctr ignored\n");

}



/*

 * register CAPI application

 */
@@ -2202,8 +2178,8 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid) 
	iif->ctr.driverdata    = cs;

	strncpy(iif->ctr.name, isdnid, sizeof(iif->ctr.name));

	iif->ctr.driver_name   = "gigaset";

	iif->ctr.load_firmware = gigaset_load_firmware;

	iif->ctr.reset_ctr     = gigaset_reset_ctr;

	iif->ctr.load_firmware = NULL;

	iif->ctr.reset_ctr     = NULL;

	iif->ctr.register_appl = gigaset_register_appl;

	iif->ctr.release_appl  = gigaset_release_appl;

	iif->ctr.send_message  = gigaset_send_message;

drivers/net/benet/be.h

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ struct be_adapter { 
	u8 port_type;

	u8 transceiver;

	u8 generation;		/* BladeEngine ASIC generation */

	u32 flash_status;

	struct completion flash_compl;



	bool sriov_enabled;

	u32 vf_if_handle[BE_MAX_VF];

drivers/net/benet/be_cmds.c

+17 −2
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ static int be_mcc_compl_process(struct be_adapter *adapter, 


	compl_status = (compl->status >> CQE_STATUS_COMPL_SHIFT) &

				CQE_STATUS_COMPL_MASK;



	if ((compl->tag0 == OPCODE_COMMON_WRITE_FLASHROM) &&

		(compl->tag1 == CMD_SUBSYSTEM_COMMON)) {

		adapter->flash_status = compl_status;

		complete(&adapter->flash_compl);

	}



	if (compl_status == MCC_STATUS_SUCCESS) {

		if (compl->tag0 == OPCODE_ETH_GET_STATISTICS) {

			struct be_cmd_resp_get_stats *resp =
@@ -1417,6 +1424,7 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd, 
	int status;



	spin_lock_bh(&adapter->mcc_lock);

	adapter->flash_status = 0;



	wrb = wrb_from_mccq(adapter);

	if (!wrb) {
@@ -1428,6 +1436,7 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd, 


	be_wrb_hdr_prepare(wrb, cmd->size, false, 1,

			OPCODE_COMMON_WRITE_FLASHROM);

	wrb->tag1 = CMD_SUBSYSTEM_COMMON;



	be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,

		OPCODE_COMMON_WRITE_FLASHROM, cmd->size);
@@ -1439,10 +1448,16 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd, 
	req->params.op_code = cpu_to_le32(flash_opcode);

	req->params.data_buf_size = cpu_to_le32(buf_size);



	status = be_mcc_notify_wait(adapter);

	be_mcc_notify(adapter);

	spin_unlock_bh(&adapter->mcc_lock);



	if (!wait_for_completion_timeout(&adapter->flash_compl,

			msecs_to_jiffies(12000)))

		status = -1;

	else

		status = adapter->flash_status;



err:

	spin_unlock_bh(&adapter->mcc_lock);

	return status;

}

drivers/net/benet/be_main.c

+7 −4
Original line number Diff line number Diff line
@@ -2319,6 +2319,7 @@ static int be_ctrl_init(struct be_adapter *adapter) 
	spin_lock_init(&adapter->mcc_lock);

	spin_lock_init(&adapter->mcc_cq_lock);



	init_completion(&adapter->flash_compl);

	pci_save_state(adapter->pdev);

	return 0;
@@ -2487,10 +2488,6 @@ static int __devinit be_probe(struct pci_dev *pdev, 
		status = be_cmd_POST(adapter);

		if (status)

			goto ctrl_clean;



		status = be_cmd_reset_function(adapter);

		if (status)

			goto ctrl_clean;

	}



	/* tell fw we're ready to fire cmds */
@@ -2498,6 +2495,12 @@ static int __devinit be_probe(struct pci_dev *pdev, 
	if (status)

		goto ctrl_clean;



	if (be_physfn(adapter)) {

		status = be_cmd_reset_function(adapter);

		if (status)

			goto ctrl_clean;

	}



	status = be_stats_init(adapter);

	if (status)

		goto ctrl_clean;