commits January 2013

commits@lists.open-mesh.org

1 participants
119 discussions

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 28 Jan '13

28 Jan '13

The annotated tag, batman-adv-for-davem has been updated to 1e87b5ae4db69514f4b229caf2c7246d24f7e624 (tag) from fa6f1f2a87981b61b66ebaf61096713b02a9e42c (which is now obsolete) tagging b37f0f82b08de2ce352ad70f6ee8d064169265dd (commit) replaces v3.8-rc3 tagged by Antonio Quartulli on Mon Jan 28 20:39:22 2013 +0100 - Shortlog ------------------------------------------------------------ Included changes: - fix recently introduced output behaviour -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJRBtQcAAoJEADl0hg6qKeOzLYP/jTB6VDbaWXAf7zxCdHLh2GF 1gaEih2pfR6KhGDJnxEDRl5JkAPXd3SCW0vuKhLGVaQSDTF6AvRGJzk4mIhd7E03 G3Wb0LOS+x5QO1pfpncHT+chhLLAcjsuBvMHLLfGgPVX6IQirwZjsKU8Lx9tyvtg EmeWo0LmaY3zfsA8+ttjJRm7P5DoCB3KkEK+GMrqzkgH0ZqiRtCjf5wL3iWAhdet 4QFYKHxAc6aE5ApolHBZwqDWrYtmi1Cjl8+3W5D7xzTR3LbvDdQSz9nClYiarH0h mKVP+1P4g1/KMSXcI7FdzqYsXfkMJEHes68xjRuanZ25dYF0yO0Ye4aSiCR7rBTM vTfbzAG7B34HzO0RFmBzinI9bdWjb0i7F7hdpFqkIsbFdyuS8TnOk9UmTJCtFe79 g1iqbVWJ2z4JtR0OkB7saDkn3yWPKG5nyq4aPbcxWEQWuBSPa0lRaupIs29uReCT A+XaZ6PyB+bybmEhnV/CU+lDf/y9O241/qKy3rJg4n9dHSXxM98CKaspEqRY8KQM 5z0sn5yMAEk1hDig0wSjtRN1PSjls8FzBonHmtbd3wSo5VuQhIMEMK996jxrwZcA CvFtCTp1H3We9hxI9RHrgOlUPR4Ne7R5qAn+C+yiocnIdLmnFIP7NIsc2NZy9j3h ngiBy5itYFZpZnXW3TBd =31WM -----END PGP SIGNATURE----- Akinobu Mita (1): batman-adv: rename random32() to prandom_u32() Antonio Quartulli (15): batman-adv: reduce local TT entry timeout to 10 minutes batman-adv: improve local translation table output batman-adv: print the CRC together with the translation tables batman-adv: unify and properly print hex values batman-adv: remove useless assignment in tt_local_add() batman-adv: Initialize lockdep class keys for hashes batman-adv: remove useless blank lines before and after brackets batman-adv: remove useless NULL check batman-adv: don't compile the BLA switch if not requested batman-adv: use the const qualifier in hash functions batman-adv: fix typo in debug message batman-adv: a delayed_work has to be initialised once batman-adv: update copyright years batman-adv: Start new development cycle batman-adv: fix local translation table output Jiri Pirko (2): net: remove unnecessary NET_ADDR_RANDOM "bitclean" ethtool: fix drvinfo strings set in drivers Linus Lüssing (1): batman-adv: Do not add multicast MAC addresses to translation table Marek Lindner (10): batman-adv: remove unused variable from orig_node struct batman-adv: unbloat batadv_priv if debug is not enabled batman-adv: align kernel doc properly batman-adv: mark debug_log struct as bat_priv only struct batman-adv: group tt type definitions together batman-adv: rename batadv_if_list_entry struct to make clear it is used by vis batman-adv: rename batadv_recvlist_node struct to make clear it is used by vis batman-adv: rename batadv_backbone_gw struct to make clear it is used by bla batman-adv: rename batadv_claim struct to make clear it is used by bla batman-adv: kernel doc for types.h Shan Wei (1): batman-adv: use per_cpu_add helper Simon Wunderlich (1): batman-adv: postpone sysfs removal when unregistering ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.8-rc1-1688-g58ad6a5
by postmaster＠open-mesh.org 28 Jan '13

28 Jan '13

The following commit has been merged in the merge/master branch: commit 58ad6a50d49f703efc4b19f52256bf3c31113c0b Merge: 951874dabd1c8766e74905ed5bff691b8c04e6f3 46360b2a2df3226e9c69ae1e9e7d64b6f18dcf4b Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Jan 28 20:35:51 2013 +0100 Merge remote-tracking branch 'pkg/next' into merge/master diff --combined net/batman-adv/translation-table.c index fb15b4c,d44672f..d44672f --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -517,8 -517,8 +517,8 @@@ int batadv_tt_local_seq_print_text(stru BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - no_purge ? last_seen_secs : 0, - no_purge ? last_seen_msecs : 0); + no_purge ? 0 : last_seen_secs, + no_purge ? 0 : last_seen_msecs); } rcu_read_unlock(); } -- linux integration

1 0

[batman-adv] master: Merge branch 'next' (cfc790d)
by postmaster＠open-mesh.org 28 Jan '13

28 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit cfc790ddceebe44206329eaacd906bd75b6218ce Merge: a365cf4 46360b2 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Jan 29 01:23:14 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- cfc790ddceebe44206329eaacd906bd75b6218ce translation-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (cfc790d)
by postmaster＠open-mesh.org 28 Jan '13

28 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 46360b2 batman-adv: fix local translation table output cfc790d Merge branch 'next'

1 0

[batman-adv] next: batman-adv: fix local translation table output (46360b2)
by postmaster＠open-mesh.org 28 Jan '13

28 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 46360b2a2df3226e9c69ae1e9e7d64b6f18dcf4b Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jan 24 11:41:39 2013 +0100 batman-adv: fix local translation table output The last-seen field has to be printed for all the local entries but the one marked with the no-purge flag Introduced by 15727323d9f8864b2d41930940acc38de987045a ("batman-adv: don't print the last_seen time for bat0 TT local entry") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 46360b2a2df3226e9c69ae1e9e7d64b6f18dcf4b translation-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index fb15b4c..d44672f 100644 --- a/translation-table.c +++ b/translation-table.c @@ -517,8 +517,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - no_purge ? last_seen_secs : 0, - no_purge ? last_seen_msecs : 0); + no_purge ? 0 : last_seen_secs, + no_purge ? 0 : last_seen_msecs); } rcu_read_unlock(); }

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.8-rc1-1684-g951874d
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

The following commit has been merged in the merge/master branch: commit 951874dabd1c8766e74905ed5bff691b8c04e6f3 Merge: 30664a70de5e9e184497d96da075f563b6b217dc ab361a9ccc584e7501c06bfe1c00cb0411feebaf Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Jan 27 13:59:43 2013 +0100 Merge remote-tracking branch 'pkg/maint' into merge/master diff --combined net/batman-adv/distributed-arp-table.c index 7485a78,ea0bd31..ea0bd31 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@@ -738,6 -738,7 +738,7 @@@ static uint16_t batadv_arp_get_type(str struct arphdr *arphdr; struct ethhdr *ethhdr; __be32 ip_src, ip_dst; + uint8_t *hw_src, *hw_dst; uint16_t type = 0; /* pull the ethernet header */ @@@ -777,9 -778,23 +778,23 @@@ ip_src = batadv_arp_ip_src(skb, hdr_size); ip_dst = batadv_arp_ip_dst(skb, hdr_size); if (ipv4_is_loopback(ip_src) || ipv4_is_multicast(ip_src) || - ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst)) + ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst) || + ipv4_is_zeronet(ip_src) || ipv4_is_lbcast(ip_src) || + ipv4_is_zeronet(ip_dst) || ipv4_is_lbcast(ip_dst)) goto out; + hw_src = batadv_arp_hw_src(skb, hdr_size); + if (is_zero_ether_addr(hw_src) || is_multicast_ether_addr(hw_src)) + goto out; + + /* we don't care about the destination MAC address in ARP requests */ + if (arphdr->ar_op != htons(ARPOP_REQUEST)) { + hw_dst = batadv_arp_hw_dst(skb, hdr_size); + if (is_zero_ether_addr(hw_dst) || + is_multicast_ether_addr(hw_dst)) + goto out; + } + type = ntohs(arphdr->ar_op); out: return type; @@@ -1012,6 -1027,8 +1027,8 @@@ bool batadv_dat_snoop_incoming_arp_repl */ ret = !batadv_is_my_client(bat_priv, hw_dst); out: + if (ret) + kfree_skb(skb); /* if ret == false -> packet has to be delivered to the interface */ return ret; } -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

The annotated tag, batman-adv-fix-for-davem has been updated to b04c04c24d859209035241b3fd9c0912c61beccc (tag) from d0850256e01faff6c5f8fd046ff7f3954ad428ca (which is now obsolete) tagging b618ad1103c9ea0c4a69b44f42fc3c7b4e231e22 (commit) replaces v3.8-rc3 tagged by Antonio Quartulli on Sun Jan 27 17:59:03 2013 +0100 - Shortlog ------------------------------------------------------------ Included changes ares: - fix an skb memleak in DAT - fix the ARP filtering routine in DAT by preventing bogus entries to overwrite already existing ones in the local cache. - fix the ARP filtering routine in DAT by preventing it to parse and add to the cache bogus entries -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJRBV1fAAoJEADl0hg6qKeOJnkQALIJCps/Lx5XE+JKTXYlHM/Z XJs6y5fOZQJiBaRDkp84+802ozcCIUBbZvvzA3GWFIVB63shD+kHrfIQoen8706p XqlV+Z8ut77RKfAK2+gjyGiYhGuWkuN+KRs3ezcgwQnuBqrPSO42aeK4Tnc7/btN kMptwcHH2I81WTKXAbMO1pw6O+0NYOFsI9HV7XAi2eLMNl18LK9D+Oj32MCjI/ZP 8ukKdSGkxF4LLi6giSPAHJyShTHAwgdC/MMPjHtemuyPKxINee8I8zF2rndJ1e5i xl9zaLrdhXFleCmXcrOv7lqVds5kyyZBcQG2ZyIdJl/M5NWkt6BLiILZM8Z7/VX7 tzkJntTHfIftD+Q9MmQsxV79THR7EGUqaxCgRAO3tQwkFFfQoUL8JhnvTS7aeQwq a8lWZH0q/n1aEC2El22D8H17KS+0Ai0osRITWwAAeoL8dx4h8Yc0FKJSVGOH4qrc mSAKxacE7JPOz/j/QkL8yBKj5xx7FBWZOcIs7gVgPuIIMTiQHpHZmztupaYiVZLM ZlavzcnO5NiEidsKzFxrRIj6PaQqq+wACNzELggWdF+ksr7lO3I1pqQTe17VDdeR +RYUI4+ij+94bkvp6uzoQFJH/opeCvgdG7pl+6DkY97pWg52H8eb4Ercaswao2ix q7mBawgcIJAtmzEAXsZp =DvXf -----END PGP SIGNATURE----- Matthias Schiffer (3): batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply() batman-adv: check for more types of invalid IP addresses in DAT batman-adv: filter ARP packets with invalid MAC addresses in DAT ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

The annotated tag, batman-adv-fix-for-davem has been updated to d0850256e01faff6c5f8fd046ff7f3954ad428ca (tag) from 11150be67c35f8bc58f9c807b76b21b26a39554e (which is now obsolete) tagging b618ad1103c9ea0c4a69b44f42fc3c7b4e231e22 (commit) replaces v3.8-rc3 tagged by Antonio Quartulli on Sun Jan 27 14:03:03 2013 +0100 - Shortlog ------------------------------------------------------------ Included fixes are: - three important patches for the new D.A.T. component. One fixes a major skb memory leak. The others fix two bugs in the ARP filter routine which were leading to a big useless memory consumption. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJRBSZsAAoJEADl0hg6qKeOBRYQAJfNPPBAIPoggcwyYPHOEhpU zEyZdHiWhNaYBtHlSSkxFmqyJ0H/5Ien7ufec78krf3cCwAUExMY88FUhHSqTSxn H/mJvP/y15GBfEQpbj+rawLu5myjwVgrbWKK6qi8SM/g16NnDccUiU8rnxt14PTM nRTuyHj5w/k1jNuopI0OrXgt66/WamanpmwKlkQJkeu1YzQXES2qQh9rIx8SSPcr dQv7UwTtmJNuyjMXWliKtAbuyPcKhCQH0XpSDSyPzKXkD/86ekuvXQV0SyX+w6no QL4RzQ18veTAcCe+99jY0RehEmJA059ZPH0U5blTjDSyEJEAAQ9hAcsSjbsuc4ev oSgcBCSd4F+Vlj0mx4du64GW3Y5UDebb9Qb4lWZ+E8Gczq2MKtIo+QCmOJTin7Gg 8Z2siQYX38IRV3pKcLKoQIPGB1VQAutuZG2fOkKRtY59EUotxV3MChOwDuYIM2Hx tdvizITOaXdJBLYbBb3JoYEb8KnEfHcBHHxlfZmFVN6YXwhJmC6gzf+ERfZwqpcA MNkExrLuoCZRVYVBBDIljbXl3/d2x9QRTZUjV7C/rJqzl9nAkVwMRky0HfuJ4liJ KmiMsU8ehxq4MqDl7dQ2AC8ECkPXqZsusU/ydAczBajtSF55r3FXrNauIpNBc8W/ HIQEzIKWvARXx21YCWgG =ZRG7 -----END PGP SIGNATURE----- Matthias Schiffer (3): batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply() batman-adv: check for more types of invalid IP addresses in DAT batman-adv: filter ARP packets with invalid MAC addresses in DAT ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: don't use !! in bool conversion (a365cf4)
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a365cf492099993c10ba6085ccf9528f7dbe3e9f Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Jan 15 22:17:19 2013 +1000 batman-adv: don't use !! in bool conversion In C standard any expression different from 0 will be converted to 'true' when casting to bool (whatever is the length of the value). Therefore all the "!!" conversions can be removed. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a365cf492099993c10ba6085ccf9528f7dbe3e9f translation-table.c | 4 ++-- unicast.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/translation-table.c b/translation-table.c index 607fd3c..3966050 100644 --- a/translation-table.c +++ b/translation-table.c @@ -906,7 +906,7 @@ out_remove: /* remove address from local hash if present */ local_flags = batadv_tt_local_remove(bat_priv, tt_addr, "global tt received", - !!(flags & BATADV_TT_CLIENT_ROAM)); + flags & BATADV_TT_CLIENT_ROAM); tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI; if (!(flags & BATADV_TT_CLIENT_ROAM)) @@ -2527,7 +2527,7 @@ bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv, if (!tt_global_entry) goto out; - ret = !!(tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM); + ret = tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM; batadv_tt_global_entry_free_ref(tt_global_entry); out: return ret; diff --git a/unicast.c b/unicast.c index 50e079f..0bb3b59 100644 --- a/unicast.c +++ b/unicast.c @@ -122,7 +122,7 @@ batadv_frag_search_packet(struct list_head *head, { struct batadv_frag_packet_list_entry *tfp; struct batadv_unicast_frag_packet *tmp_up = NULL; - int is_head_tmp, is_head; + bool is_head_tmp, is_head; uint16_t search_seqno; if (up->flags & BATADV_UNI_FRAG_HEAD) @@ -130,7 +130,7 @@ batadv_frag_search_packet(struct list_head *head, else search_seqno = ntohs(up->seqno)-1; - is_head = !!(up->flags & BATADV_UNI_FRAG_HEAD); + is_head = up->flags & BATADV_UNI_FRAG_HEAD; list_for_each_entry(tfp, head, list) { if (!tfp->skb) @@ -142,7 +142,7 @@ batadv_frag_search_packet(struct list_head *head, tmp_up = (struct batadv_unicast_frag_packet *)tfp->skb->data; if (tfp->seqno == search_seqno) { - is_head_tmp = !!(tmp_up->flags & BATADV_UNI_FRAG_HEAD); + is_head_tmp = tmp_up->flags & BATADV_UNI_FRAG_HEAD; if (is_head_tmp != is_head) return tfp; else

1 0

[batman-adv] master: batman-adv: Return reason for failure in batadv_check_unicast_packet() (ff41008)
by postmaster＠open-mesh.org 27 Jan '13

27 Jan '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ff41008f82fe469b1bbffb45221f9ef0b4eaf494 Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Mon Jan 14 00:20:32 2013 +0100 batman-adv: Return reason for failure in batadv_check_unicast_packet() batadv_check_unicast_packet() is changed to return a value based on the reason to drop the packet, which will be useful information for future users of batadv_check_unicast_packet(). Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- ff41008f82fe469b1bbffb45221f9ef0b4eaf494 routing.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/routing.c b/routing.c index 60ba03f..b070163 100644 --- a/routing.c +++ b/routing.c @@ -550,27 +550,37 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig, return router; } +/** + * batadv_check_unicast_packet - Check for malformed unicast packets + * @skb: packet to check + * @hdr_size: size of header to pull + * + * Check for short header and bad addresses in given packet. Returns negative + * value when check fails and 0 otherwise. The negative value depends on the + * reason: -ENODATA for bad header, -EBADR for broadcast destination or source, + * and -EREMOTE for non-local (other host) destination. + */ static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size) { struct ethhdr *ethhdr; /* drop packet if it has not necessary minimum size */ if (unlikely(!pskb_may_pull(skb, hdr_size))) - return -1; + return -ENODATA; ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with unicast indication but broadcast recipient */ if (is_broadcast_ether_addr(ethhdr->h_dest)) - return -1; + return -EBADR; /* packet with broadcast sender address */ if (is_broadcast_ether_addr(ethhdr->h_source)) - return -1; + return -EBADR; /* not for me */ if (!batadv_is_my_mac(ethhdr->h_dest)) - return -1; + return -EREMOTE; return 0; }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2013