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

Commit a25606c8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

parents 938b93ad 94833dfb

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ P: Marcel Holtmann 
M:	marcel@holtmann.org

P:	Maxim Krasnyansky

M:	maxk@qualcomm.com

L:	bluez-devel@lists.sf.net

L:	linux-bluetooth@vger.kernel.org

W:	http://bluez.sf.net

W:	http://www.bluez.org

W:	http://www.holtmann.org/linux/bluetooth/

drivers/net/ifb.c

+15 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/moduleparam.h>

#include <net/pkt_sched.h>

#include <net/net_namespace.h>

#include <linux/lockdep.h>



#define TX_TIMEOUT  (2*HZ)
@@ -227,6 +228,16 @@ static struct rtnl_link_ops ifb_link_ops __read_mostly = { 
module_param(numifbs, int, 0);

MODULE_PARM_DESC(numifbs, "Number of ifb devices");



/*

 * dev_ifb->queue_lock is usually taken after dev->ingress_lock,

 * reversely to e.g. qdisc_lock_tree(). It should be safe until

 * ifb doesn't take dev->queue_lock with dev_ifb->ingress_lock.

 * But lockdep should know that ifb has different locks from dev.

 */

static struct lock_class_key ifb_queue_lock_key;

static struct lock_class_key ifb_ingress_lock_key;





static int __init ifb_init_one(int index)

{

	struct net_device *dev_ifb;
@@ -246,6 +257,10 @@ static int __init ifb_init_one(int index) 
	err = register_netdevice(dev_ifb);

	if (err < 0)

		goto err;



	lockdep_set_class(&dev_ifb->queue_lock, &ifb_queue_lock_key);

	lockdep_set_class(&dev_ifb->ingress_lock, &ifb_ingress_lock_key);



	return 0;



err:

drivers/net/tg3.c

+3 −3
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.87"

#define DRV_MODULE_RELDATE	"December 20, 2007"

#define DRV_MODULE_VERSION	"3.88"

#define DRV_MODULE_RELDATE	"March 20, 2008"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -11841,7 +11841,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp) 
	}



	if (!is_valid_ether_addr(&dev->dev_addr[0])) {

#ifdef CONFIG_SPARC64

#ifdef CONFIG_SPARC

		if (!tg3_get_default_macaddr_sparc(tp))

			return 0;

#endif

fs/proc/base.c

+1 −1
Original line number Diff line number Diff line
@@ -2270,7 +2270,7 @@ static const struct pid_entry tgid_base_stuff[] = { 
	DIR("fd",         S_IRUSR|S_IXUSR, fd),

	DIR("fdinfo",     S_IRUSR|S_IXUSR, fdinfo),

#ifdef CONFIG_NET

	DIR("net",        S_IRUGO|S_IXUSR, net),

	DIR("net",        S_IRUGO|S_IXUGO, net),

#endif

	REG("environ",    S_IRUSR, environ),

	INF("auxv",       S_IRUSR, pid_auxv),

include/net/sctp/sctp.h

+8 −4
Original line number Diff line number Diff line
@@ -375,15 +375,19 @@ static inline void sctp_sysctl_unregister(void) { return; } 


#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)



int sctp_v6_init(void);

void sctp_v6_exit(void);

void sctp_v6_pf_init(void);

void sctp_v6_pf_exit(void);

int sctp_v6_protosw_init(void);

void sctp_v6_protosw_exit(void);

int sctp_v6_add_protocol(void);

void sctp_v6_del_protocol(void);



#else /* #ifdef defined(CONFIG_IPV6) */



static inline int sctp_v6_init(void) { return 0; }

static inline void sctp_v6_exit(void) { return; }

static inline void sctp_v6_pf_init(void) { return 0; }

static inline void sctp_v6_pf_exit(void) { return; }

static inline int sctp_v6_protosw_init(void) { return 0; }

static inline void sctp_v6_protosw_exit(void) { return; }

static inline int sctp_v6_add_protocol(void) { return 0; }

static inline void sctp_v6_del_protocol(void) { return; }