commits February 2014

commits@lists.open-mesh.org

1 participants
64 discussions

[batman-adv] master: Merge branch 'next' (b8ffcbc)
by postmaster＠open-mesh.org 08 Feb '14

08 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b8ffcbc4a061aada81d5e1756f17f4021b6427c5 Merge: fbe649d b04eca1 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Feb 8 21:16:34 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- b8ffcbc4a061aada81d5e1756f17f4021b6427c5

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (b04eca1)
by postmaster＠open-mesh.org 08 Feb '14

08 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: b921e8f batman-adv: backport eth_hdr() compat fix to avoid kernel oops b04eca1 Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (b04eca1)
by postmaster＠open-mesh.org 08 Feb '14

08 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit b04eca1dfa2e2cca2a28821bce137fadd4d8548f Merge: e175a9f b921e8f Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Feb 8 21:15:01 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- b04eca1dfa2e2cca2a28821bce137fadd4d8548f compat.h | 11 +++++++++++ 1 file changed, 11 insertions(+)

1 0

[batman-adv] maint: batman-adv: backport eth_hdr() compat fix to avoid kernel oops (b921e8f)
by postmaster＠open-mesh.org 08 Feb '14

08 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit b921e8f70aa929766856decfe79ee8e78ba21e23 Author: Linus Lüssing <linus.luessing(a)web.de> Date: Sun Feb 2 22:53:11 2014 +0800 batman-adv: backport eth_hdr() compat fix to avoid kernel oops Introduced by 41b38727749a94c1a65cf0f4be9bfe1cbaf0adeb ("batman-adv: fix potential kernel paging error for unicast transmissions") Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> CC: Linus Lüssing <linus.luessing(a)web.de> >--------------------------------------------------------------- b921e8f70aa929766856decfe79ee8e78ba21e23 compat.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/compat.h b/compat.h index a4ab202..deea92b 100644 --- a/compat.h +++ b/compat.h @@ -289,6 +289,17 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) \ }\ static int __batadv_interface_set_mac_addr(x, y) +#define batadv_interface_tx(x, y) \ +__batadv_interface_tx(struct sk_buff *skb, struct net_device *soft_iface); \ +static int batadv_interface_tx(struct sk_buff *skb, \ + struct net_device *soft_iface) \ +{ \ + skb_reset_mac_header(skb); \ + return __batadv_interface_tx(skb, soft_iface); \ +} \ +static int __batadv_interface_tx(struct sk_buff *skb, \ + struct net_device *soft_iface) + #define netdev_master_upper_dev_link netdev_set_master #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) #define netdev_master_upper_dev_get(dev) \

1 0

[linux-merge]linux integration; annotated tag, v3.14-rc1, created. v3.14-rc1
by postmaster＠open-mesh.org 03 Feb '14

03 Feb '14

The annotated tag, v3.14-rc1 has been created at 08499ec1a4c8d859c71564d56890442f2f1ac8ed (tag) tagging 38dbfb59d1175ef458d006556061adeaa8751b72 (commit) replaces batman-adv-for-davem tagged by Linus Torvalds on Sun Feb 2 16:42:23 2014 -0800 - Shortlog ------------------------------------------------------------ Linus 3.14-rc1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJS7uXvAAoJEHm+PkMAQRiGoN0H/AzQxHoBV1mx0pembqRtWrf6 YgdtEP0rwDmFEFsCFIGZ6DNhI4zMN+enqdo+A73F25j1fPx9crApHxY9LNr7Mt+J lHW1Ej3S8Dxxep2BH7nNu+7zKlLfDhtllkYZh2ROHrlvXBTRTKCDuv9yGorRZ3Q9 5B73r1NF67Z1OStTJSDvS6RC2YzkIfAlVz8FKwG6iQMy28Vb41p8ZIowVRY+4d0u Pyzi9Q+cXBL7s9RHq5tqtETX4xO7SHeUjMDOJ1+Wogdt2/sTNUS7gpQ8Ls2/7a9B 4oGwxA2JKgsuM3KDQH2/eFVEzsnA1KSpOPdEVHNglrEzEgib9afhDx1+QzmzbCs= =XuS+ -----END PGP SIGNATURE----- David S. Miller (3): Revert "batman-adv: drop dependency against CRC16" Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Marek Lindner (1): batman-adv: fix batman-adv header overhead calculation ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master (21e35a2)
by postmaster＠open-mesh.org 02 Feb '14

02 Feb '14

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 21e35a2f5c7caef81c56e4fc2d202e3ddb91578e Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Feb 2 23:04:04 2014 +0800 batman-adv-devel: update to latest master Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 21e35a2f5c7caef81c56e4fc2d202e3ddb91578e batman-adv-devel/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 9612da2..67b4c8a 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -32,7 +32,7 @@ config KMOD_BATMAN_ADV_DEVEL_BATMAN_REV string prompt "batman-adv git revision to build package with" depends on PACKAGE_kmod-batman-adv-devel - default "8eb830f" + default "fbe649d" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches @@ -42,7 +42,7 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL_REV string prompt "batctl git revision to build package with" depends on PACKAGE_kmod-batman-adv-devel - default "b8eaea8" + default "abe78a5" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches

1 0

[batman-adv] master: Merge branch 'next' (fbe649d)
by postmaster＠open-mesh.org 02 Feb '14

02 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit fbe649dfdd07d871f5b47b5e8ea1b03d104feb9d Merge: f6a1006 e175a9f Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Feb 2 22:57:58 2014 +0800 Merge branch 'next' Conflicts: send.c >--------------------------------------------------------------- fbe649dfdd07d871f5b47b5e8ea1b03d104feb9d routing.c | 2 +- send.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --cc send.c index 3d83bf9,1703a2e..31a8c19 --- a/send.c +++ b/send.c @@@ -254,8 -254,8 +254,8 @@@ static int batadv_send_skb_unicast(stru struct batadv_orig_node *orig_node, unsigned short vid) { - struct ethhdr *ethhdr = eth_hdr(skb); - struct ethhdr *ethhdr; struct batadv_unicast_packet *unicast_packet; ++ struct ethhdr *ethhdr; int ret = NET_XMIT_DROP; if (!orig_node)

1 0

[batman-adv] master's head updated: Merge branch 'next' (fbe649d)
by postmaster＠open-mesh.org 02 Feb '14

02 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: eabdc31 batman-adv: properly check pskb_may_pull return value 9a91d33 batman-adv: remove useless assignment e175a9f Merge branch 'maint' into next fbe649d Merge branch 'next'

1 0

[batman-adv] next: Merge branch 'maint' into next (e175a9f)
by postmaster＠open-mesh.org 02 Feb '14

02 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit e175a9fd8ec8e02cbabe814c6146c9944ecc44ae Merge: fedc76c 9a91d33 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Feb 2 22:55:17 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- e175a9fd8ec8e02cbabe814c6146c9944ecc44ae routing.c | 2 +- send.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (e175a9f)
by postmaster＠open-mesh.org 02 Feb '14

02 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: eabdc31 batman-adv: properly check pskb_may_pull return value 9a91d33 batman-adv: remove useless assignment e175a9f Merge branch 'maint' into next

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2014