diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2014-05-04 19:39:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-12 14:03:41 -0400 |
commit | 60ff746739bf805a912484643c720b6124826140 (patch) | |
tree | 13a1ac633a87fb23694182beb6541ff84e635e0b /net/openvswitch | |
parent | 5f013c9bc70214dcacd5fbed5a06c217d6ff9c59 (diff) |
net: rename local_df to ignore_df
As suggested by several people, rename local_df to ignore_df,
since it means "ignore df bit if it is set".
Cc: Maciej Żenczykowski <maze@google.com>
Cc: Florian Westphal <fw@strlen.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
-rw-r--r-- | net/openvswitch/vport-gre.c | 2 | ||||
-rw-r--r-- | net/openvswitch/vport-vxlan.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c index ebb6e2442554..0856f014d7a9 100644 --- a/net/openvswitch/vport-gre.c +++ b/net/openvswitch/vport-gre.c | |||
@@ -172,7 +172,7 @@ static int gre_tnl_send(struct vport *vport, struct sk_buff *skb) | |||
172 | df = OVS_CB(skb)->tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ? | 172 | df = OVS_CB(skb)->tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ? |
173 | htons(IP_DF) : 0; | 173 | htons(IP_DF) : 0; |
174 | 174 | ||
175 | skb->local_df = 1; | 175 | skb->ignore_df = 1; |
176 | 176 | ||
177 | return iptunnel_xmit(skb->sk, rt, skb, fl.saddr, | 177 | return iptunnel_xmit(skb->sk, rt, skb, fl.saddr, |
178 | OVS_CB(skb)->tun_key->ipv4_dst, IPPROTO_GRE, | 178 | OVS_CB(skb)->tun_key->ipv4_dst, IPPROTO_GRE, |
diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c index 21cceb3bdf78..a93efa3f64c3 100644 --- a/net/openvswitch/vport-vxlan.c +++ b/net/openvswitch/vport-vxlan.c | |||
@@ -170,7 +170,7 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb) | |||
170 | df = OVS_CB(skb)->tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ? | 170 | df = OVS_CB(skb)->tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ? |
171 | htons(IP_DF) : 0; | 171 | htons(IP_DF) : 0; |
172 | 172 | ||
173 | skb->local_df = 1; | 173 | skb->ignore_df = 1; |
174 | 174 | ||
175 | inet_get_local_port_range(net, &port_min, &port_max); | 175 | inet_get_local_port_range(net, &port_min, &port_max); |
176 | src_port = vxlan_src_port(port_min, port_max, skb); | 176 | src_port = vxlan_src_port(port_min, port_max, skb); |