diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-07-04 23:33:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-04 23:33:59 -0700 |
| commit | b77af26a790a2ecfdd4109a3b1328499ea988181 (patch) | |
| tree | 6e192798c8d05bfc04d27aa94dc51a6407801c63 /MAINTAINERS | |
| parent | Merge branch 'mlxsw-fib-offload' (diff) | |
| parent | batman-adv: split routing API data structure in subobjects (diff) | |
| download | linux-dev-b77af26a790a2ecfdd4109a3b1328499ea988181.tar.xz linux-dev-b77af26a790a2ecfdd4109a3b1328499ea988181.zip | |
Merge tag 'batadv-next-for-davem-20160704' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature patchset includes the following changes:
- Cleanup work by Markus Pargmann and Sven Eckelmann (six patches)
- Initial Netlink support by Matthias Schiffer (two patches)
- Throughput Meter implementation by Antonio Quartulli, a kernel-space
traffic generator to estimate link speeds. This feature is useful on
low-end WiFi APs where running iperf or netperf from userspace
gives wrong results due to heavy userspace/kernelspace overhead.
(two patches)
- API clean-up work by Antonio Quartulli (one patch)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 772c9ffa2272..67e4a6584cf5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2297,6 +2297,7 @@ S: Maintained F: Documentation/ABI/testing/sysfs-class-net-batman-adv F: Documentation/ABI/testing/sysfs-class-net-mesh F: Documentation/networking/batman-adv.txt +F: include/uapi/linux/batman_adv.h F: net/batman-adv/ BAYCOM/HDLCDRV DRIVERS FOR AX.25 |