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

Commit 936ef1d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [DECNET]: Fix level1 router hello
  [TCP]: Fix sock_orphan dead lock
  [ROSE]: Eleminate HZ from ROSE kernel interfaces
  [NETROM]: Eleminate HZ from NET/ROM kernel interfaces
  [AX.25]: Eleminate HZ from AX.25 kernel interfaces
  [ROSE]: Fix routing table locking in rose_remove_neigh.
  [AX.25]: Move AX.25 symbol exports
  [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers.
  [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls.
  [AX.25]: Spelling fix
  [ROSE]: Remove useless prototype for rose_remove_neigh().
  [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer
  [NETFILTER]: H.323 helper: Change author's email address
  [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n
  [NETFILTER]: H.323 helper: fix use of uninitialized data
  [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len
parents 0de2a93e d1a64983

drivers/net/hamradio/dmascc.c

+0 −1
Original line number Diff line number Diff line
@@ -582,7 +582,6 @@ static int __init setup_adapter(int card_base, int type, int n) 
		INIT_WORK(&priv->rx_work, rx_bh, priv);

		dev->priv = priv;

		sprintf(dev->name, "dmascc%i", 2 * n + i);

		SET_MODULE_OWNER(dev);

		dev->base_addr = card_base;

		dev->irq = irq;

		dev->open = scc_open;

drivers/net/hamradio/scc.c

+0 −1
Original line number Diff line number Diff line
@@ -1550,7 +1550,6 @@ static unsigned char ax25_nocall[AX25_ADDR_LEN] = 


static void scc_net_setup(struct net_device *dev)

{

	SET_MODULE_OWNER(dev);

	dev->tx_queue_len    = 16;	/* should be enough... */



	dev->open            = scc_net_open;

drivers/net/hamradio/yam.c

+0 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,6 @@ static void yam_setup(struct net_device *dev) 


	dev->base_addr = yp->iobase;

	dev->irq = yp->irq;

	SET_MODULE_OWNER(dev);



	dev->open = yam_open;

	dev->stop = yam_close;

include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * ip_conntrack_helper_h323_asn1.h - BER and PER decoding library for H.323

 * 			      	     conntrack/NAT module.

 *

 * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@hotmail.com>

 * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net>

 *

 * This source code is licensed under General Public License version 2.

 *

include/net/ax25.h

+5 −5
Original line number Diff line number Diff line
@@ -145,14 +145,14 @@ enum { 
#define	AX25_DEF_CONMODE	2			/* Connected mode allowed */

#define	AX25_DEF_WINDOW		2			/* Window=2 */

#define	AX25_DEF_EWINDOW	32			/* Module-128 Window=32 */

#define	AX25_DEF_T1		(10 * HZ)		/* T1=10s */

#define	AX25_DEF_T2		(3 * HZ)		/* T2=3s  */

#define	AX25_DEF_T3		(300 * HZ)		/* T3=300s */

#define	AX25_DEF_T1		10000			/* T1=10s */

#define	AX25_DEF_T2		3000			/* T2=3s  */

#define	AX25_DEF_T3		300000			/* T3=300s */

#define	AX25_DEF_N2		10			/* N2=10 */

#define AX25_DEF_IDLE		(0 * 60 * HZ)		/* Idle=None */

#define AX25_DEF_IDLE		0			/* Idle=None */

#define AX25_DEF_PACLEN		256			/* Paclen=256 */

#define	AX25_DEF_PROTOCOL	AX25_PROTO_STD_SIMPLEX	/* Standard AX.25 */

#define AX25_DEF_DS_TIMEOUT	(3 * 60 * HZ)		/* DAMA timeout 3 minutes */

#define AX25_DEF_DS_TIMEOUT	180000			/* DAMA timeout 3 minutes */



typedef struct ax25_uid_assoc {

	struct hlist_node	uid_node;