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

Commit 64cb104e 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:
  [PATCH] Kconfig: remove redundant NETDEVICES depends
  [PATCH] ehea: 64K page support fix
  [PATCH] ehea: Removed redundant define
  [PATCH] ehea: Nullpointer dereferencation fix
  [PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom
  [PATCH] bcm43xx: Fix low-traffic netdev watchdog TX timeouts
  [PATCH] hostap_plx: fix CIS verification
  [PATCH] ieee80211: don't flood log with errors
parents 0c7bb31d 78eb77a9

drivers/net/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ config SGI_IOC3_ETH_HW_TX_CSUM 


config MIPS_SIM_NET

	tristate "MIPS simulator Network device (EXPERIMENTAL)"

	depends on NETDEVICES && MIPS_SIM && EXPERIMENTAL

	depends on MIPS_SIM && EXPERIMENTAL

	help

	  The MIPSNET device is a simple Ethernet network device which is

	  emulated by the MIPS Simulator.
@@ -2467,7 +2467,7 @@ config ISERIES_VETH 


config RIONET

	tristate "RapidIO Ethernet over messaging driver support"

	depends on NETDEVICES && RAPIDIO

	depends on RAPIDIO



config RIONET_TX_SIZE

	int "Number of outbound queue entries"

drivers/net/ehea/ehea.h

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



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0034"

#define DRV_VERSION	"EHEA_0043"



#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \

	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
@@ -105,9 +105,6 @@ 
#define EHEA_BCMC_VLANID_ALL	0x01

#define EHEA_BCMC_VLANID_SINGLE	0x00



/* Use this define to kmallocate pHYP control blocks */

#define H_CB_ALIGNMENT		4096



#define EHEA_CACHE_LINE          128



/* Memory Regions */

drivers/net/ehea/ehea_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void ehea_get_ethtool_stats(struct net_device *dev, 
	data[i++] = port->port_res[0].swqe_refill_th;

	data[i++] = port->resets;



	cb6 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb6 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb6) {

		ehea_error("no mem for cb6");

		return;

drivers/net/ehea/ehea_main.c

+13 −13
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev) 


	memset(stats, 0, sizeof(*stats));



	cb2 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb2 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb2) {

		ehea_error("no mem for cb2");

		goto out;
@@ -586,7 +586,7 @@ int ehea_sense_port_attr(struct ehea_port *port) 
	u64 hret;

	struct hcp_ehea_port_cb0 *cb0;



	cb0 = kzalloc(H_CB_ALIGNMENT, GFP_ATOMIC);   /* May be called via */

	cb0 = kzalloc(PAGE_SIZE, GFP_ATOMIC);   /* May be called via */

	if (!cb0) {                             /* ehea_neq_tasklet() */

		ehea_error("no mem for cb0");

		ret = -ENOMEM;
@@ -670,7 +670,7 @@ int ehea_set_portspeed(struct ehea_port *port, u32 port_speed) 
	u64 hret;

	int ret = 0;



	cb4 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb4 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb4) {

		ehea_error("no mem for cb4");

		ret = -ENOMEM;
@@ -985,7 +985,7 @@ static int ehea_configure_port(struct ehea_port *port) 
	struct hcp_ehea_port_cb0 *cb0;



	ret = -ENOMEM;

	cb0 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb0)

		goto out;
@@ -1443,7 +1443,7 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa) 
		goto out;

	}



	cb0 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb0) {

		ehea_error("no mem for cb0");

		ret = -ENOMEM;
@@ -1501,7 +1501,7 @@ static void ehea_promiscuous(struct net_device *dev, int enable) 
	if ((enable && port->promisc) || (!enable && !port->promisc))

		return;



	cb7 = kzalloc(H_CB_ALIGNMENT, GFP_ATOMIC);

	cb7 = kzalloc(PAGE_SIZE, GFP_ATOMIC);

	if (!cb7) {

		ehea_error("no mem for cb7");

		goto out;
@@ -1870,7 +1870,7 @@ static void ehea_vlan_rx_register(struct net_device *dev, 


	port->vgrp = grp;



	cb1 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb1) {

		ehea_error("no mem for cb1");

		goto out;
@@ -1899,7 +1899,7 @@ static void ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 
	int index;

	u64 hret;



	cb1 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb1) {

		ehea_error("no mem for cb1");

		goto out;
@@ -1935,7 +1935,7 @@ static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) 
	if (port->vgrp)

		port->vgrp->vlan_devices[vid] = NULL;



	cb1 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb1) {

		ehea_error("no mem for cb1");

		goto out;
@@ -1968,7 +1968,7 @@ int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp) 
	u64 dummy64 = 0;

	struct hcp_modify_qp_cb0* cb0;



	cb0 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb0) {

		ret = -ENOMEM;

		goto out;
@@ -2269,7 +2269,7 @@ int ehea_sense_adapter_attr(struct ehea_adapter *adapter) 
	u64 hret;

	int ret;



	cb = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb) {

		ret = -ENOMEM;

		goto out;
@@ -2340,7 +2340,7 @@ static int ehea_setup_single_port(struct ehea_port *port, 
		goto out;



	/* Enable Jumbo frames */

	cb4 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);

	cb4 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	if (!cb4) {

		ehea_error("no mem for cb4");

	} else {

drivers/net/ehea/ehea_phyp.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ u64 ehea_h_register_rpage_mr(const u64 adapter_handle, const u64 mr_handle, 
			     const u8 pagesize, const u8 queue_type,

			     const u64 log_pageaddr, const u64 count)

{

	if ((count > 1) && (log_pageaddr & 0xfff)) {

	if ((count > 1) && (log_pageaddr & ~PAGE_MASK)) {

		ehea_error("not on pageboundary");

		return H_PARAMETER;

	}