diff options
| author | Yang, Yi Y <yi.y.yang@intel.com> | 2017-02-06 21:04:35 +0800 |
|---|---|---|
| committer | Joe Stringer <joe@ovn.org> | 2017-03-02 15:51:39 -0800 |
| commit | f0b0bdd20d9b9c247400266b7126cc4505362c1e (patch) | |
| tree | 87cd6e1ddf35e8b153981a3792c62aff77752b00 /datapath | |
| parent | a6d28f7c35b20023132a294ae37a5ede199d40ed (diff) | |
| download | openvswitch-f0b0bdd20d9b9c247400266b7126cc4505362c1e.tar.gz | |
datapath: use hard_header_len instead of hardcoded ETH_HLEN
Upstream commit:
commit 738314a084aae5f76ff760279034b39d52c42e8b
Author: Jiri Benc <jbenc@redhat.com>
Date: Thu Nov 10 16:28:17 2016 +0100
openvswitch: use hard_header_len instead of hardcoded ETH_HLEN
On tx, use hard_header_len while deciding whether to refragment or drop the
packet. That way, all combinations are calculated correctly:
* L2 packet going to L2 interface (the L2 header len is subtracted),
* L2 packet going to L3 interface (the L2 header is included in the packet
lenght),
* L3 packet going to L3 interface.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Joe Stringer <joe@ovn.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/actions.c | 3 | ||||
| -rw-r--r-- | datapath/vport.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/datapath/actions.c b/datapath/actions.c index 52a685867..bb0d0e849 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -773,7 +773,8 @@ static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port, pskb_trim(skb, ETH_HLEN); } - if (likely(!mru || (skb->len <= mru + ETH_HLEN))) { + if (likely(!mru || + (skb->len <= mru + vport->dev->hard_header_len))) { ovs_vport_send(vport, skb); } else if (mru <= vport->dev->mtu) { struct net *net = ovs_dp_get_net(dp); diff --git a/datapath/vport.c b/datapath/vport.c index 44c17de4c..adec447d8 100644 --- a/datapath/vport.c +++ b/datapath/vport.c @@ -508,9 +508,10 @@ int ovs_vport_receive(struct vport *vport, struct sk_buff *skb, return 0; } -static unsigned int packet_length(const struct sk_buff *skb) +static unsigned int packet_length(const struct sk_buff *skb, + struct net_device *dev) { - unsigned int length = skb->len - ETH_HLEN; + unsigned int length = skb->len - dev->hard_header_len; if (!skb_vlan_tag_present(skb) && eth_type_vlan(skb->protocol)) @@ -528,10 +529,11 @@ void ovs_vport_send(struct vport *vport, struct sk_buff *skb) { int mtu = vport->dev->mtu; - if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) { + if (unlikely(packet_length(skb, vport->dev) > mtu && + !skb_is_gso(skb))) { net_warn_ratelimited("%s: dropped over-mtu packet: %d > %d\n", vport->dev->name, - packet_length(skb), mtu); + packet_length(skb, vport->dev), mtu); vport->dev->stats.tx_errors++; goto drop; } |