linux-merge

linux-merge@lists.open-mesh.org

3 participants
7480 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20160614
by batman＠open-mesh.org 14 Jun '16

14 Jun '16

The following commit has been merged in the master branch: commit 99860208bc62d8ebd5c57495b84856506fe075bc Author: Florian Westphal <fw(a)strlen.de> Date: Sat Jun 11 12:46:04 2016 +0200 sched: remove NET_XMIT_POLICED sch_atm returns this when TC_ACT_SHOT classification occurs. But all other schedulers that use tc_classify (htb, hfsc, drr, fq_codel ...) return NET_XMIT_SUCCESS | __BYPASS in this case so just do that in atm. BATMAN uses it as an intermediate return value to signal forwarding vs. buffering, but it did not return POLICED to callers outside of BATMAN. Reviewed-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 94eef35..d101e4d 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -90,7 +90,6 @@ void netdev_set_default_ethtool_ops(struct net_device *dev, #define NET_XMIT_SUCCESS 0x00 #define NET_XMIT_DROP 0x01 /* skb dropped */ #define NET_XMIT_CN 0x02 /* congestion notification */ -#define NET_XMIT_POLICED 0x03 /* skb is shot by police */ #define NET_XMIT_MASK 0x0f /* qdisc flags in net/sch_generic.h */ /* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index e3857ed..f75091c 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -653,7 +653,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, len + ETH_HLEN); ret = NET_RX_SUCCESS; - } else if (res == NET_XMIT_POLICED) { + } else if (res == -EINPROGRESS) { /* skb was buffered and consumed */ ret = NET_RX_SUCCESS; } diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index f2f1256..b1a4e8a 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -156,7 +156,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb, * attempted. * * Return: NET_XMIT_SUCCESS on success, NET_XMIT_DROP on failure, or - * NET_XMIT_POLICED if the skb is buffered for later transmit. + * -EINPROGRESS if the skb is buffered for later transmit. */ int batadv_send_skb_to_orig(struct sk_buff *skb, struct batadv_orig_node *orig_node, @@ -188,7 +188,7 @@ int batadv_send_skb_to_orig(struct sk_buff *skb, * network coding fails, then send the packet as usual. */ if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) { - ret = NET_XMIT_POLICED; + ret = -EINPROGRESS; } else { batadv_send_unicast_skb(skb, neigh_node); ret = NET_XMIT_SUCCESS; diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 8b02df0..f74ab9c 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -3463,7 +3463,6 @@ xmit_more: break; case NET_XMIT_DROP: case NET_XMIT_CN: - case NET_XMIT_POLICED: /* skb has been consumed */ pkt_dev->errors++; break; diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 401eda6..12ebde8 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -95,8 +95,6 @@ static int tclass_notify(struct net *net, struct sk_buff *oskb, Expected action: do not backoff, but wait until queue will clear. NET_XMIT_CN - probably this packet enqueued, but another one dropped. Expected action: backoff or ignore - NET_XMIT_POLICED - dropped by police. - Expected action: backoff or error to real-time apps. Auxiliary routines: diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 7e6c12d..0785b23 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -363,7 +363,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch) struct atm_flow_data *flow; struct tcf_result res; int result; - int ret = NET_XMIT_POLICED; + int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; pr_debug("atm_tc_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p); result = TC_POLICE_OK; /* be nice to gcc */ -- LinuxNextTracking

1 0

Build check errors found: 2016-06-14
by postmaster＠open-mesh.org 14 Jun '16

14 Jun '16

Name of failed tests ==================== * difference between net-next and batadv next * headers master Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- netnext/Documentation/ABI/testing/sysfs-class-net-batman-adv | 20 netnext/MAINTAINERS | 1 netnext/include/uapi/linux/batman_adv.h | 114 netnext/net/batman-adv/Kconfig | 2 netnext/net/batman-adv/Makefile | 5 netnext/net/batman-adv/bat_algo.c | 140 netnext/net/batman-adv/bat_algo.h | 32 netnext/net/batman-adv/bat_iv_ogm.c | 106 netnext/net/batman-adv/bat_iv_ogm.h | 25 netnext/net/batman-adv/bat_v.c | 58 netnext/net/batman-adv/bat_v.h | 52 netnext/net/batman-adv/bat_v_elp.c | 7 netnext/net/batman-adv/bat_v_elp.h | 4 netnext/net/batman-adv/bat_v_ogm.c | 9 netnext/net/batman-adv/bat_v_ogm.h | 4 netnext/net/batman-adv/bitarray.c | 2 netnext/net/batman-adv/bridge_loop_avoidance.c | 1 netnext/net/batman-adv/debugfs.c | 240 + netnext/net/batman-adv/distributed-arp-table.c | 2 netnext/net/batman-adv/fragmentation.c | 53 netnext/net/batman-adv/fragmentation.h | 6 netnext/net/batman-adv/gateway_client.c | 16 netnext/net/batman-adv/gateway_common.c | 10 netnext/net/batman-adv/hard-interface.c | 25 netnext/net/batman-adv/icmp_socket.c | 1 netnext/net/batman-adv/log.c | 231 - netnext/net/batman-adv/log.h | 111 netnext/net/batman-adv/main.c | 709 ++++ netnext/net/batman-adv/main.h | 121 netnext/net/batman-adv/multicast.c | 501 --- netnext/net/batman-adv/multicast.h | 3 netnext/net/batman-adv/netlink.c | 424 -- netnext/net/batman-adv/netlink.h | 32 netnext/net/batman-adv/network-coding.c | 2 netnext/net/batman-adv/originator.c | 91 netnext/net/batman-adv/originator.h | 6 netnext/net/batman-adv/packet.h | 61 netnext/net/batman-adv/routing.c | 44 netnext/net/batman-adv/send.c | 91 netnext/net/batman-adv/send.h | 4 netnext/net/batman-adv/soft-interface.c | 22 netnext/net/batman-adv/sysfs.c | 29 netnext/net/batman-adv/tp_meter.c | 1504 ---------- netnext/net/batman-adv/tp_meter.h | 34 netnext/net/batman-adv/translation-table.c | 54 netnext/net/batman-adv/tvlv.c | 632 ---- netnext/net/batman-adv/tvlv.h | 61 netnext/net/batman-adv/types.h | 260 - 48 files changed, 1402 insertions(+), 4560 deletions(-) headers master -------------- diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 0320703..973e0c8 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -16,13 +16,16 @@ */ #include "debugfs.h" + #include "main.h" // IWYU pragma: keep +#include <linux/atomic.h> #include <linux/debugfs.h> #include <linux/device.h> #include <linux/errno.h> #include <linux/export.h> #include <linux/fs.h> +#include <linux/kernel.h> #include <linux/netdevice.h> #include <linux/printk.h> #include <linux/sched.h> /* for linux/wait.h */ // IWYU pragma: keep @@ -31,6 +34,7 @@ #include <linux/stddef.h> #include <linux/stringify.h> #include <linux/sysfs.h> +#include <linux/types.h> #include "bat_algo.h" // IWYU pragma: keep #include "bridge_loop_avoidance.h"

1 0

Coverity Scan: Analysis completed for batctl
by scan-admin＠coverity.com 13 Jun '16

13 Jun '16

1 0

Build check errors found: 2016-06-13
by postmaster＠open-mesh.org 13 Jun '16

13 Jun '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- netnext/Documentation/ABI/testing/sysfs-class-net-batman-adv | 20 netnext/MAINTAINERS | 1 netnext/include/uapi/linux/batman_adv.h | 114 netnext/net/batman-adv/Kconfig | 2 netnext/net/batman-adv/Makefile | 5 netnext/net/batman-adv/bat_algo.c | 140 netnext/net/batman-adv/bat_algo.h | 32 netnext/net/batman-adv/bat_iv_ogm.c | 106 netnext/net/batman-adv/bat_iv_ogm.h | 25 netnext/net/batman-adv/bat_v.c | 58 netnext/net/batman-adv/bat_v.h | 52 netnext/net/batman-adv/bat_v_elp.c | 7 netnext/net/batman-adv/bat_v_elp.h | 4 netnext/net/batman-adv/bat_v_ogm.c | 9 netnext/net/batman-adv/bat_v_ogm.h | 4 netnext/net/batman-adv/bitarray.c | 2 netnext/net/batman-adv/bridge_loop_avoidance.c | 1 netnext/net/batman-adv/debugfs.c | 240 + netnext/net/batman-adv/distributed-arp-table.c | 2 netnext/net/batman-adv/fragmentation.c | 53 netnext/net/batman-adv/fragmentation.h | 6 netnext/net/batman-adv/gateway_client.c | 16 netnext/net/batman-adv/gateway_common.c | 10 netnext/net/batman-adv/hard-interface.c | 25 netnext/net/batman-adv/icmp_socket.c | 1 netnext/net/batman-adv/log.c | 231 - netnext/net/batman-adv/log.h | 111 netnext/net/batman-adv/main.c | 709 ++++ netnext/net/batman-adv/main.h | 121 netnext/net/batman-adv/multicast.c | 501 --- netnext/net/batman-adv/multicast.h | 3 netnext/net/batman-adv/netlink.c | 424 -- netnext/net/batman-adv/netlink.h | 32 netnext/net/batman-adv/network-coding.c | 2 netnext/net/batman-adv/originator.c | 91 netnext/net/batman-adv/originator.h | 6 netnext/net/batman-adv/packet.h | 61 netnext/net/batman-adv/routing.c | 44 netnext/net/batman-adv/send.c | 89 netnext/net/batman-adv/send.h | 4 netnext/net/batman-adv/soft-interface.c | 22 netnext/net/batman-adv/sysfs.c | 29 netnext/net/batman-adv/tp_meter.c | 1504 ---------- netnext/net/batman-adv/tp_meter.h | 34 netnext/net/batman-adv/translation-table.c | 54 netnext/net/batman-adv/tvlv.c | 632 ---- netnext/net/batman-adv/tvlv.h | 61 netnext/net/batman-adv/types.h | 260 - 48 files changed, 1401 insertions(+), 4559 deletions(-)

1 0

Build check errors found: 2016-06-12
by postmaster＠open-mesh.org 12 Jun '16

12 Jun '16

1 0

Build check errors found: 2016-06-11
by postmaster＠open-mesh.org 11 Jun '16

11 Jun '16

1 0

New Defects reported by Coverity Scan for batctl
by scan-admin＠coverity.com 10 Jun '16

10 Jun '16

Hi, Please find the latest report on new defect(s) introduced to batctl found with Coverity Scan. 1 new defect(s) introduced to batctl found with Coverity Scan. New defect(s) Reported-by: Coverity Scan Showing 1 of 1 defect(s) ** CID 149305: Program hangs (INFINITE_LOOP) /genl.c: 129 in nl_get_multicast_id() ________________________________________________________________________________________________________ *** CID 149305: Program hangs (INFINITE_LOOP) /genl.c: 129 in nl_get_multicast_id() 123 ret = 1; 124 125 nl_cb_err(cb, NL_CB_CUSTOM, mcast_error_handler, &ret); 126 nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, mcast_ack_handler, &ret); 127 nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, mcast_family_handler, &grp); 128 >>> CID 149305: Program hangs (INFINITE_LOOP) >>> If "ret > 0" is initially true then it will remain true. 129 while (ret > 0) 130 nl_recvmsgs(sock, cb); 131 132 if (ret == 0) 133 ret = grp.id; 134 nla_put_failure: ________________________________________________________________________________________________________ To view the defects in Coverity Scan visit, https://scan.coverity.com/projects/batctl?tab=overview To manage Coverity Scan email notifications for "linux-merge(a)lists.open-mesh.org", click https://scan.coverity.com/subscriptions/edit?email=linux-merge%40lists.open…

1 0

Coverity Scan: Analysis completed for batctl
by scan-admin＠coverity.com 10 Jun '16

10 Jun '16

Your request for analysis of batctl has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V0… Analysis Summary: New defects found: 1 Defects eliminated: 0 If you have difficulty understading any defects, email us at scan-admin(a)coverity.com, or post your question to the Coverity Community at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0b7…

1 0

Build check errors found: 2016-06-10
by postmaster＠open-mesh.org 10 Jun '16

10 Jun '16

1 0

Coverity Scan: Analysis completed for alfred
by scan-admin＠coverity.com 09 Jun '16

09 Jun '16

Your request for analysis of alfred has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V0… Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge