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

Commit 4880d109 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:
  net_cls_act: act_simple dont ignore realloc code
  iwlwifi: make IWLWIFI a tristate
  Revert "atm: Do not free already unregistered net device."
  dccp: return -EINVAL on invalid feature length
  irda: fix !PNP support for drivers/net/irda/smsc-ircc2.c
  irda: fix !PNP support in drivers/net/irda/nsc-ircc.c
  net_cls_act: Make act_simple use of netlink policy.
  ip: Use inline function dst_metric() instead of direct access to dst->metric[]
  ip: Make use of the inline function dst_metric_locked()
  atm: Bad locking on br2684_devs modifications.
  atm: Do not free already unregistered net device.
  mac80211: Do not free net device after it is unregistered.
  bridge: Consolidate error paths in br_add_bridge().
  bridge: Net device leak in br_add_bridge().
  niu: Fix probing regression for maramba on-board chips.
  lapbeth: Release ->ethdev when unregistering device.
  xfrm: convert empty xfrm_audit_* macros to functions
  net: Fix useless comment reference loop.
  sch_htb: remove from event queue in htb_parent_to_leaf()
parents a1530636 9d1045ad

drivers/net/irda/nsc-ircc.c

+6 −0
Original line number Diff line number Diff line
@@ -100,7 +100,9 @@ static int nsc_ircc_probe_39x(nsc_chip_t *chip, chipio_t *info); 
static int nsc_ircc_init_108(nsc_chip_t *chip, chipio_t *info);

static int nsc_ircc_init_338(nsc_chip_t *chip, chipio_t *info);

static int nsc_ircc_init_39x(nsc_chip_t *chip, chipio_t *info);

#ifdef CONFIG_PNP

static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id);

#endif



/* These are the known NSC chips */

static nsc_chip_t chips[] = {
@@ -156,9 +158,11 @@ static const struct pnp_device_id nsc_ircc_pnp_table[] = { 
MODULE_DEVICE_TABLE(pnp, nsc_ircc_pnp_table);



static struct pnp_driver nsc_ircc_pnp_driver = {

#ifdef CONFIG_PNP

	.name = "nsc-ircc",

	.id_table = nsc_ircc_pnp_table,

	.probe = nsc_ircc_pnp_probe,

#endif

};



/* Some prototypes */
@@ -916,6 +920,7 @@ static int nsc_ircc_probe_39x(nsc_chip_t *chip, chipio_t *info) 
	return 0;

}



#ifdef CONFIG_PNP

/* PNP probing */

static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id)

{
@@ -952,6 +957,7 @@ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *i 


	return 0;

}

#endif



/*

 * Function nsc_ircc_setup (info)

drivers/net/irda/smsc-ircc2.c

+4 −1
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ MODULE_DEVICE_TABLE(pnp, smsc_ircc_pnp_table); 


static int pnp_driver_registered;



#ifdef CONFIG_PNP

static int __init smsc_ircc_pnp_probe(struct pnp_dev *dev,

				      const struct pnp_device_id *dev_id)

{
@@ -402,7 +403,9 @@ static struct pnp_driver smsc_ircc_pnp_driver = { 
	.id_table	= smsc_ircc_pnp_table,

	.probe		= smsc_ircc_pnp_probe,

};



#else /* CONFIG_PNP */

static struct pnp_driver smsc_ircc_pnp_driver;

#endif



/*******************************************************************************

 *

drivers/net/niu.c

+7 −4
Original line number Diff line number Diff line 
/* niu.c: Neptune ethernet driver.

 *

 * Copyright (C) 2007 David S. Miller (davem@davemloft.net)

 * Copyright (C) 2007, 2008 David S. Miller (davem@davemloft.net)

 */



#include <linux/module.h>
@@ -33,8 +33,8 @@ 


#define DRV_MODULE_NAME		"niu"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"0.8"

#define DRV_MODULE_RELDATE	"April 24, 2008"

#define DRV_MODULE_VERSION	"0.9"

#define DRV_MODULE_RELDATE	"May 4, 2008"



static char version[] __devinitdata =

	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
@@ -7264,8 +7264,11 @@ static int __devinit niu_get_and_validate_port(struct niu *np) 
				parent->num_ports = nr64(ESPC_NUM_PORTS_MACS) &

					ESPC_NUM_PORTS_MACS_VAL;



				/* All of the current probing methods fail on

				 * Maramba on-board parts.

				 */

				if (!parent->num_ports)

					return -ENODEV;

					parent->num_ports = 4;

			}

		}

	}

drivers/net/wan/lapbether.c

+1 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ static void __exit lapbeth_cleanup_driver(void) 
	list_for_each_safe(entry, tmp, &lapbeth_devices) {

		lapbeth = list_entry(entry, struct lapbethdev, node);



		dev_put(lapbeth->ethdev);

		unregister_netdevice(lapbeth->axdev);

	}

	rtnl_unlock();

drivers/net/wireless/iwlwifi/Kconfig

+1 −2
Original line number Diff line number Diff line 
config IWLWIFI

	bool

	default n

	tristate



config IWLCORE

	tristate "Intel Wireless Wifi Core"