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

Commit c3bf4906 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: (74 commits)
  Revert "b43: Enforce DMA descriptor memory constraints"
  iwmc3200wifi: fix array out-of-boundary access
  wl1251: timeout one too soon in wl1251_boot_run_firmware()
  mac80211: fix propagation of failed hardware reconfigurations
  mac80211: fix race with suspend and dynamic_ps_disable_work
  ath9k: fix missed error codes in the tx status check
  ath9k: wake hardware during AMPDU TX actions
  ath9k: wake hardware for interface IBSS/AP/Mesh removal
  ath9k: fix suspend by waking device prior to stop
  cfg80211: fix error path in cfg80211_wext_siwscan
  wl1271_cmd.c: cleanup char => u8
  iwlwifi: Storage class should be before const qualifier
  ath9k: Storage class should be before const qualifier
  cfg80211: fix race between deauth and assoc response
  wireless: remove remaining qual code
  rt2x00: Add USB ID for Linksys WUSB 600N rev 2.
  ath5k: fix SWI calibration interrupt storm
  mac80211: fix ibss join with fixed-bssid
  libertas: Remove carrier signaling from the scan code
  orinoco: fix GFP_KERNEL in orinoco_set_key with interrupts disabled
  ...
parents f39edadd 7f9d3577

drivers/net/3c507.c

+2 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ static const char version[] = 
#include <linux/errno.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/if_ether.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/init.h>
@@ -734,8 +735,7 @@ static void init_82586_mem(struct net_device *dev) 
	memcpy_toio(lp->base, init_words + 5, sizeof(init_words) - 10);



	/* Fill in the station address. */

	memcpy_toio(lp->base+SA_OFFSET, dev->dev_addr,

		   sizeof(dev->dev_addr));

	memcpy_toio(lp->base+SA_OFFSET, dev->dev_addr, ETH_ALEN);



	/* The Tx-block list is written as needed.  We just set up the values. */

	lp->tx_cmd_link = IDLELOOP + 4;

drivers/net/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -2346,6 +2346,7 @@ config GELIC_NET 


config GELIC_WIRELESS

	bool "PS3 Wireless support"

	depends on WLAN

	depends on GELIC_NET

	select WIRELESS_EXT

	help
@@ -2358,6 +2359,7 @@ config GELIC_WIRELESS 
config GELIC_WIRELESS_OLD_PSK_INTERFACE

       bool "PS3 Wireless private PSK interface (OBSOLETE)"

       depends on GELIC_WIRELESS

       select WEXT_PRIV

       help

          This option retains the obsolete private interface to pass

          the PSK from user space programs to the driver.  The PSK

drivers/net/benet/be.h

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ struct be_adapter { 
	u32 tx_fc;		/* Tx flow control */

	int link_speed;

	u8 port_type;

	u8 transceiver;

};



extern const struct ethtool_ops be_ethtool_ops;

drivers/net/benet/be_cmds.c

+36 −0
Original line number Diff line number Diff line
@@ -1479,6 +1479,41 @@ extern int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac, 
	return status;

}



int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,

			u8 loopback_type, u8 enable)

{

	struct be_mcc_wrb *wrb;

	struct be_cmd_req_set_lmode *req;

	int status;



	spin_lock_bh(&adapter->mcc_lock);



	wrb = wrb_from_mccq(adapter);

	if (!wrb) {

		status = -EBUSY;

		goto err;

	}



	req = embedded_payload(wrb);



	be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,

				OPCODE_LOWLEVEL_SET_LOOPBACK_MODE);



	be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,

			OPCODE_LOWLEVEL_SET_LOOPBACK_MODE,

			sizeof(*req));



	req->src_port = port_num;

	req->dest_port = port_num;

	req->loopback_type = loopback_type;

	req->loopback_state = enable;



	status = be_mcc_notify_wait(adapter);

err:

	spin_unlock_bh(&adapter->mcc_lock);

	return status;

}



int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,

		u32 loopback_type, u32 pkt_size, u32 num_pkts, u64 pattern)

{
@@ -1501,6 +1536,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num, 


	be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,

			OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req));

	req->hdr.timeout = 4;



	req->pattern = cpu_to_le64(pattern);

	req->src_port = cpu_to_le32(port_num);

drivers/net/benet/be_cmds.h

+16 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ struct be_mcc_mailbox { 


#define OPCODE_LOWLEVEL_HOST_DDR_DMA                    17

#define OPCODE_LOWLEVEL_LOOPBACK_TEST                   18

#define OPCODE_LOWLEVEL_SET_LOOPBACK_MODE		19



struct be_cmd_req_hdr {

	u8 opcode;		/* dword 0 */
@@ -821,6 +822,19 @@ struct be_cmd_resp_loopback_test { 
	u32    ticks_compl;

};



struct be_cmd_req_set_lmode {

	struct be_cmd_req_hdr hdr;

	u8 src_port;

	u8 dest_port;

	u8 loopback_type;

	u8 loopback_state;

};



struct be_cmd_resp_set_lmode {

	struct be_cmd_resp_hdr resp_hdr;

	u8 rsvd0[4];

};



/********************** DDR DMA test *********************/

struct be_cmd_req_ddrdma_test {

	struct be_cmd_req_hdr hdr;
@@ -912,3 +926,5 @@ extern int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num, 
				u32 num_pkts, u64 pattern);

extern int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,

			u32 byte_cnt, struct be_dma_mem *cmd);

extern int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,

				u8 loopback_type, u8 enable);