diff options
author | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
commit | 64c27237a07129758e33f5f824ba5c33b7f57417 (patch) | |
tree | 4c0c0a9b6d282d600f2226e1b3510096b9d789dd /net/ipv4 | |
parent | 77a9939426f7a3f35f460afc9b11f1fe45955409 (diff) | |
parent | 49d8137a4039c63c834827f4bfe875e27bb9c521 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/marvell/mvneta.c
The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/gre_demux.c | 8 | ||||
-rw-r--r-- | net/ipv4/ip_tunnel.c | 3 | ||||
-rw-r--r-- | net/ipv4/ip_tunnel_core.c | 1 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index 1863422fb7d5..250be7421ab3 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c | |||
@@ -182,6 +182,14 @@ static int gre_cisco_rcv(struct sk_buff *skb) | |||
182 | int i; | 182 | int i; |
183 | bool csum_err = false; | 183 | bool csum_err = false; |
184 | 184 | ||
185 | #ifdef CONFIG_NET_IPGRE_BROADCAST | ||
186 | if (ipv4_is_multicast(ip_hdr(skb)->daddr)) { | ||
187 | /* Looped back packet, drop it! */ | ||
188 | if (rt_is_output_route(skb_rtable(skb))) | ||
189 | goto drop; | ||
190 | } | ||
191 | #endif | ||
192 | |||
185 | if (parse_gre_header(skb, &tpi, &csum_err) < 0) | 193 | if (parse_gre_header(skb, &tpi, &csum_err) < 0) |
186 | goto drop; | 194 | goto drop; |
187 | 195 | ||
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 66aaf506fbef..e77381d1df9a 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c | |||
@@ -420,9 +420,6 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, | |||
420 | 420 | ||
421 | #ifdef CONFIG_NET_IPGRE_BROADCAST | 421 | #ifdef CONFIG_NET_IPGRE_BROADCAST |
422 | if (ipv4_is_multicast(iph->daddr)) { | 422 | if (ipv4_is_multicast(iph->daddr)) { |
423 | /* Looped back packet, drop it! */ | ||
424 | if (rt_is_output_route(skb_rtable(skb))) | ||
425 | goto drop; | ||
426 | tunnel->dev->stats.multicast++; | 423 | tunnel->dev->stats.multicast++; |
427 | skb->pkt_type = PACKET_BROADCAST; | 424 | skb->pkt_type = PACKET_BROADCAST; |
428 | } | 425 | } |
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index b86f0a37fa7c..e0c2b1d2ea4e 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c | |||
@@ -108,6 +108,7 @@ int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto) | |||
108 | nf_reset(skb); | 108 | nf_reset(skb); |
109 | secpath_reset(skb); | 109 | secpath_reset(skb); |
110 | skb_clear_hash_if_not_l4(skb); | 110 | skb_clear_hash_if_not_l4(skb); |
111 | skb_dst_drop(skb); | ||
111 | skb->vlan_tci = 0; | 112 | skb->vlan_tci = 0; |
112 | skb_set_queue_mapping(skb, 0); | 113 | skb_set_queue_mapping(skb, 0); |
113 | skb->pkt_type = PACKET_HOST; | 114 | skb->pkt_type = PACKET_HOST; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 4555244607d0..6379894ec210 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -2628,7 +2628,7 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw, | |||
2628 | { | 2628 | { |
2629 | __be32 dest, src; | 2629 | __be32 dest, src; |
2630 | __u16 destp, srcp; | 2630 | __u16 destp, srcp; |
2631 | long delta = tw->tw_ttd - jiffies; | 2631 | s32 delta = tw->tw_ttd - inet_tw_time_stamp(); |
2632 | 2632 | ||
2633 | dest = tw->tw_daddr; | 2633 | dest = tw->tw_daddr; |
2634 | src = tw->tw_rcv_saddr; | 2634 | src = tw->tw_rcv_saddr; |