From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sat, 17 Oct 2015 12:11:08 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net... 
X-Git-Tag: MMI-PSA29.97-13-9~9125^2~103^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f0a0a978b66fea782a52b0a7075b3fa9ab27ad0a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'master' of git://git./linux/kernel/git/davem/net-next

This merge resolves conflicts with 75aec9df3a78 ("bridge: Remove
br_nf_push_frag_xmit_sk") as part of Eric Biederman's effort to improve
netns support in the network stack that reached upstream via David's
net-next tree.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Conflicts:
	net/bridge/br_netfilter_hooks.c
---

f0a0a978b66fea782a52b0a7075b3fa9ab27ad0a
diff --cc net/bridge/br_netfilter_hooks.c
index 9d3051916a64,370aa4d4cf4d..7ddbe7ec81d6
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
@@@ -688,15 -691,12 +688,10 @@@ static int br_nf_push_frag_xmit(struct 
  	nf_bridge_info_free(skb);
  	return br_dev_queue_push_xmit(net, sk, skb);
  }
- static int br_nf_push_frag_xmit_sk(struct sock *sk, struct sk_buff *skb)
- {
- 	struct net *net = dev_net(skb_dst(skb)->dev);
- 	return br_nf_push_frag_xmit(net, sk, skb);
- }
 -#endif
  
 -#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)
  static int
  br_nf_ip_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
- 		  int (*output)(struct sock *, struct sk_buff *))
+ 		  int (*output)(struct net *, struct sock *, struct sk_buff *))
  {
  	unsigned int mtu = ip_skb_dst_mtu(skb);
  	struct iphdr *iph = ip_hdr(skb);
@@@ -709,8 -709,9 +704,8 @@@
  		return -EMSGSIZE;
  	}
  
- 	return ip_do_fragment(sk, skb, output);
+ 	return ip_do_fragment(net, sk, skb, output);
  }
 -#endif
  
  static unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)
  {
@@@ -757,10 -758,11 +752,10 @@@ static int br_nf_dev_queue_xmit(struct 
  		skb_copy_from_linear_data_offset(skb, -data->size, data->mac,
  						 data->size);
  
- 		return br_nf_ip_fragment(net, sk, skb, br_nf_push_frag_xmit_sk);
+ 		return br_nf_ip_fragment(net, sk, skb, br_nf_push_frag_xmit);
  	}
 -#endif
 -#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
 -	if (skb->protocol == htons(ETH_P_IPV6)) {
 +	if (IS_ENABLED(CONFIG_NF_DEFRAG_IPV6) &&
 +	    skb->protocol == htons(ETH_P_IPV6)) {
  		const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();
  		struct brnf_frag_data *data;