Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (0b60afba) · Commits · e / devices / android_kernel_fairphone_FP3

include/linux/netfilter.h

+16 −5

Original line number	Diff line number	Diff line
		@@ -184,8 +184,11 @@ static inline int nf_hook_thresh(int pf, unsigned int hook,
		struct sk_buff **pskb,
		struct net_device *indev,
		struct net_device *outdev,
		int (okfn)(struct sk_buff ), int thresh)
		int (okfn)(struct sk_buff ), int thresh,
		int cond)
		{
		if (!cond)
		return 1;
		#ifndef CONFIG_NETFILTER_DEBUG
		if (list_empty(&nf_hooks[pf][hook]))
		return 1;
		@@ -197,7 +200,7 @@ static inline int nf_hook(int pf, unsigned int hook, struct sk_buff **pskb,
		struct net_device indev, struct net_device outdev,
		int (okfn)(struct sk_buff ))
		{
		return nf_hook_thresh(pf, hook, pskb, indev, outdev, okfn, INT_MIN);
		return nf_hook_thresh(pf, hook, pskb, indev, outdev, okfn, INT_MIN, 1);
		}

		/* Activate hook; either okfn or kfree_skb called, unless a hook
		@@ -224,7 +227,13 @@ static inline int nf_hook(int pf, unsigned int hook, struct sk_buff **pskb,

		#define NF_HOOK_THRESH(pf, hook, skb, indev, outdev, okfn, thresh) \
		({int __ret; \
		if ((__ret=nf_hook_thresh(pf, hook, &(skb), indev, outdev, okfn, thresh)) == 1)\
		if ((__ret=nf_hook_thresh(pf, hook, &(skb), indev, outdev, okfn, thresh, 1)) == 1)\
		__ret = (okfn)(skb); \
		__ret;})

		#define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond) \
		({int __ret; \
		if ((__ret=nf_hook_thresh(pf, hook, &(skb), indev, outdev, okfn, INT_MIN, cond)) == 1)\
		__ret = (okfn)(skb); \
		__ret;})

		@@ -295,11 +304,13 @@ extern struct proc_dir_entry *proc_net_netfilter;

		#else /* !CONFIG_NETFILTER */
		#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb)
		#define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond) (okfn)(skb)
		static inline int nf_hook_thresh(int pf, unsigned int hook,
		struct sk_buff **pskb,
		struct net_device *indev,
		struct net_device *outdev,
		int (okfn)(struct sk_buff ), int thresh)
		int (okfn)(struct sk_buff ), int thresh,
		int cond)
		{
		return okfn(*pskb);
		}
		@@ -307,7 +318,7 @@ static inline int nf_hook(int pf, unsigned int hook, struct sk_buff **pskb,
		struct net_device indev, struct net_device outdev,
		int (okfn)(struct sk_buff ))
		{
		return okfn(*pskb);
		return 1;
		}
		static inline void nf_ct_attach(struct sk_buff new, struct sk_buff skb) {}
		struct flowi;

include/net/ip.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ struct inet_skb_parm
		#define IPSKB_XFRM_TUNNEL_SIZE 2
		#define IPSKB_XFRM_TRANSFORMED 4
		#define IPSKB_FRAG_COMPLETE 8
		#define IPSKB_REROUTED 16
		};

		struct ipcm_cookie

include/net/xfrm.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -866,7 +866,6 @@ extern int xfrm_state_mtu(struct xfrm_state *x, int mtu);
		extern int xfrm_init_state(struct xfrm_state *x);
		extern int xfrm4_rcv(struct sk_buff *skb);
		extern int xfrm4_output(struct sk_buff *skb);
		extern int xfrm4_output_finish(struct sk_buff *skb);
		extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler);
		extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler);
		extern int xfrm6_rcv_spi(struct sk_buff **pskb, u32 spi);

net/ipv4/ip_gre.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -830,7 +830,8 @@ static int ipgre_tunnel_xmit(struct sk_buff skb, struct net_device dev)
		skb->h.raw = skb->nh.raw;
		skb->nh.raw = skb_push(skb, gre_hlen);
		memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
		IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE\|IPSKB_XFRM_TRANSFORMED);
		IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE \| IPSKB_XFRM_TRANSFORMED \|
		IPSKB_REROUTED);
		dst_release(skb->dst);
		skb->dst = &rt->u.dst;

net/ipv4/ip_output.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -207,8 +207,10 @@ static inline int ip_finish_output(struct sk_buff *skb)
		{
		#if defined(CONFIG_NETFILTER) && defined(CONFIG_XFRM)
		/* Policy lookup after SNAT yielded a new policy */
		if (skb->dst->xfrm != NULL)
		return xfrm4_output_finish(skb);
		if (skb->dst->xfrm != NULL) {
		IPCB(skb)->flags \|= IPSKB_REROUTED;
		return dst_output(skb);
		}
		#endif
		if (skb->len > dst_mtu(skb->dst) &&
		!(skb_shinfo(skb)->ufo_size \|\| skb_shinfo(skb)->tso_size))
		@@ -271,8 +273,9 @@ int ip_mc_output(struct sk_buff *skb)
		newskb->dev, ip_dev_loopback_xmit);
		}

		return NF_HOOK(PF_INET, NF_IP_POST_ROUTING, skb, NULL, skb->dev,
		ip_finish_output);
		return NF_HOOK_COND(PF_INET, NF_IP_POST_ROUTING, skb, NULL, skb->dev,
		ip_finish_output,
		!(IPCB(skb)->flags & IPSKB_REROUTED));
		}

		int ip_output(struct sk_buff *skb)
		@@ -284,8 +287,9 @@ int ip_output(struct sk_buff *skb)
		skb->dev = dev;
		skb->protocol = htons(ETH_P_IP);

		return NF_HOOK(PF_INET, NF_IP_POST_ROUTING, skb, NULL, dev,
		ip_finish_output);
		return NF_HOOK_COND(PF_INET, NF_IP_POST_ROUTING, skb, NULL, dev,
		ip_finish_output,
		!(IPCB(skb)->flags & IPSKB_REROUTED));
		}

		int ip_queue_xmit(struct sk_buff *skb, int ipfragok)