summaryrefslogtreecommitdiff
path: root/iosched.h
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-08-02 15:29:09 +0300
committerTobias Klauser <tklauser@distanz.ch>2015-08-03 10:06:57 +0200
commitbedaa6753463f1c707b42af5f4aac07f1a873525 (patch)
tree2b01e50dbe7ec862ebe268f8e125623ce6f64f0e /iosched.h
parent70e61c9c7f1889fd7cc835d042bb8738b79c7288 (diff)
netsniff-ng: Do not tune socket memory in pcap read-only mode
If a non-privileged user opens a pcap file then netsniff-ng tries to setup socket memory which causes warnings about failing because of permissions. So don't tune socket memory in pcap-read-only mode. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'iosched.h')
0 files changed, 0 insertions, 0 deletions
;id2=ec960de61503ef349588dccfa3ae02efabcc2762'>diff)
Merge branch 'dsa-port-mirroring'
Florian Fainelli says: ==================== net: dsa: Port mirroring support This patch series adds support for port mirroring in the two Broadcom switch drivers. The major part of the functional are actually with the plumbing between tc and the drivers. Changes in v5: - Added Jiri's Reviewed-by tag to first patch - rebase against latest net-next/master after bcm_sf2 CFP series Changes in v4: - rebased against latest net-next/master after Vivien's changes Changes in v3: - removed multiline comments from added structures - simplify error handling in dsa_slave_add_cls_matchall Changes in v2: - fixed filter removal logic to disable the ingress or egress mirroring when there are no longer ports being monitored in ingress or egress - removed a stray list_head in dsa_port structure that is not used Tested using the two iproute2 examples: tc qdisc add dev eth1 handle ffff: ingress tc filter add dev eth1 parent ffff: \ matchall skip_sw \ action mirred egress mirror \ dev eth2 tc qdisc add dev eth1 handle 1: root prio tc filter add dev eth1 parent 1: \ matchall skip_sw \ action mirred egress mirror \ dev eth2 ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netns')