[linux-merge]linux integration; annotated tag, v3.17-rc2, created. v3.17-rc2
by postmaster＠open-mesh.org
The annotated tag, v3.17-rc2 has been created
at 4dfe46edb15c8b9b9accb3653a139e259be1b36b (tag)
tagging 52addcf9d6669fa439387610bc65c92fa0980cef (commit)
replaces v3.17-rc1
tagged by Linus Torvalds
on Mon Aug 25 15:36:28 2014 -0700
- Shortlog ------------------------------------------------------------
Linux 3.17-rc2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJT+7psAAoJEHm+PkMAQRiGgyoH/A1rk8iJHAXq9SRG/Z//s8zW
mRdkNIWI+yK3dvw6VqCBNzcZyr5zKsyFl5GeGH7ZE9GmuTxvpEtsF8+VdLxZiwAL
eH8OtOsckLqTaURRvr1mnnbOfZSB6CBvpQKBHD6jx7pMDum63gE4aQvEPQmBo9Gn
tLX8rnqLnitp0mJkloKJByIb2mBuwwdJTj4tiF6RfgpKdXB1ZXYjHYJjwDSFjikl
xhcLIo9reWluz4peoqykMNsRwSUCe635Key1+/AmVgKDxPD78k/tBi7ktjIwc4F6
XAcg99L6O/abW5r46tc/10ohADXHppsGPCNV1iJw5jBcYfQVDH6dDfCsDPlayJ8=
=0EXX
-----END PGP SIGNATURE-----
Sven Eckelmann (1):
batman-adv: Fix parameter order of hlist_add_behind
-----------------------------------------------------------------------
--
linux integration
6 years, 7 months
[linux-merge]linux integration; annotated tag, v3.17-rc1, created. v3.17-rc1
by postmaster＠open-mesh.org
The annotated tag, v3.17-rc1 has been created
at cda2a78ee899e0a509d2a6a71bd229748d754c88 (tag)
tagging 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (commit)
replaces batman-adv-for-davem
tagged by Linus Torvalds
on Sat Aug 16 10:41:49 2014 -0600
- Shortlog ------------------------------------------------------------
Linux 3.17-rc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJT74nNAAoJEHm+PkMAQRiGuUwH+gIo3J2BXfE+Y4p0DaEYMvuV
5BkZ597FhY30zOqQx/7Hxd/NpJ3rC4+73E/fBDJt2nvpWlPPTym4WO97SV+DDD5j
x1nqcl3g1MNaivt/sX7e/nqx8Znyzv0k2i8GmOrhHSQT9qmDQfrrC17R3Vy5tJFB
qQZ+OMy8sQnbr46+dBVZ/sAAjSu3BJkUpxGFjXJkfGXW7hZKQvoQMqZb19sQ11oH
5M3N38G5n4DtpLwAIByP8qSnW/FTYCOhThgmfxLgVVVpNLq9vlc2TEixqvH2xxzY
IuZBBTAJXRjRNURZVS8EquZWGJ3UzDxmmziOAXlav5rgcMCR6wwxvtCMEtejcwU=
=arA9
-----END PGP SIGNATURE-----
David S. Miller (1):
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Jean Sacren (1):
batman: fix duplicate #include of multicast.h
Ken Helias (1):
list: fix order of arguments for hlist_add_after(_rcu)
Sven Eckelmann (1):
batman-adv: Fix out-of-order fragmentation support
-----------------------------------------------------------------------
--
linux integration
6 years, 7 months
[batman-adv] master: batman-adv: kernel doc fixes for main.{c, h} (84f23ea)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 84f23eac03bb3f8dfc81b2a9e2b118a4810ac7ef
Author: Martin Hundebøll <martin(a)hundeboll.net>
Date: Tue Jul 15 09:41:08 2014 +0200
batman-adv: kernel doc fixes for main.{c, h}
Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
84f23eac03bb3f8dfc81b2a9e2b118a4810ac7ef
main.c | 4 ++--
main.h | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/main.c b/main.c
index d1183e8..2cdd25a 100644
--- a/main.c
+++ b/main.c
@@ -651,7 +651,7 @@ static struct batadv_tvlv_handler
/**
* batadv_tvlv_container_free_ref - decrement the tvlv container refcounter and
* possibly free it
- * @tvlv_handler: the tvlv container to free
+ * @tvlv: the tvlv container to free
*/
static void batadv_tvlv_container_free_ref(struct batadv_tvlv_container *tvlv)
{
@@ -800,7 +800,7 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv,
* requested packet size
* @packet_buff: packet buffer
* @packet_buff_len: packet buffer size
- * @packet_min_len: requested packet minimum size
+ * @min_packet_len: requested packet minimum size
* @additional_packet_len: requested additional packet size on top of minimum
* size
*
diff --git a/main.h b/main.h
index fdfccff..4c557eb 100644
--- a/main.h
+++ b/main.h
@@ -92,9 +92,8 @@
/* numbers of originator to contact for any PUT/GET DHT operation */
#define BATADV_DAT_CANDIDATES_NUM 3
-/**
- * BATADV_TQ_SIMILARITY_THRESHOLD - TQ points that a secondary metric can differ
- * at most from the primary one in order to be still considered acceptable
+/* BATADV_TQ_SIMILARITY_THRESHOLD - TQ points that a secondary metric can differ
+ * at most from the primary one in order to be still considered acceptable
*/
#define BATADV_TQ_SIMILARITY_THRESHOLD 50
6 years, 8 months
[batman-adv] master: batman-adv: kernel doc fix for distributed-arp-table.h (6369d95)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 6369d95e1f55770338ae9e34cf86666022b8fe93
Author: Martin Hundebøll <martin(a)hundeboll.net>
Date: Tue Jul 15 09:41:07 2014 +0200
batman-adv: kernel doc fix for distributed-arp-table.h
Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net>
Acked-by: Antonio Quartulli <antonio(a)meshcoding.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
6369d95e1f55770338ae9e34cf86666022b8fe93
distributed-arp-table.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/distributed-arp-table.h b/distributed-arp-table.h
index d76e1d0..2fe0764 100644
--- a/distributed-arp-table.h
+++ b/distributed-arp-table.h
@@ -25,9 +25,7 @@
#include <linux/if_arp.h>
-/**
- * BATADV_DAT_ADDR_MAX - maximum address value in the DHT space
- */
+/* BATADV_DAT_ADDR_MAX - maximum address value in the DHT space */
#define BATADV_DAT_ADDR_MAX ((batadv_dat_addr_t)~(batadv_dat_addr_t)0)
void batadv_dat_status_update(struct net_device *net_dev);
6 years, 8 months
[batman-adv] master: batman-adv: kernel doc fixes for bridge_loop_avoidance.c (69f6547)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 69f6547ecf5e5ba4a186d502bb49432cfb5c60b3
Author: Martin Hundebøll <martin(a)hundeboll.net>
Date: Tue Jul 15 09:41:06 2014 +0200
batman-adv: kernel doc fixes for bridge_loop_avoidance.c
Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net>
Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
69f6547ecf5e5ba4a186d502bb49432cfb5c60b3
bridge_loop_avoidance.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c
index a957c81..0f0ca43 100644
--- a/bridge_loop_avoidance.c
+++ b/bridge_loop_avoidance.c
@@ -252,7 +252,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw)
/**
* batadv_bla_send_claim - sends a claim frame according to the provided info
* @bat_priv: the bat priv with all the soft interface information
- * @orig: the mac address to be announced within the claim
+ * @mac: the mac address to be announced within the claim
* @vid: the VLAN ID
* @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...)
*/
@@ -364,6 +364,7 @@ out:
* @bat_priv: the bat priv with all the soft interface information
* @orig: the mac address of the originator
* @vid: the VLAN ID
+ * @own_backbone: set if the requested backbone is local
*
* searches for the backbone gw or creates a new one if it could not
* be found.
@@ -454,6 +455,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,
/**
* batadv_bla_answer_request - answer a bla request by sending own claims
* @bat_priv: the bat priv with all the soft interface information
+ * @primary_if: interface where the request came on
* @vid: the vid where the request came on
*
* Repeat all of our own claims, and finally send an ANNOUNCE frame
@@ -775,6 +777,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv,
/**
* batadv_check_claim_group
* @bat_priv: the bat priv with all the soft interface information
+ * @primary_if: the primary interface of this batman interface
* @hw_src: the Hardware source in the ARP Header
* @hw_dst: the Hardware destination in the ARP Header
* @ethhdr: pointer to the Ethernet header of the claim frame
@@ -850,6 +853,7 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv,
/**
* batadv_bla_process_claim
* @bat_priv: the bat priv with all the soft interface information
+ * @primary_if: the primary hard interface of this batman soft interface
* @skb: the frame to be checked
*
* Check if this is a claim frame, and process it accordingly.
6 years, 8 months
[batman-adv] master: batman-adv: kernel doc fixes for bat_iv_ogm.c (21b6fec)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 21b6feccc16730a146cd1d5a8e41cff988fc4633
Author: Martin Hundebøll <martin(a)hundeboll.net>
Date: Tue Jul 15 09:41:05 2014 +0200
batman-adv: kernel doc fixes for bat_iv_ogm.c
Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
21b6feccc16730a146cd1d5a8e41cff988fc4633
bat_iv_ogm.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 1e80539..73209f3 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -28,7 +28,7 @@
/**
- * batadv_dup_status - duplicate status
+ * enum batadv_dup_status - duplicate status
* @BATADV_NO_DUP: the packet is a duplicate
* @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the
* neighbor)
@@ -517,7 +517,7 @@ out:
* @bat_priv: the bat priv with all the soft interface information
* @packet_len: (total) length of the OGM
* @send_time: timestamp (jiffies) when the packet is to be sent
- * @direktlink: true if this is a direct link packet
+ * @directlink: true if this is a direct link packet
* @if_incoming: interface where the packet was received
* @if_outgoing: interface for which the retransmission should be considered
* @forw_packet: the forwarded packet which should be checked
@@ -1366,6 +1366,7 @@ out:
/**
* batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if
* @skb: the skb containing the OGM
+ * @ogm_offset: offset from skb->data to start of ogm header
* @orig_node: the (cached) orig node for the originator of this OGM
* @if_incoming: the interface where this packet was received
* @if_outgoing: the interface for which the packet should be considered
@@ -1902,10 +1903,10 @@ out:
* batadv_iv_ogm_neigh_is_eob - check if neigh1 is equally good or better than
* neigh2 from the metric prospective
* @neigh1: the first neighbor object of the comparison
- * @if_outgoing: outgoing interface for the first neighbor
+ * @if_outgoing1: outgoing interface for the first neighbor
* @neigh2: the second neighbor object of the comparison
* @if_outgoing2: outgoing interface for the second neighbor
-
+ *
* Returns true if the metric via neigh1 is equally good or better than
* the metric via neigh2, false otherwise.
*/
6 years, 8 months
[batman-adv] master: batman-adv: remove obsolete variable primary_iface from orig_node (be0f6de)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit be0f6de26a0b96ac56db0bcc81cf5a1adc660cd6
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Wed Jul 16 12:23:10 2014 +0200
batman-adv: remove obsolete variable primary_iface from orig_node
This variable became obsolete when changing to the new bonding mechanism
based on the multi interface optimization. Since its not used anywhere,
remove it.
Reported-by: Linus Lüssing <linus.luessing(a)web.de>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
be0f6de26a0b96ac56db0bcc81cf5a1adc660cd6
types.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/types.h b/types.h
index 8854c05..462a70c 100644
--- a/types.h
+++ b/types.h
@@ -199,7 +199,6 @@ struct batadv_orig_bat_iv {
/**
* struct batadv_orig_node - structure for orig_list maintaining nodes of mesh
* @orig: originator ethernet address
- * @primary_addr: hosts primary interface address
* @ifinfo_list: list for routers per outgoing interface
* @last_bonding_candidate: pointer to last ifinfo of last used router
* @batadv_dat_addr_t: address of the orig node in the distributed hash
@@ -244,7 +243,6 @@ struct batadv_orig_bat_iv {
*/
struct batadv_orig_node {
uint8_t orig[ETH_ALEN];
- uint8_t primary_addr[ETH_ALEN];
struct hlist_head ifinfo_list;
struct batadv_orig_ifinfo *last_bonding_candidate;
#ifdef CONFIG_BATMAN_ADV_DAT
6 years, 8 months
[batman-adv] master: batman-adv: avoid useless return in void functions (365deac)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 365deac8a83d08e67dad3d52a6e3e0aa92f78d68
Author: Antonio Quartulli <antonio(a)meshcoding.com>
Date: Mon Jul 21 10:03:59 2014 +0200
batman-adv: avoid useless return in void functions
Cc: Linus Lüssing <linus.luessing(a)web.de>
Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
365deac8a83d08e67dad3d52a6e3e0aa92f78d68
multicast.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/multicast.h b/multicast.h
index 73b5d45..3a44ebd 100644
--- a/multicast.h
+++ b/multicast.h
@@ -50,7 +50,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node);
static inline void batadv_mcast_mla_update(struct batadv_priv *bat_priv)
{
- return;
}
static inline enum batadv_forw_mode
@@ -67,12 +66,10 @@ static inline int batadv_mcast_init(struct batadv_priv *bat_priv)
static inline void batadv_mcast_free(struct batadv_priv *bat_priv)
{
- return;
}
static inline void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node)
{
- return;
}
#endif /* CONFIG_BATMAN_ADV_MCAST */
6 years, 8 months
[batctl] next: batctl: Don't use hyphen for parameter in manpage (263b307)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
On branch : next
>---------------------------------------------------------------
commit 263b3076878960d0cff0e78712d64a31a846969f
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Jul 22 23:59:10 2014 +0200
batctl: Don't use hyphen for parameter in manpage
By default, "-" chars are interpreted as hyphens (U+2010) by groff, not as
minus signs (U+002D). Since options to programs use minus signs (U+002D), this
means for example in UTF-8 locales that you cannot cut and paste options, nor
search for them easily.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
263b3076878960d0cff0e78712d64a31a846969f
man/batctl.8 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/batctl.8 b/man/batctl.8
index 110020e..bbe888c 100644
--- a/man/batctl.8
+++ b/man/batctl.8
@@ -61,7 +61,7 @@ originator interval. The interval is in units of milliseconds.
.br
.IP "\fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]"
If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or
-disable ap isolation. This command can be used in conjunction with "-m" option to target per VLAN configurations.
+disable ap isolation. This command can be used in conjunction with "\-m" option to target per VLAN configurations.
.br
.IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB0\fP|\fB1\fP]"
If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable
6 years, 8 months
[batctl] next: batctl: fix backbone address in tcpdump for bla request frames (b904124)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
On branch : next
>---------------------------------------------------------------
commit b904124b928f45bbb9100f9719b2e1b9b78858dd
Author: Simon Wunderlich <simon(a)open-mesh.com>
Date: Wed Aug 6 16:34:03 2014 +0200
batctl: fix backbone address in tcpdump for bla request frames
hw_src just contains another copy of the destination. The backbone
sending the request is setting its mac address into Ethernet source, so
print that instead.
For reference, see the documentation:
http://www.open-mesh.org/projects/batman-adv/wiki/Bridge-loop-avoidance-P...
Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
b904124b928f45bbb9100f9719b2e1b9b78858dd
tcpdump.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tcpdump.c b/tcpdump.c
index e84617e..ada8938 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -148,7 +148,7 @@ static int dump_bla2_claim(struct ether_header *eth_hdr,
break;
case BATADV_CLAIM_TYPE_REQUEST:
printf("BLA REQUEST, src backbone %s, ",
- get_name_by_macaddr((struct ether_addr *)hw_src, read_opt));
+ get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_shost, read_opt));
printf("dst backbone %s\n",
get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_dhost, read_opt));
break;
6 years, 8 months