diff options
| author | David S. Miller | 2016-07-01 23:05:00 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-07-01 23:05:00 +0200 |
| commit | 3ea00443f1b17405ce9e1421bb7706777339926e (patch) | |
| tree | bc2708a8e693cc19ca8a6501c4307a3f62055d99 /net/batman-adv/main.h | |
| parent | Merge branch 'hns-next' (diff) | |
| parent | batman-adv: Add debugfs table for mcast flags (diff) | |
| download | kernel-qcow2-linux-3ea00443f1b17405ce9e1421bb7706777339926e.tar.gz kernel-qcow2-linux-3ea00443f1b17405ce9e1421bb7706777339926e.tar.xz kernel-qcow2-linux-3ea00443f1b17405ce9e1421bb7706777339926e.zip | |
Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature patchset includes the following changes:
- two patches with minimal clean up work by Antonio Quartulli and
Simon Wunderlich
- eight patches of B.A.T.M.A.N. V, API and documentation clean
up work, by Antonio Quartulli and Marek Lindner
- Andrew Lunn fixed the skb priority adoption when forwarding
fragmented packets (two patches)
- Multicast optimization support is now enabled for bridges which
comes with some protocol updates, by Linus Luessing
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/main.h')
| -rw-r--r-- | net/batman-adv/main.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 76925266deed..cd83e2824f70 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2016.2" +#define BATADV_SOURCE_VERSION "2016.3" #endif /* B.A.T.M.A.N. parameters */ @@ -231,6 +231,7 @@ __be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr); * @BATADV_DBG_BLA: bridge loop avoidance messages * @BATADV_DBG_DAT: ARP snooping and DAT related messages * @BATADV_DBG_NC: network coding related messages + * @BATADV_DBG_MCAST: multicast related messages * @BATADV_DBG_ALL: the union of all the above log levels */ enum batadv_dbg_level { @@ -240,7 +241,8 @@ enum batadv_dbg_level { BATADV_DBG_BLA = BIT(3), BATADV_DBG_DAT = BIT(4), BATADV_DBG_NC = BIT(5), - BATADV_DBG_ALL = 63, + BATADV_DBG_MCAST = BIT(6), + BATADV_DBG_ALL = 127, }; #ifdef CONFIG_BATMAN_ADV_DEBUG |