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

Commit 272a5322 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 051d3cbd ba13c984

include/linux/netfilter_bridge/ebt_log.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ 




#define EBT_LOG_IP 0x01 /* if the frame is made by ip, log the ip information */

#define EBT_LOG_IP 0x01 /* if the frame is made by ip, log the ip information */

#define EBT_LOG_ARP 0x02

#define EBT_LOG_ARP 0x02

#define EBT_LOG_NFLOG 0x04

#define EBT_LOG_MASK (EBT_LOG_IP | EBT_LOG_ARP)

#define EBT_LOG_MASK (EBT_LOG_IP | EBT_LOG_ARP)

#define EBT_LOG_PREFIX_SIZE 30

#define EBT_LOG_PREFIX_SIZE 30

#define EBT_LOG_WATCHER "log"

#define EBT_LOG_WATCHER "log"

include/linux/netfilter_ipv4/ipt_LOG.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,8 @@ 
#define IPT_LOG_TCPOPT		0x02	/* Log TCP options */

#define IPT_LOG_TCPOPT		0x02	/* Log TCP options */

#define IPT_LOG_IPOPT		0x04	/* Log IP options */

#define IPT_LOG_IPOPT		0x04	/* Log IP options */

#define IPT_LOG_UID		0x08	/* Log UID owning local socket */

#define IPT_LOG_UID		0x08	/* Log UID owning local socket */

#define IPT_LOG_MASK		0x0f

#define IPT_LOG_NFLOG		0x10	/* Log using nf_log backend */

#define IPT_LOG_MASK		0x1f





struct ipt_log_info {

struct ipt_log_info {

	unsigned char level;

	unsigned char level;

include/linux/netfilter_ipv6/ip6t_LOG.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,8 @@ 
#define IP6T_LOG_TCPOPT		0x02	/* Log TCP options */

#define IP6T_LOG_TCPOPT		0x02	/* Log TCP options */

#define IP6T_LOG_IPOPT		0x04	/* Log IP options */

#define IP6T_LOG_IPOPT		0x04	/* Log IP options */

#define IP6T_LOG_UID		0x08	/* Log UID owning local socket */

#define IP6T_LOG_UID		0x08	/* Log UID owning local socket */

#define IP6T_LOG_MASK		0x0f

#define IP6T_LOG_NFLOG		0x10	/* Log using nf_log backend */

#define IP6T_LOG_MASK		0x1f





struct ip6t_log_info {

struct ip6t_log_info {

	unsigned char level;

	unsigned char level;

include/net/xfrm.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -233,7 +233,6 @@ struct xfrm_type 
	int			(*init_state)(struct xfrm_state *x);

	int			(*init_state)(struct xfrm_state *x);

	void			(*destructor)(struct xfrm_state *);

	void			(*destructor)(struct xfrm_state *);

	int			(*input)(struct xfrm_state *, struct xfrm_decap_state *, struct sk_buff *skb);

	int			(*input)(struct xfrm_state *, struct xfrm_decap_state *, struct sk_buff *skb);

	int			(*post_input)(struct xfrm_state *, struct xfrm_decap_state *, struct sk_buff *skb);

	int			(*output)(struct xfrm_state *, struct sk_buff *pskb);

	int			(*output)(struct xfrm_state *, struct sk_buff *pskb);

	/* Estimate maximal size of result of transformation of a dgram */

	/* Estimate maximal size of result of transformation of a dgram */

	u32			(*get_max_size)(struct xfrm_state *, int size);

	u32			(*get_max_size)(struct xfrm_state *, int size);

net/bridge/netfilter/ebt_log.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -166,7 +166,12 @@ static void ebt_log(const struct sk_buff *skb, unsigned int hooknr, 
	li.u.log.level = info->loglevel;

	li.u.log.level = info->loglevel;

	li.u.log.logflags = info->bitmask;

	li.u.log.logflags = info->bitmask;





	nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, info->prefix);

	if (info->bitmask & EBT_LOG_NFLOG)

		nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li,

		              info->prefix);

	else

		ebt_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li,

		               info->prefix);

}

}





static struct ebt_watcher log =

static struct ebt_watcher log =