| Message ID | 1467274002-61390-21-git-send-email-pshelar@ovn.org |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, Jun 30, 2016 at 1:06 AM, Pravin B Shelar <pshelar@ovn.org> wrote: > Upstream commit: > commit efeb2267bba8aa893afdadfc9bae4790777c600c > Author: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> > > geneve: fix tx_errors statistics > > Tx errors present summation of errors encountered while transmitting > packets. > > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > > Signed-off-by: Pravin B Shelar <pshelar@ovn.org> Acked-by: Jesse Gross <jesse@kernel.org>
diff --git a/datapath/linux/compat/geneve.c b/datapath/linux/compat/geneve.c index 9d582f0..4fd3528 100644 --- a/datapath/linux/compat/geneve.c +++ b/datapath/linux/compat/geneve.c @@ -1017,8 +1017,8 @@ tx_error: dev->stats.collisions++; else if (err == -ENETUNREACH) dev->stats.tx_carrier_errors++; - else - dev->stats.tx_errors++; + + dev->stats.tx_errors++; return NETDEV_TX_OK; } @@ -1106,8 +1106,8 @@ tx_error: dev->stats.collisions++; else if (err == -ENETUNREACH) dev->stats.tx_carrier_errors++; - else - dev->stats.tx_errors++; + + dev->stats.tx_errors++; return NETDEV_TX_OK; } #endif
Upstream commit: commit efeb2267bba8aa893afdadfc9bae4790777c600c Author: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> geneve: fix tx_errors statistics Tx errors present summation of errors encountered while transmitting packets. Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Pravin B Shelar <pshelar@ovn.org> --- datapath/linux/compat/geneve.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)