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

Commit 42f9cabe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 97616449 9e147a1c

net/ipv4/netfilter/ip_conntrack_ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ static char *ftp_buffer; 
static DEFINE_SPINLOCK(ip_ftp_lock);



#define MAX_PORTS 8

static short ports[MAX_PORTS];

static unsigned short ports[MAX_PORTS];

static int ports_c;

module_param_array(ports, short, &ports_c, 0400);

module_param_array(ports, ushort, &ports_c, 0400);



static int loose;

module_param(loose, int, 0600);

net/ipv4/netfilter/ip_conntrack_irc.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <linux/moduleparam.h>



#define MAX_PORTS 8

static short ports[MAX_PORTS];

static unsigned short ports[MAX_PORTS];

static int ports_c;

static int max_dcc_channels = 8;

static unsigned int dcc_timeout = 300;
@@ -52,7 +52,7 @@ EXPORT_SYMBOL_GPL(ip_nat_irc_hook); 
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");

MODULE_DESCRIPTION("IRC (DCC) connection tracking helper");

MODULE_LICENSE("GPL");

module_param_array(ports, short, &ports_c, 0400);

module_param_array(ports, ushort, &ports_c, 0400);

MODULE_PARM_DESC(ports, "port numbers of IRC servers");

module_param(max_dcc_channels, int, 0400);

MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per IRC session");

net/ipv4/netfilter/ip_conntrack_tftp.c

+2 −2
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ MODULE_DESCRIPTION("tftp connection tracking helper"); 
MODULE_LICENSE("GPL");



#define MAX_PORTS 8

static short ports[MAX_PORTS];

static unsigned short ports[MAX_PORTS];

static int ports_c;

module_param_array(ports, short, &ports_c, 0400);

module_param_array(ports, ushort, &ports_c, 0400);

MODULE_PARM_DESC(ports, "port numbers of tftp servers");



#if 0

net/ipv4/tcp_highspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void hstcp_init(struct sock *sk) 
}



static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt,

			     u32 in_flight, u32 pkts_acked)

			     u32 in_flight, int data_acked)

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct hstcp *ca = inet_csk_ca(sk);

net/ipv6/route.c

+1 −1
Original line number Diff line number Diff line
@@ -1732,7 +1732,7 @@ int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) 
		/*

		 * 2. allocate and initialize walker.

		 */

		w = kmalloc(sizeof(*w), GFP_KERNEL);

		w = kmalloc(sizeof(*w), GFP_ATOMIC);

		if (w == NULL)

			return -ENOMEM;

		RT6_TRACE("dump<%p", w);