Hi Stephen,
On Fri, Apr 19, 2013 at 01:21:27PM +1000, Stephen Rothwell wrote:
Caused by commits 612d2b4fe0a1 (batman-adv: network coding - save
overheard and tx packets for decoding) and 2df5278b0267 (batman-adv:
network coding - receive coded packets and decode them) from the
net-next tree
Hi David,
here are the instructions to resolve the conflicts you will get while merging
net into net-next.
In net/batman-adv/routing.c
++ HEAD
+static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size)
++===
+ static int batadv_check_unicast_packet(struct batadv_priv
Hi Antonio,
On Fri, 19 Apr 2013 09:34:09 +0200 Antonio Quartulli or...@autistici.org
wrote:
Your patch looks good, but I'd prefer to send my already prepared pull
request.
Is it ok with you?
Its entirely up to Dave how/if he fixes this up. He could just leave it
to Linus, though he
Signed-off-by: Antonio Quartulli or...@autistici.org
---
network-coding.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/network-coding.c b/network-coding.c
index 4eb49fc..f7c5430 100644
--- a/network-coding.c
+++ b/network-coding.c
@@ -1504,8 +1504,7 @@ void
Hello David,
here you have two fixes for net-next. One is fixing the compile issues
introduced by the merge of net into net-next and one is fixing a bug in a
component existing in net-next only.
I'm not sending a pull request because I'm anticipating your merge of net into
net-next and so I
On Friday, April 19, 2013 16:56:25 Antonio Quartulli wrote:
Signed-off-by: Antonio Quartulli or...@autistici.org
---
network-coding.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Applied in revision 7e0135e.
Thanks,
Marek
There's no need to for an explicit hlist_node initialization if it is
added to a list right away, like it's the case with the
hlist_add_head()s here.
Signed-off-by: Linus Lüssing linus.luess...@web.de
---
Unmodified, reposted from:
On Thursday, April 18, 2013 21:13:01 Antonio Quartulli wrote:
it may be the case that we want to store some local TT client flags in a
global entry, therefore the tt_global_add needs to get a proper argument
for this
Signed-off-by: Antonio Quartulli or...@autistici.org
---
v2:
- add
On Friday, April 19, 2013 18:06:56 Linus Lüssing wrote:
There's no need to for an explicit hlist_node initialization if it is
added to a list right away, like it's the case with the
hlist_add_head()s here.
Signed-off-by: Linus Lüssing linus.luess...@web.de
---
Unmodified, reposted from:
On Thursday, April 18, 2013 21:20:55 Antonio Quartulli wrote:
Instead of scheduling the global entry removals in
batadv_orig_node_free_rcu() (which would result in
scheduling other RCU callbacks for the next RCU period),
do it in batadv_orig_node_free_ref() directly.
In this way all the
On Thursday, April 18, 2013 04:56:03 Marek Lindner wrote:
Signed-off-by: Marek Lindner lindner_ma...@yahoo.de
---
network-coding.c |7 +++
1 file changed, 7 insertions(+)
Applied in revision 7b6b29f.
Regards,
Marek
The call to batadv_nc_skb_forward() fits better in
batadv_send_skb_to_orig(), as this is where the actual next hop is
looked up.
Signed-off-by: Martin Hundebøll mar...@hundeboll.net
---
v2: I should make random defines lowercase :)
v3: Do git add before committing and sending patches :|
v4:
Hi Mihail,
On Mon, Apr 15, 2013 at 12:37:33PM +0300, Mihail Costea wrote:
[...]
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+
+#if IS_ENABLED(CONFIG_IPV6)
+
+/* batadv_dat_dbg_ip - print similar debug message for IPv4 and IPv6.
+ * @bat_priv: the bat priv with all the soft interface information
+
CRC32C has to be preferred to CRC16 because of its possible
HW native support and because of its less likely probability
of collision. With this change the Translation Table
component now uses CRC32C to compute the Local and Global
Table checksum.
Signed-off-by: Antonio Quartulli
On Thu, Apr 18, 2013 at 03:43:47PM +0200, Antonio Quartulli wrote:
From: Antonio Quartulli anto...@open-mesh.com
Since the MSB bits of any vid variable are now used for
storing flags, print the vid properly by taking the flags
away and printing -1 in case of VID representing no real
VLAN.
On Fri, Apr 19, 2013 at 03:12:47PM +0200, Simon Wunderlich wrote:
On Thu, Apr 18, 2013 at 03:43:47PM +0200, Antonio Quartulli wrote:
From: Antonio Quartulli anto...@open-mesh.com
Since the MSB bits of any vid variable are now used for
storing flags, print the vid properly by taking the
From: Antonio Quartulli anto...@open-mesh.com
In order to make batman-adv fully vlan aware later, the
semantic used for variables storing the VLAN ID values has
to be changed in order to be adapted to the new one which
will be used batman-adv wide.
In particular, the VID has to be an _unsigned_
From: Antonio Quartulli anto...@open-mesh.com
Since the MSB bits of any vid variable are now used for
storing flags, print the vid properly by taking the flags
away and printing -1 in case of VID representing no real
VLAN.
Signed-off-by: Antonio Quartulli anto...@open-mesh.com
---
On Fri, Apr 19, 2013 at 06:07:00PM +0200, Antonio Quartulli wrote:
From: Antonio Quartulli anto...@open-mesh.com
In order to make batman-adv fully vlan aware later, the
semantic used for variables storing the VLAN ID values has
to be changed in order to be adapted to the new one which
will
On Saturday, April 20, 2013 00:07:00 Antonio Quartulli wrote:
From: Antonio Quartulli anto...@open-mesh.com
In order to make batman-adv fully vlan aware later, the
semantic used for variables storing the VLAN ID values has
to be changed in order to be adapted to the new one which
will be
On 19 April 2013 15:38, Antonio Quartulli or...@autistici.org wrote:
Hi Mihail,
On Mon, Apr 15, 2013 at 12:37:33PM +0300, Mihail Costea wrote:
[...]
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+
+#if IS_ENABLED(CONFIG_IPV6)
+
+/* batadv_dat_dbg_ip - print similar debug message for IPv4 and
On Saturday, April 20, 2013 00:07:01 Antonio Quartulli wrote:
From: Antonio Quartulli anto...@open-mesh.com
Since the MSB bits of any vid variable are now used for
storing flags, print the vid properly by taking the flags
away and printing -1 in case of VID representing no real
VLAN.
As we decreased the struct size from 26 to 24 byte, we can remove
__packed as the compile will not add any more padding.
Signed-off-by: Simon Wunderlich s...@hrz.tu-chemnitz.de
---
packet.h |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/packet.h b/packet.h
index
Reordering the packet type numbers allows us to handle unicast
packets in a general way - even if we don't know the specific packet
type, we can still forward it. There was already code handling
this for a couple of unicast packets, and this is the more
generalized version to do that.
These are some patches for inclusion for the next compat bump:
* remove vis server - this functionality will be provided by alfred
and associated programs in the future and does not really belong
to kernel space
* reorder packet types - this allows to route future unicast packets
even
This is replaced by a userspace program, we don't need this
functionality to bloat the kernel.
Signed-off-by: Simon Wunderlich s...@hrz.tu-chemnitz.de
---
Makefile.kbuild |1 -
bat_iv_ogm.c |7 -
debugfs.c|9 -
hard-interface.c |9 -
main.c | 11 -
Changes to v1:
* move the build check macros in a separate flag
* reorder batadv_iv_flags and remove VIS stuff
* add check for adding record route info for icmp request/replies
This is based on ordex/compat_bump.
Simon Wunderlich (6):
batman-adv: remove vis functionality
batman-adv: add
Since we removed the __packed from most of the packets, we should
make sure that the offset generated by the compile are correct for
sent/received data.
Signed-off-by: Simon Wunderlich s...@hrz.tu-chemnitz.de
---
main.c |8
1 file changed, 8 insertions(+)
diff --git a/main.c
Adding host information for record route is only required for ICMP
requests and replys, and should not be added to just any (future?)
packet type.
Signed-off-by: Simon Wunderlich s...@hrz.tu-chemnitz.de
---
routing.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
Reordering the packet type numbers allows us to handle unicast
packets in a general way - even if we don't know the specific packet
type, we can still forward it. There was already code handling
this for a couple of unicast packets, and this is the more
generalized version to do that.
As we decreased the struct size from 26 to 24 byte, we can remove
__packed as the compile will not add any more padding.
Signed-off-by: Simon Wunderlich s...@hrz.tu-chemnitz.de
---
packet.h |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/packet.h b/packet.h
index
The vis flag is not needed anymore, and since we do a compat bump we
can start with the first bit again
Signed-off-by: Simon Wunderlich s...@hrz.tu-chemnitz.de
---
packet.h | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/packet.h b/packet.h
index 88d3aa6..cda3236
This is replaced by a userspace program, we don't need this
functionality to bloat the kernel.
Signed-off-by: Simon Wunderlich s...@hrz.tu-chemnitz.de
---
Makefile.kbuild |1 -
bat_iv_ogm.c |7 -
debugfs.c|9 -
hard-interface.c |9 -
main.c | 11 -
33 matches
Mail list logo
