diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-20 14:33:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-20 14:33:03 -0500 |
| commit | a943e8bc058977663ba1e42389d4f5643cf2ae9e (patch) | |
| tree | ae8ba5ef07e3edec4d6626137b2ebcf1c6329fd7 /net/batman-adv/gateway_common.h | |
| parent | b2597f78d4831f2be288b220fcce5c4a9a63abec (diff) | |
| parent | ff15c27c97303fbe5abc49c25c73ea299ab72d31 (diff) | |
| download | talos-obmc-linux-a943e8bc058977663ba1e42389d4f5643cf2ae9e.tar.gz talos-obmc-linux-a943e8bc058977663ba1e42389d4f5643cf2ae9e.zip | |
Merge tag 'batadv-next-for-davem-20171220' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- de-inline hash functions to save memory footprint, by Denys Vlasenko
- Add License information to various files, by Sven Eckelmann (3 patches)
- Change batman_adv.h from ISC to MIT, by Sven Eckelmann
- Improve various includes, by Sven Eckelmann (5 patches)
- Lots of kernel-doc work by Sven Eckelmann (8 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/gateway_common.h')
| -rw-r--r-- | net/batman-adv/gateway_common.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index 0a6a97d201f2..afebd9c7edf4 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner @@ -32,11 +33,12 @@ enum batadv_gw_modes { /** * enum batadv_bandwidth_units - bandwidth unit types - * @BATADV_BW_UNIT_KBIT: unit type kbit - * @BATADV_BW_UNIT_MBIT: unit type mbit */ enum batadv_bandwidth_units { + /** @BATADV_BW_UNIT_KBIT: unit type kbit */ BATADV_BW_UNIT_KBIT, + + /** @BATADV_BW_UNIT_MBIT: unit type mbit */ BATADV_BW_UNIT_MBIT, }; |
