[batman-adv] master: batman-adv: compat: workaround for issues with make-kpkg for 4.5 kernels (102146d)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 102146d65c50f14d461616a5da6f25fd77a61595
Author: Linus Lüssing <linus.luessing(a)c0d3.blue>
Date: Sun Jan 22 21:40:40 2017 +0100
batman-adv: compat: workaround for issues with make-kpkg for 4.5 kernels
Currently, batman-adv fails to build for 4.5 kernel headers provided by
Debian's make-kpkg. "make" complains with:
"include/net/sch_generic.h:413:2: error: implicit declaration of
function ‘G_TC_AT’ [-Werror=implicit-function-declaration]"
And:
"include/net/sch_generic.h:413:33: error: ‘AT_INGRESS’ undeclared (first
use in this function)"
The issue seems to be that make-kpkg creates two pkt_cls.h with the same
include guard but differing contents, "uapi/linux/pkt_cls.h" and
"linux/pkt_cls.h". The latter has its "#ifdef __KERNEL__" section
stripped and therefore misses the needed defines.
Depending on the include order, the batman-adv might fail.
This commit provides a workaround by ensuring that the full-blown
uapi variant is included first.
Eventually, the issue should be fixed in make-kpkg and this commit
reverted (no response from the make-kpkg Debian maintainer yet).
For future reference and updates:
* https://www.open-mesh.org/issues/322
Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
102146d65c50f14d461616a5da6f25fd77a61595
compat.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/compat.h b/compat.h
index d61a30e..8e23911 100644
--- a/compat.h
+++ b/compat.h
@@ -164,4 +164,13 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
#endif /* < KERNEL_VERSION(4, 3, 0) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+
+/* workaround for current issues with Debian's make-kpkg */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+#include <uapi/linux/pkt_cls.h>
+#endif
+
+#endif /* < KERNEL_VERSION(4, 6, 0) */
+
#endif /* _NET_BATMAN_ADV_COMPAT_H_ */
5 years, 6 months
[linux-merge]linux integration; annotated tag, v4.10-rc5, created. v4.10-rc5
by postmaster@open-mesh.org
The annotated tag, v4.10-rc5 has been created
at 01a49c26cbeb8c074c5e5ea212a67d92d62307dc (tag)
tagging 7a308bb3016f57e5be11a677d15b821536419d36 (commit)
replaces v4.10-rc4
tagged by Linus Torvalds
on Sun Jan 22 12:54:21 2017 -0800
- Shortlog ------------------------------------------------------------
Linux 4.10-rc5
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJYhRv9AAoJEHm+PkMAQRiG/uAH+wYT9qwvT460pUC6F1X5PNdN
H5KvaGsRNP1SjjQid5CrAFFDs52pFKf9GoV0Rn2WRoHAmEF1Dps4y/bMtR1GlsRB
IfOU+bnmH1Mmj4RCXUoFgFgYJVXC0WOz9SM5aCOAAZLCRF9BdkTpRo8lijuh141k
7YMqpaRhr/rJvQRZMEX+Q8HhfyNHz53olrykYp+O4x5F/CUihFzH76pY28j0YihS
wd/DdxrWyFn35DcFGfDb3yK7J2a6pGtnFw3RP4gU8DsH/Ks0133cR/2lOAtGDECN
dAGbLHoTvj3L4Twz5aiH6WRkXUkfDLK9UhxD/82UgLLmP5XvG1RdKZUNQ60CL5g=
=2TBu
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
5 years, 6 months
[batman-adv] master: batman-adv: Remove usage of net_device last_rx member (78f7272)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 78f72725ad8cb5852b6af6f178e35eaf5931f281
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Wed Jan 18 17:45:01 2017 +0100
batman-adv: Remove usage of net_device last_rx member
The network stack no longer uses the last_rx member of struct net_device
since the bonding driver switched to use its own private last_rx in
commit 9f242738376d ("bonding: use last_arp_rx in slave_last_rx()").
However, some drivers still (ab)use the field for their own purposes and
some driver just update it without actually using it.
Previously, there was an accompanying comment for the last_rx member
added in commit 4dc89133f49b ("net: add a comment on netdev->last_rx")
which asked drivers not to update is, unless really needed. However,
this commend was removed in commit f8ff080dacec ("bonding: remove
useless updating of slave->dev->last_rx"), so some drivers added later
on still did update last_rx.
Remove all usage of last_rx and switch three drivers (sky2, atp and
smc91c92_cs) which actually read and write it to use their own private
copy in netdev_priv.
Compile-tested with allyesconfig and allmodconfig on x86 and arm.
Cc: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Jay Vosburgh <j.vosburgh(a)gmail.com>
Cc: Veaceslav Falico <vfalico(a)gmail.com>
Cc: Andy Gospodarek <andy(a)greyhouse.net>
Cc: Mirko Lindner <mlindner(a)marvell.com>
Cc: Stephen Hemminger <stephen(a)networkplumber.org>
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Acked-by: Eric Dumazet <edumazet(a)google.com>
Reviewed-by: Jay Vosburgh <jay.vosburgh(a)canonical.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
78f72725ad8cb5852b6af6f178e35eaf5931f281
net/batman-adv/bridge_loop_avoidance.c | 1 -
net/batman-adv/distributed-arp-table.c | 1 -
net/batman-adv/soft-interface.c | 2 --
3 files changed, 4 deletions(-)
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 2d22fd5..ba8420d 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -449,7 +449,6 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,
batadv_inc_counter(bat_priv, BATADV_CNT_RX);
batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
skb->len + ETH_HLEN);
- soft_iface->last_rx = jiffies;
netif_rx(skb);
out:
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 942be77..b13c018 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -1051,7 +1051,6 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
bat_priv->soft_iface);
bat_priv->stats.rx_packets++;
bat_priv->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size;
- bat_priv->soft_iface->last_rx = jiffies;
netif_rx(skb_new);
batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n");
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 233a823..b506781 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -482,8 +482,6 @@ void batadv_interface_rx(struct net_device *soft_iface,
batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
skb->len + ETH_HLEN);
- soft_iface->last_rx = jiffies;
-
/* Let the bridge loop avoidance check the packet. If will
* not handle it, we can safely push it up.
*/
5 years, 6 months
[batman-adv] master: Merge branch 'maint' (3882bab)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 3882bab2cb2c5d4555107a763c1cbe937370986c
Merge: c11379b 205dc83
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Jan 17 09:00:18 2017 +0100
Merge branch 'maint'
>---------------------------------------------------------------
3882bab2cb2c5d4555107a763c1cbe937370986c
net/batman-adv/fragmentation.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --cc net/batman-adv/fragmentation.c
index 92e411d,0854ebd..eb85153
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@@ -509,9 -509,9 +509,9 @@@ int batadv_frag_send_packet(struct sk_b
batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES,
skb_fragment->len + ETH_HLEN);
ret = batadv_send_unicast_skb(skb_fragment, neigh_node);
- if (ret != NET_XMIT_SUCCESS) {
+ if (ret != NET_XMIT_SUCCESS && ret != NET_XMIT_CN) {
ret = NET_XMIT_DROP;
- goto free_skb;
+ goto put_primary_if;
}
frag_header.no++;
5 years, 6 months
[linux-merge]linux integration; annotated tag, v4.10-rc4, created. v4.10-rc4
by postmaster@open-mesh.org
The annotated tag, v4.10-rc4 has been created
at b0131e43d2880f9bda208b0f17570f20280995e9 (tag)
tagging 49def1853334396f948dcb4cedb9347abb318df5 (commit)
replaces v4.10-rc3
tagged by Linus Torvalds
on Sun Jan 15 16:22:05 2017 -0800
- Shortlog ------------------------------------------------------------
Linux 4.10-rc4
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJYfBItAAoJEHm+PkMAQRiGxwcH/0ty31km+oB8VpTEYb0hmToU
XshQBoDnRvdvvbPLXTZeKyhHxXhklqEhMHkqTmmSYhh5qd2F0rG2egVXGOpna64r
D4NDsPdssejQ/dGSoUmEloaJax7Tgo7qCPL8Q0ibuDdCgrGMA9zKrdmXXTwHCS2V
zGwe/ijTxSRjRbZW/JeAdKSPC2YcNI0V0hoAI+5J5Yke8Lf/DuAlu5daIjj1IrGY
pEK1Bol+OZJs81L0905LbROJDk+v/ROCPLHJNhVbIqiVgGEoDI5fbsHP22kYUE70
11Ys3LRSHQHYfRzaMUu8ZwjpZLENw8qGu0wka+kXUquYJrgRcgFl+u5++0EeqWU=
=Jpd4
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
5 years, 6 months
[linux-merge]linux integration; annotated tag, v4.10-rc3, created. v4.10-rc3
by postmaster@open-mesh.org
The annotated tag, v4.10-rc3 has been created
at cb32faa36a6b317fffeb566758519a5d4aa09750 (tag)
tagging a121103c922847ba5010819a3f250f1f7fc84ab8 (commit)
replaces v4.10-rc2
tagged by Linus Torvalds
on Sun Jan 8 14:18:23 2017 -0800
- Shortlog ------------------------------------------------------------
Linux 4.10-rc3
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJYcrqvAAoJEHm+PkMAQRiGKpQH/0OckVeqddhIXyQ1cJLAcbOg
nch+0ou7T4BP4LOC42TAohernLdzLkam4v3kZ2SY6eFZqOvvn1/zI2KAUEFPY25S
qATRmLp/oXDSp066beoFo2SseTFOn6RuRyl1yAHIVB6w379c2zfUuuBu1/2250OQ
2Jp6Zcid4eoPkANan+C2p2OF1I1Ao3p48TounsGIWnBgXgw5cgrVtXrhA/tNmrrf
LVef7JFb/+sFfHcl3zQnif6qPhBSqYwHWHTgE3n2f+lUFL16PGBliW0w5mwrXuXh
avytFu8wYhBMDil63zG2XJ70VDptmSqFXRfryTBZP53QKDxztFbqP+5oWdWD0EY=
=vnk2
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
5 years, 7 months
[batman-adv] master: batman-adv: Remove unused variable in batadv_tt_local_set_flags (c11379b)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit c11379b5d285127f4516f5c81dbcd8039a47f63a
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat Dec 17 11:58:29 2016 +0100
batman-adv: Remove unused variable in batadv_tt_local_set_flags
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
c11379b5d285127f4516f5c81dbcd8039a47f63a
net/batman-adv/translation-table.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 941afad..6077a87 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -3714,7 +3714,6 @@ static void batadv_tt_local_set_flags(struct batadv_priv *bat_priv, u16 flags,
{
struct batadv_hashtable *hash = bat_priv->tt.local_hash;
struct batadv_tt_common_entry *tt_common_entry;
- u16 changed_num = 0;
struct hlist_head *head;
u32 i;
@@ -3736,7 +3735,6 @@ static void batadv_tt_local_set_flags(struct batadv_priv *bat_priv, u16 flags,
continue;
tt_common_entry->flags &= ~flags;
}
- changed_num++;
if (!count)
continue;
5 years, 7 months
[batman-adv] maint: batman-adv: Decrease hardif refcnt on fragmentation send error (205dc83)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : maint
>---------------------------------------------------------------
commit 205dc8385dc863467f4f6ccec2e63254e6baf831
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Dec 27 08:51:17 2016 +0100
batman-adv: Decrease hardif refcnt on fragmentation send error
An error before the hardif is found has to free the skb. But every error
after that has to free the skb + put the hard interface.
Fixes: 8b4132b1447a ("batman-adv: Consume skb in batadv_frag_send_packet")
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
205dc8385dc863467f4f6ccec2e63254e6baf831
net/batman-adv/fragmentation.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index 9c561e6..0854ebd 100644
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -474,7 +474,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
primary_if = batadv_primary_if_get_selected(bat_priv);
if (!primary_if) {
ret = -EINVAL;
- goto put_primary_if;
+ goto free_skb;
}
/* Create one header to be copied to all fragments */
@@ -502,7 +502,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
skb_fragment = batadv_frag_create(skb, &frag_header, mtu);
if (!skb_fragment) {
ret = -ENOMEM;
- goto free_skb;
+ goto put_primary_if;
}
batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX);
@@ -511,7 +511,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
ret = batadv_send_unicast_skb(skb_fragment, neigh_node);
if (ret != NET_XMIT_SUCCESS) {
ret = NET_XMIT_DROP;
- goto free_skb;
+ goto put_primary_if;
}
frag_header.no++;
@@ -519,7 +519,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
/* The initial check in this function should cover this case */
if (frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1) {
ret = -EINVAL;
- goto free_skb;
+ goto put_primary_if;
}
}
@@ -527,7 +527,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
if (batadv_skb_head_push(skb, header_size) < 0 ||
pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) {
ret = -ENOMEM;
- goto free_skb;
+ goto put_primary_if;
}
memcpy(skb->data, &frag_header, header_size);
5 years, 7 months
[linux-merge]linux integration; annotated tag, v4.10-rc2, created. v4.10-rc2
by postmaster@open-mesh.org
The annotated tag, v4.10-rc2 has been created
at eaa30079ff1896aa415b0fd5b153fccc11ac570e (tag)
tagging 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (commit)
replaces v4.10-rc1
tagged by Linus Torvalds
on Sun Jan 1 14:32:05 2017 -0800
- Shortlog ------------------------------------------------------------
Linux 4.10-rc2
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJYaYNlAAoJEHm+PkMAQRiGtCUH/18PMUJpHqRKjxL3Yscw+QZC
RmGlD/hwBRLUSgiTCfURNGKP4QZv2kQW7BGsGC72oL01lmxozsU72ixUIO+wXzDY
K2b0OOKGZZWzFtaVm7Qs+5JhHAEKZcT046mLD8sjJuqkrFAhmNLKdwHjihKBEkm9
J3s2tpdXdN0x/Uyga/GY9khEYIrvLPeBoKSz+JXcQKdC0iq3/+PMpWnN47QCNScr
7azojkJkj/rs2cqVdOi7Wbh6PSqIvPsl8E3qJefpaVJF/IQaU1pFdy5g8kYm4V7T
fr6HgIbuN4EQWdN/5cgKrUdpQyV7D8iYx02klk4R8WgfS0QMYoUcsg+XsTd02TI=
=OhGe
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
5 years, 7 months