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

Commit 98bd0c07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 5e375bc7 7918d212

include/linux/netfilter_ipv4/ipt_connbytes.h

+2 −2
Original line number Diff line number Diff line 
#ifndef _IPT_CONNBYTES_H

#define _IPT_CONNBYTES_H



#include <net/netfilter/xt_connbytes.h>

#include <linux/netfilter/xt_connbytes.h>

#define ipt_connbytes_what xt_connbytes_what



#define IPT_CONNBYTES_PKTS	XT_CONNBYTES_PACKETS

#define IPT_CONNBYTES_PKTS	XT_CONNBYTES_PKTS

#define IPT_CONNBYTES_BYTES	XT_CONNBYTES_BYTES

#define IPT_CONNBYTES_AVGPKT	XT_CONNBYTES_AVGPKT

include/linux/netfilter_ipv4/ipt_policy.h

+14 −8
Original line number Diff line number Diff line
@@ -27,12 +27,18 @@ struct ipt_policy_spec 
			reqid:1;

};



union ipt_policy_addr

{

	struct in_addr	a4;

	struct in6_addr	a6;

};



struct ipt_policy_elem

{

	u_int32_t	saddr;

	u_int32_t	smask;

	u_int32_t	daddr;

	u_int32_t	dmask;

	union ipt_policy_addr	saddr;

	union ipt_policy_addr	smask;

	union ipt_policy_addr	daddr;

	union ipt_policy_addr	dmask;

	u_int32_t		spi;

	u_int32_t		reqid;

	u_int8_t		proto;

include/linux/netfilter_ipv6/ip6t_policy.h

+14 −8
Original line number Diff line number Diff line
@@ -27,12 +27,18 @@ struct ip6t_policy_spec 
			reqid:1;

};



union ip6t_policy_addr

{

	struct in_addr	a4;

	struct in6_addr	a6;

};



struct ip6t_policy_elem

{

	struct in6_addr	saddr;

	struct in6_addr	smask;

	struct in6_addr	daddr;

	struct in6_addr	dmask;

	union ip6t_policy_addr	saddr;

	union ip6t_policy_addr	smask;

	union ip6t_policy_addr	daddr;

	union ip6t_policy_addr	dmask;

	u_int32_t		spi;

	u_int32_t		reqid;

	u_int8_t		proto;

include/net/netfilter/nf_conntrack_l3proto.h

+9 −6
Original line number Diff line number Diff line
@@ -88,12 +88,6 @@ extern struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX]; 
extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);

extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);



static inline struct nf_conntrack_l3proto *

__nf_ct_l3proto_find(u_int16_t l3proto)

{

	return nf_ct_l3protos[l3proto];

}



extern struct nf_conntrack_l3proto *

nf_ct_l3proto_find_get(u_int16_t l3proto);
@@ -103,4 +97,13 @@ extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p); 
extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;

extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;

extern struct nf_conntrack_l3proto nf_conntrack_generic_l3proto;



static inline struct nf_conntrack_l3proto *

__nf_ct_l3proto_find(u_int16_t l3proto)

{

	if (unlikely(l3proto >= AF_MAX))

		return &nf_conntrack_generic_l3proto;

	return nf_ct_l3protos[l3proto];

}



#endif /*_NF_CONNTRACK_L3PROTO_H*/

net/bridge/netfilter/ebt_ulog.c

+6 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#define PRINTR(format, args...) do { if (net_ratelimit()) \

                                printk(format , ## args); } while (0)



static unsigned int nlbufsiz = 4096;

static unsigned int nlbufsiz = NLMSG_GOODSIZE;

module_param(nlbufsiz, uint, 0600);

MODULE_PARM_DESC(nlbufsiz, "netlink buffer size (number of bytes) "

                           "(defaults to 4096)");
@@ -98,12 +98,14 @@ static void ulog_timer(unsigned long data) 
static struct sk_buff *ulog_alloc_skb(unsigned int size)

{

	struct sk_buff *skb;

	unsigned int n;



	skb = alloc_skb(nlbufsiz, GFP_ATOMIC);

	n = max(size, nlbufsiz);

	skb = alloc_skb(n, GFP_ATOMIC);

	if (!skb) {

		PRINTR(KERN_ERR "ebt_ulog: can't alloc whole buffer "

		       "of size %ub!\n", nlbufsiz);

		if (size < nlbufsiz) {

		       "of size %ub!\n", n);

		if (n > size) {

			/* try to allocate only as much as we need for

			 * current packet */

			skb = alloc_skb(size, GFP_ATOMIC);