B.A.T.M.A.N October 2012

b.a.t.m.a.n@lists.open-mesh.org

24 participants
68 discussions

[B.A.T.M.A.N.] pull request: batman-adv 2012-10-28
by Antonio Quartulli 29 Oct '12

29 Oct '12

Hello David, this is our first set of changes intended for net-next/linux-3.8. Here you have a patch by Sven Eckelmann that introduces new lockdep classes for batman-adv virtual interfaces. Then a patch by Simon Wunderlich that adds a filter aimed to silently drop ECTP packets (we saw there are still some devices sending them around and then creating problems to our bridge loop avoidance mechanism). The rest are cleanups, minor fixes and a small struct re-shaping. Thank you very much, Antonio The following changes since commit f019948dbb388eacbc0fb61db1d30e686224df77: Merge branch 'master' of git://1984.lsi.us.es/nf-next (2012-10-26 14:40:55 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 2186a06ac573db625b5864d1feb963c2bf0dacac: batman-adv: add kernel-doc for enum batadv_dbg_level (2012-10-27 17:06:38 +0200) ---------------------------------------------------------------- included changes: - some code cleanups and minor fixes (3 of them were reported by Coverity) - 'struct hard_iface' re-shaping to improve multi-protocol support - ECTP packets silent drop - transfer the WIFI flag on clients in case of roaming ---------------------------------------------------------------- Antonio Quartulli (8): batman-adv: use check_unicast_packet() in recv_roam_adv() batman-adv: return proper value in case of hash_add failure batman-adv: properly store the roaming time batman-adv: print packets re-routing on DBG_TT and ratelimit it batman-adv: check for more space before accessing the skb batman-adv: properly convert flag into a boolean value batman-adv: pass the WIFI flag from the local to global entry batman-adv: add kernel-doc for enum batadv_dbg_level Marek Lindner (3): batman-adv: split hard_iface struct for each routing protocol batman-adv: separate BATADV_ATTR_HIF_UINT sysfs name from hard-iface variable batman-adv: consolidate duplicated primary_if checking code Simon Wunderlich (1): batman-adv: don't allow ECTP traffic on batman-adv Sven Eckelmann (4): batman-adv: Set special lockdep classes to avoid lockdep warning batman-adv: Remove extra check in batadv_bit_get_packet batman-adv: Check return value of try_module_get batman-adv: Only increase refcounter once for alternate router net/batman-adv/bat_iv_ogm.c | 43 ++++++++++--------- net/batman-adv/bitarray.c | 23 +++++----- net/batman-adv/bridge_loop_avoidance.c | 36 +++------------- net/batman-adv/debugfs.c | 6 ++- net/batman-adv/gateway_client.c | 19 ++------- net/batman-adv/hard-interface.c | 4 +- net/batman-adv/icmp_socket.c | 12 ++++-- net/batman-adv/main.c | 46 +++++++++++++++----- net/batman-adv/main.h | 19 ++++++--- net/batman-adv/originator.c | 19 ++------- net/batman-adv/routing.c | 54 +++++++++--------------- net/batman-adv/soft-interface.c | 56 ++++++++++++++++++++++++- net/batman-adv/sysfs.c | 15 +++---- net/batman-adv/translation-table.c | 77 +++++++++++++++++----------------- net/batman-adv/translation-table.h | 6 +-- net/batman-adv/types.h | 16 +++++-- 16 files changed, 246 insertions(+), 205 deletions(-)

4 20

[B.A.T.M.A.N.] batman for production
by Walter Robert Ditzler 29 Oct '12

29 Oct '12

hi sven, first: sorry about replying that way - i have an account but somehow i couldn't post anything here! second: i have a working test environment running, all works great, but i am not familiar with the update mechanism of batman. I don't want to replace any good version if the latest kernel has already the best possible version of batman. third: here are actually my doubts. to configure a mesh within batman you normally use batctl. so are those patches for batctl or for the batman-adv itself and how can I get the right batctl corresponding to the batman-adv version from kernel.org 3.6.3? or is it even better to configure batman-adv via the sys classes (echo bat0 > /sys/class/net/eth0/batman_adv/mesh_iface)? thanks a lot, walter -----Original Message----- From: Sven Eckelmann [mailto:sven@narfation.org] Sent: Sonntag, 28. Oktober 2012 15:34 To: Walter Robert Ditzler Cc: b.a.t.m.a.n(a)lists.open-mesh.org Subject: Re: Re: [B.A.T.M.A.N.] [PATCH 16/16] batman-adv: add kernel-doc for enum batadv_dbg_level On Sunday 28 October 2012 14:32:46 Walter Robert Ditzler wrote: > hi batman list, > > i recently saw there is a bounce of email in the batman community > regarding patches. Please don't reply to a random posts to start a new topic. And don't write to the Linux networking mailing list and the Linux networking maintainer David S. Miller when you actually want to ask the "b.a.t.m.a.n mailing list". And yes, you will see patches going over this list the whole time. Either because somebody wants to get stuff integrated into some B.A.T.M.A.N. related project or because the patches were sent to our Linux networking god David S. Miller. So nothing unusal happened. > is it safe and reliable to use the version from the open-mesh.org > site: > > - inux 3.6 => batman-adv 2012.3.x (get batctl 2012.3.x from here) Ehrm, ehrm, ehrm, ehrm, oehm, aehm.... I will not guarantee anything. It is safe to use this stuff until anyone proofed it otherwise. But we have some fixes in the maint branch which weren't released yet in form of 2012.3.1 or 2012.4.0. But they are included in the stable releases of Linux 3.6.x > for production use onto the following configuration: > > os: debian 6.0.6 > kernel: 3.6.3, batman activated > arch: geode lx and amd64 Now you baffled me completely. Linux 3.6.3 is the stable release which includes batman-adv 2012.3.0 + stable fixes. And you want to replace it with 2012.3.0 without these stable fixes. Can you give me a reason why this sounded to you like a good idea? Even without these stable fixes... why would you replace the in-kernel module with the out-of-tree module of the same version? Kind regards, Sven

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix broadcast duplist for fragmentation
by Simon Wunderlich 27 Oct '12

27 Oct '12

If the skb is fragmented, the checksum must be computed on the individual fragments, just using skb->data may fail on fragmented data. Instead of doing linearizing the packet, use the new batadv_crc32 to do that more efficiently- it should not hurt replacing the old crc16 by the new crc32. Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- bridge_loop_avoidance.c | 18 +++++++----------- bridge_loop_avoidance.h | 3 +-- routing.c | 10 +++------- types.h | 2 +- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index c6c1c59..b766441 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1247,8 +1247,7 @@ int batadv_bla_init(struct batadv_priv *bat_priv) /** * batadv_bla_check_bcast_duplist * @bat_priv: the bat priv with all the soft interface information - * @bcast_packet: encapsulated broadcast frame plus batman header - * @bcast_packet_len: length of encapsulated broadcast frame plus batman header + * @skb: contains the bcast_packet to be checked * * check if it is on our broadcast list. Another gateway might * have sent the same packet because it is connected to the same backbone, @@ -1260,20 +1259,17 @@ int batadv_bla_init(struct batadv_priv *bat_priv) * the same host however as this might be intended. */ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, - struct batadv_bcast_packet *bcast_packet, - int bcast_packet_len) + struct sk_buff *skb) { - int i, length, curr, ret = 0; - uint8_t *content; - uint16_t crc; + int i, curr, ret = 0; + uint32_t crc; + struct batadv_bcast_packet *bcast_packet; struct batadv_bcast_duplist_entry *entry; - length = bcast_packet_len - sizeof(*bcast_packet); - content = (uint8_t *)bcast_packet; - content += sizeof(*bcast_packet); + bcast_packet = (struct batadv_bcast_packet *)skb->data; /* calculate the crc ... */ - crc = crc16(0, content, length); + crc = batadv_skb_crc32(skb, (u8 *)(bcast_packet + 1)); spin_lock_bh(&bat_priv->bla.bcast_duplist_lock); diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 789cb73..f1bc9cd 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -31,8 +31,7 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset); int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig); int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, - struct batadv_bcast_packet *bcast_packet, - int hdr_size); + struct sk_buff *skb); void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, struct batadv_hard_iface *primary_if, struct batadv_hard_iface *oldif); diff --git a/routing.c b/routing.c index 5da62df..5da7724 100644 --- a/routing.c +++ b/routing.c @@ -1181,16 +1181,12 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, spin_unlock_bh(&orig_node->bcast_seqno_lock); - /* keep skb linear for crc calculation */ - if (skb_linearize(skb) < 0) - goto out; - - bcast_packet = (struct batadv_bcast_packet *)skb->data; - /* check whether this has been sent by another originator before */ - if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) + if (batadv_bla_check_bcast_duplist(bat_priv, skb)) goto out; + bcast_packet = (struct batadv_bcast_packet *)skb->data; + /* rebroadcast packet */ batadv_add_bcast_packet_to_list(bat_priv, skb, 1); diff --git a/types.h b/types.h index 7b3d0d7..354b699 100644 --- a/types.h +++ b/types.h @@ -156,7 +156,7 @@ struct batadv_neigh_node { #ifdef CONFIG_BATMAN_ADV_BLA struct batadv_bcast_duplist_entry { uint8_t orig[ETH_ALEN]; - uint16_t crc; + uint32_t crc; unsigned long entrytime; }; #endif -- 1.7.10

2 4

[B.A.T.M.A.N.] [PATCH] batman-adv: sysfs documentation should keep alphabetical order
by Marek Lindner 27 Oct '12

27 Oct '12

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- sysfs-class-net-batman-adv | 11 ++++++----- sysfs-class-net-mesh | 40 ++++++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/sysfs-class-net-batman-adv b/sysfs-class-net-batman-adv index 38dd762..bdc0070 100644 --- a/sysfs-class-net-batman-adv +++ b/sysfs-class-net-batman-adv @@ -1,4 +1,10 @@ +What: /sys/class/net/<iface>/batman-adv/iface_status +Date: May 2010 +Contact: Marek Lindner <lindner_marek(a)yahoo.de> +Description: + Indicates the status of <iface> as it is seen by batman. + What: /sys/class/net/<iface>/batman-adv/mesh_iface Date: May 2010 Contact: Marek Lindner <lindner_marek(a)yahoo.de> @@ -7,8 +13,3 @@ Description: displays the batman mesh interface this <iface> currently is associated with. -What: /sys/class/net/<iface>/batman-adv/iface_status -Date: May 2010 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> -Description: - Indicates the status of <iface> as it is seen by batman. diff --git a/sysfs-class-net-mesh b/sysfs-class-net-mesh index c81fe89..bc41da6 100644 --- a/sysfs-class-net-mesh +++ b/sysfs-class-net-mesh @@ -6,6 +6,14 @@ Description: Indicates whether the batman protocol messages of the mesh <mesh_iface> shall be aggregated or not. +What: /sys/class/net/<mesh_iface>/mesh/ap_isolation +Date: May 2011 +Contact: Antonio Quartulli <ordex(a)autistici.org> +Description: + Indicates whether the data traffic going from a + wireless client to another wireless client will be + silently dropped. + What: /sys/class/net/<mesh_iface>/mesh/bonding Date: June 2010 Contact: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> @@ -31,14 +39,6 @@ Description: mesh will be fragmented or silently discarded if the packet size exceeds the outgoing interface MTU. -What: /sys/class/net/<mesh_iface>/mesh/ap_isolation -Date: May 2011 -Contact: Antonio Quartulli <ordex(a)autistici.org> -Description: - Indicates whether the data traffic going from a - wireless client to another wireless client will be - silently dropped. - What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth Date: October 2010 Contact: Marek Lindner <lindner_marek(a)yahoo.de> @@ -60,6 +60,13 @@ Description: Defines the selection criteria this node will use to choose a gateway if gw_mode was set to 'client'. +What: /sys/class/net/<mesh_iface>/mesh/hop_penalty +Date: Oct 2010 +Contact: Linus Lüssing <linus.luessing(a)web.de> +Description: + Defines the penalty which will be applied to an + originator message's tq-field on every hop. + What: /sys/class/net/<mesh_iface>/mesh/orig_interval Date: May 2010 Contact: Marek Lindner <lindner_marek(a)yahoo.de> @@ -67,19 +74,12 @@ Description: Defines the interval in milliseconds in which batman sends its protocol messages. -What: /sys/class/net/<mesh_iface>/mesh/hop_penalty -Date: Oct 2010 -Contact: Linus Lüssing <linus.luessing(a)web.de> -Description: - Defines the penalty which will be applied to an - originator message's tq-field on every hop. - -What: /sys/class/net/<mesh_iface>/mesh/routing_algo -Date: Dec 2011 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> +What: /sys/class/net/<mesh_iface>/mesh/routing_algo +Date: Dec 2011 +Contact: Marek Lindner <lindner_marek(a)yahoo.de> Description: - Defines the routing procotol this mesh instance - uses to find the optimal paths through the mesh. + Defines the routing procotol this mesh instance + uses to find the optimal paths through the mesh. What: /sys/class/net/<mesh_iface>/mesh/vis_mode Date: May 2010 -- 1.7.10.4

1 1

Re: [B.A.T.M.A.N.] Web-based Visualisation Tool
by Gui Iribarren 23 Oct '12

23 Oct '12

A few weeks ago, after reviewing nodeshot, nodewatcher, and others, NicoEchaniz decided to start AlterMap, which literally means "yet another map" the idea, though, is to make it as flexible as possible, so that it can be adopted / backported to existing networks. Very much like the interop-dev effort, but skipping the name voting part :) the outstanding difference with current map solutions, and main appeal, is that it mixes CouchDB, JSON, Backbone and Leaflet , so: * the database is schema-less, (in order to accomodate the irreconcilably different db schemas from guifi.net, ninux, athens, wlan-si...) * it can be implemented as a CouchDB applet, so the frontend can be served entirely from a uhttpd running on openwrt, serving simple js. * couchDb implements native synchronization, which enables from the start the possibility of downloading a copy of the db to a cellphone, creating a node offline while "in the field", and syncing it back afterwards, a feature the guys at guifi.net are currently trying to resolve. * another possibility is syncing *between* different networks, so that for example ninux pisa can have its local couchDb where it maintains pisa' nodes, and syncs two-way with ninux rome using native couchDb support. * an extreme possibility of the above point, would be having a frontend to a *world* map of all WCN nodes. The schemas of each network would be different, so not every bit of information would be displayed in that frontend, but at least name and gps location could easily be aggregated. * as communication is done in JSON, current map implementations don't need to be abandoned all of a sudden ; each network could code a simple middleware that translates JSON between its current solution and CouchDB, and make the transition smooth. * We started it with a batman-adv compatible-map idea in mind, but again, as it is JSON, a script simply turns batctl output into JSON, so any protocol can easily be scripted to talk JSON as well. (in comparison, Nodeshot needs to make batman-adv output look like OLSR format, instead of a "neutral" notation like JSON.) * Leaflet is actively developed, small, and already offers touchscreen features for mobiles. * there's already also crazy ajax that enables near-realtime visualization of data as it gets updated from any data-source. It might sound far-fetched, but the map could aid mesh node positioning by giving visual feedback on complex data such as multiple links as is the case with neighbours on IBSS clouds. Work so far is being done on https://colectivo.altermundi.net/projects/altermap/wiki almost all of the magic is done by CouchDB, etc, so the actual code is a bunch of js, mostly glueing together "the shoulders of giants" ;) What do you people think? Paul, Do you think this could have a positive interaction with Serval Maps? I see these items in the roadmap: * Share mapsforge data via Rhizome * Explore options for export of geographic information to other systems as required maybe these could be leveraged by using couchDB and JSON? On Wed, Oct 17, 2012 at 8:54 PM, Steve Song <steve(a)villagetelco.org> wrote: > On 17 October 2012 18:45, "Linus Lüssing" <linus.luessing(a)web.de> wrote: >> >>> Gesendet: Mittwoch, 17. Oktober 2012 um 21:44 Uhr >>> Von: "Steve Song" <steve(a)villagetelco.org> >>> An: b.a.t.m.a.n(a)lists.open-mesh.org >>> Betreff: [B.A.T.M.A.N.] Web-based Visualisation Tool of Choice for batman-adv? >>> >>> Hi all, >>> >>> Is there an obvious choice for web-based visualisation of batman-adv >>> networks? We currently use a custom product (SPUD - >>> http://dev.villagetelco.org/trac/browser/spud/trunk/INSTALL) built >>> specifically for Village Telco but would prefer to join our efforts to >>> a broader community-based effort. I am aware of >>> >>> Nodewatcher >>> http://nodewatcher.readthedocs.org/en/latest/installation.html >>> and >>> Nodeshot >>> http://wiki.ninux.org/InstallNodeshot >>> >>> but both of these take a little adapting to batman-adv. Is there >>> anything out there that has been developed specifically for >>> batman-adv? >> >> For our local Freifunk community here in Lübeck we are currently using a >> home-brewed solution called 'ffmap-d3' developed by Nils Schneider >> to visualize our batman-adv topology. Source code is available on github: >> >> http://tcatm.github.com/ffmap-d3/ >> >> It is still quite new and still gets its regular tweaks, but this >> page should already give you an idea about how it looks like, its current >> features and general usability: >> >> http://holstentor.metameute.de/mesh/nodes.html >> >> >> Not sure whether this is something you are looking for, but thought I'd >> mention it anyway. >> > > ffmap-d3 is quite beautifully done, very elegant rendering of nodes > although we are looking for something more GIS-oriented. Both are > worth exploring though. Thanks. > > Cheers... Steve

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix broadcast packet CRC calculation
by Linus Lüssing 20 Oct '12

20 Oct '12

So far the crc16 checksum for a batman-adv broadcast data packet, received on a batman-adv hard interface, was calculated over zero bytes of its content leading to many incoming broadcast data packets wrongly being dropped. This patch fixes this issue by calculating the crc16 over the actual, complete broadcast payload. The issue is a regrission introduced by e5cf86d30a9b32feccb6b866a3f23b0e0483a3b0. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- It led to about 60-80% broadcast packet loss to a direct neighbor with a ping6 with a 1s interval in our scenario, but about no packet loss with an interval smaller than 0.2s. Also see: https://projects.universe-factory.net/issues/65 (German) bridge_loop_avoidance.c | 8 ++++---- routing.c | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 6705d35..e7b5777 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1205,8 +1205,8 @@ int batadv_bla_init(struct batadv_priv *bat_priv) /** * batadv_bla_check_bcast_duplist * @bat_priv: the bat priv with all the soft interface information - * @bcast_packet: originator mac address - * @hdr_size: maximum length of the frame + * @bcast_packet: encapsulated broadcast frame plus batman header + * @bcast_packet_len: length of encapsulated broadcast frame plus batman header * * check if it is on our broadcast list. Another gateway might * have sent the same packet because it is connected to the same backbone, @@ -1219,14 +1219,14 @@ int batadv_bla_init(struct batadv_priv *bat_priv) */ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct batadv_bcast_packet *bcast_packet, - int hdr_size) + int bcast_packet_len) { int i, length, curr; uint8_t *content; uint16_t crc; struct batadv_bcast_duplist_entry *entry; - length = hdr_size - sizeof(*bcast_packet); + length = bcast_packet_len - sizeof(*bcast_packet); content = (uint8_t *)bcast_packet; content += sizeof(*bcast_packet); diff --git a/routing.c b/routing.c index bc2b88b..f861b7c 100644 --- a/routing.c +++ b/routing.c @@ -1136,8 +1136,14 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, spin_unlock_bh(&orig_node->bcast_seqno_lock); + /* keep skb linear for crc calculation */ + if (skb_linearize(skb) < 0) + goto out; + + bcast_packet = (struct batadv_bcast_packet *)skb->data; + /* check whether this has been sent by another originator before */ - if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size)) + if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) goto out; /* rebroadcast packet */ -- 1.7.10.4

4 5

[B.A.T.M.A.N.] [PATCH net-next 00/21] treewide: Use consistent api style for address testing
by Joe Perches 19 Oct '12

19 Oct '12

ethernet, ipv4, and ipv6 address testing uses 3 different api naming styles. ethernet uses: is_<foo>_ether_addr ipv4 uses: ipv4_is_<foo> ipv6 uses: ipv6_addr_<foo> Standardize on the ipv6 style of <prefix>_addr_<type> to reduce the number of styles to remember. The new consistent styles are: eth_addr_<foo>(const u8 *) ipv4_addr_<foo>(__be32) ipv6_addr_<foo>(const struct in6_addr *) Add temporary backward compatibility #defines for the old names too. Joe Perches (21): etherdevice: Rename is_<foo>_ether_addr tests to eth_addr_<foo> net: Convert is_<foo>_ether_addr uses to eth_addr_<foo> arch: Convert is_<foo>_ether_addr uses to eth_addr_<foo> wireless: Convert is_<foo>_ether_addr uses to eth_addr_<foo> drivers: net: Convert is_<foo>_ether_addr uses to eth_addr_<foo> staging: Convert is_<foo>_ether_addr uses to eth_addr_<foo> infiniband: Convert is_<foo>_ether_addr uses to eth_addr_<foo> scsi: Convert is_<foo>_ether_addr uses to eth_addr_<foo> of: Convert is_<foo>_ether_addr uses to eth_addr_<foo> s390: Convert is_<foo>_ether_addr uses to eth_addr_<foo> usb: Convert is_<foo>_ether_addr uses to eth_addr_<foo> uwb: Convert is_<foo>_ether_addr uses to eth_addr_<foo> Documentation: networking: Convert is_<foo>_ether_addr uses to eth_addr_<foo> llc_if.h: Convert is_<foo>_ether_addr uses to eth_addr_<foo> in.h: Rename ipv4_is_<foo> functions to ipv4_addr_<foo> net: Convert ipv4_is_<foo> uses to ipv4_addr_<foo> infiniband: Convert ipv4_is_<foo> uses to ipv4_addr_<foo> ath6kl: Convert ipv4_is_<foo> uses to ipv4_addr_<foo> parisc: Convert ipv4_is_<foo> uses to ipv4_addr_<foo> lockd: Convert ipv4_is_<foo> uses to ipv4_addr_<foo> sctp: Convert ipv4_is_<foo> uses to ipv4_addr_<foo> Documentation/networking/driver.txt | 2 +- arch/arm/mach-davinci/board-mityomapl138.c | 2 +- arch/arm/mach-pxa/colibri-pxa3xx.c | 2 +- arch/avr32/boards/atngw100/setup.c | 2 +- arch/avr32/boards/atstk1000/atstk1002.c | 2 +- arch/avr32/boards/favr-32/setup.c | 2 +- arch/avr32/boards/hammerhead/setup.c | 2 +- arch/avr32/boards/merisc/setup.c | 2 +- arch/avr32/boards/mimc200/setup.c | 2 +- arch/mips/alchemy/common/platform.c | 4 +- arch/um/drivers/net_kern.c | 6 +- drivers/infiniband/core/cma.c | 4 +- drivers/infiniband/hw/amso1100/c2.c | 2 +- drivers/infiniband/hw/nes/nes_nic.c | 2 +- drivers/net/bonding/bond_3ad.c | 2 +- drivers/net/bonding/bond_alb.c | 2 +- drivers/net/bonding/bond_main.c | 6 +- drivers/net/dummy.c | 2 +- drivers/net/ethernet/3com/3c59x.c | 2 +- drivers/net/ethernet/3com/typhoon.c | 2 +- drivers/net/ethernet/8390/etherh.c | 2 +- drivers/net/ethernet/adi/bfin_mac.c | 6 +- drivers/net/ethernet/aeroflex/greth.c | 4 +- drivers/net/ethernet/amd/au1000_eth.c | 2 +- drivers/net/ethernet/amd/depca.c | 4 +- drivers/net/ethernet/amd/pcnet32.c | 8 ++-- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- drivers/net/ethernet/atheros/atl1e/atl1e_hw.c | 4 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- drivers/net/ethernet/atheros/atlx/atl1.c | 10 ++-- drivers/net/ethernet/atheros/atlx/atl2.c | 14 +++--- drivers/net/ethernet/atheros/atlx/atlx.c | 2 +- drivers/net/ethernet/broadcom/b44.c | 4 +- drivers/net/ethernet/broadcom/bnx2.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +- drivers/net/ethernet/broadcom/cnic.c | 2 +- drivers/net/ethernet/broadcom/tg3.c | 6 +- drivers/net/ethernet/brocade/bna/bnad.c | 6 +- drivers/net/ethernet/cadence/at91_ether.c | 6 +- drivers/net/ethernet/cadence/macb.c | 4 +- drivers/net/ethernet/calxeda/xgmac.c | 6 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- drivers/net/ethernet/cirrus/mac89x0.c | 2 +- drivers/net/ethernet/cisco/enic/enic_dev.c | 4 +- drivers/net/ethernet/cisco/enic/enic_main.c | 10 ++-- drivers/net/ethernet/cisco/enic/enic_pp.c | 10 ++-- drivers/net/ethernet/davicom/dm9000.c | 6 +- drivers/net/ethernet/dec/ewrk3.c | 4 +- drivers/net/ethernet/dec/tulip/de4x5.c | 4 +- drivers/net/ethernet/dlink/sundance.c | 2 +- drivers/net/ethernet/dnet.c | 6 +- drivers/net/ethernet/emulex/benet/be_main.c | 8 ++-- drivers/net/ethernet/ethoc.c | 6 +- drivers/net/ethernet/faraday/ftgmac100.c | 2 +- drivers/net/ethernet/faraday/ftmac100.c | 2 +- drivers/net/ethernet/freescale/fec.c | 8 ++-- drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- drivers/net/ethernet/freescale/gianfar_ethtool.c | 12 ++-- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/i825xx/ether1.c | 2 +- drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +- drivers/net/ethernet/intel/e100.c | 4 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- drivers/net/ethernet/intel/e1000e/mac.c | 2 +- drivers/net/ethernet/intel/e1000e/netdev.c | 4 +- drivers/net/ethernet/intel/igb/e1000_mac.c | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 8 ++-- drivers/net/ethernet/intel/igbvf/netdev.c | 6 +- drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 6 +- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 6 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 +++--- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 6 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 8 ++-- drivers/net/ethernet/lantiq_etop.c | 2 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/net/ethernet/marvell/skge.c | 6 +- drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 4 +- drivers/net/ethernet/micrel/ks8695net.c | 6 +- drivers/net/ethernet/micrel/ks8842.c | 4 +- drivers/net/ethernet/micrel/ks8851.c | 4 +- drivers/net/ethernet/micrel/ks8851_mll.c | 2 +- drivers/net/ethernet/microchip/enc28j60.c | 4 +- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- drivers/net/ethernet/neterion/s2io.c | 2 +- drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +- drivers/net/ethernet/neterion/vxge/vxge-main.c | 12 ++-- drivers/net/ethernet/netx-eth.c | 2 +- drivers/net/ethernet/nuvoton/w90p910_ether.c | 4 +- drivers/net/ethernet/nvidia/forcedeth.c | 4 +- drivers/net/ethernet/nxp/lpc_eth.c | 8 ++-- drivers/net/ethernet/octeon/octeon_mgmt.c | 2 +- .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 6 +- drivers/net/ethernet/pasemi/pasemi_mac.c | 4 +- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 6 +- drivers/net/ethernet/realtek/8139cp.c | 2 +- drivers/net/ethernet/realtek/8139too.c | 2 +- drivers/net/ethernet/realtek/r8169.c | 2 +- drivers/net/ethernet/renesas/sh_eth.c | 4 +- drivers/net/ethernet/seeq/ether3.c | 2 +- drivers/net/ethernet/sfc/efx.c | 2 +- drivers/net/ethernet/sfc/ethtool.c | 6 +- drivers/net/ethernet/sfc/siena_sriov.c | 6 +- drivers/net/ethernet/sis/sis900.c | 2 +- drivers/net/ethernet/smsc/smc911x.c | 4 +- drivers/net/ethernet/smsc/smc91x.c | 4 +- drivers/net/ethernet/smsc/smsc911x.c | 10 ++-- drivers/net/ethernet/smsc/smsc9420.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- drivers/net/ethernet/sun/niu.c | 8 ++-- drivers/net/ethernet/sun/sungem.c | 2 +- drivers/net/ethernet/ti/cpsw.c | 2 +- drivers/net/ethernet/ti/davinci_emac.c | 6 +- drivers/net/ethernet/tile/tilegx.c | 4 +- drivers/net/ethernet/tile/tilepro.c | 4 +- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 4 +- drivers/net/ethernet/toshiba/tc35815.c | 4 +- drivers/net/ethernet/tundra/tsi108_eth.c | 8 ++-- drivers/net/ethernet/via/via-rhine.c | 2 +- drivers/net/ethernet/wiznet/w5100.c | 6 +- drivers/net/ethernet/wiznet/w5300.c | 6 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/hamradio/bpqether.c | 2 +- drivers/net/ifb.c | 2 +- drivers/net/macvlan.c | 16 +++--- drivers/net/phy/at803x.c | 2 +- drivers/net/rionet.c | 4 +- drivers/net/team/team.c | 4 +- drivers/net/tun.c | 4 +- drivers/net/usb/asix_common.c | 2 +- drivers/net/usb/dm9601.c | 4 +- drivers/net/usb/mcs7830.c | 2 +- drivers/net/usb/smsc75xx.c | 2 +- drivers/net/usb/smsc95xx.c | 2 +- drivers/net/veth.c | 2 +- drivers/net/vxlan.c | 4 +- drivers/net/wimax/i2400m/driver.c | 2 +- drivers/net/wireless/adm8211.c | 2 +- drivers/net/wireless/airo.c | 4 +- drivers/net/wireless/at76c50x-usb.c | 8 ++-- drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 ++-- drivers/net/wireless/ath/ath6kl/main.c | 8 ++-- drivers/net/wireless/ath/ath6kl/txrx.c | 10 ++-- drivers/net/wireless/ath/ath6kl/wmi.c | 4 +- drivers/net/wireless/ath/ath9k/recv.c | 8 ++-- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43legacy/main.c | 2 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 4 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/main.c | 16 +++--- drivers/net/wireless/hostap/hostap_info.c | 2 +- drivers/net/wireless/hostap/hostap_ioctl.c | 8 ++-- drivers/net/wireless/hostap/hostap_main.c | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 6 +- drivers/net/wireless/ipw2x00/ipw2200.c | 18 +++--- drivers/net/wireless/ipw2x00/libipw_rx.c | 12 ++-- drivers/net/wireless/ipw2x00/libipw_tx.c | 4 +- drivers/net/wireless/iwlegacy/3945-mac.c | 2 +- drivers/net/wireless/iwlegacy/4965-mac.c | 2 +- drivers/net/wireless/iwlegacy/common.c | 2 +- drivers/net/wireless/iwlwifi/dvm/sta.c | 2 +- drivers/net/wireless/libertas_tf/main.c | 2 +- drivers/net/wireless/mwifiex/join.c | 2 +- drivers/net/wireless/mwifiex/scan.c | 2 +- drivers/net/wireless/mwifiex/sta_cmd.c | 2 +- drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +- drivers/net/wireless/mwifiex/uap_txrx.c | 2 +- drivers/net/wireless/mwl8k.c | 2 +- drivers/net/wireless/orinoco/wext.c | 4 +- drivers/net/wireless/p54/eeprom.c | 2 +- drivers/net/wireless/rndis_wlan.c | 18 +++--- drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- drivers/net/wireless/rt2x00/rt2500usb.c | 2 +- drivers/net/wireless/rt2x00/rt2800lib.c | 8 ++-- drivers/net/wireless/rt2x00/rt61pci.c | 2 +- drivers/net/wireless/rt2x00/rt73usb.c | 2 +- drivers/net/wireless/rtl818x/rtl8180/dev.c | 4 +- drivers/net/wireless/rtl818x/rtl8187/dev.c | 4 +- drivers/net/wireless/rtlwifi/base.c | 6 +- drivers/net/wireless/rtlwifi/cam.c | 2 +- drivers/net/wireless/rtlwifi/pci.c | 8 ++-- drivers/net/wireless/rtlwifi/rc.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 4 +- drivers/net/wireless/rtlwifi/usb.c | 12 ++-- drivers/net/wireless/ti/wl1251/main.c | 12 ++-- drivers/net/wireless/ti/wlcore/cmd.c | 2 +- drivers/net/wireless/ti/wlcore/main.c | 6 +- drivers/net/wireless/ti/wlcore/tx.c | 2 +- drivers/net/wireless/wl3501_cs.c | 2 +- drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- drivers/of/of_net.c | 6 +- drivers/parisc/led.c | 2 +- drivers/s390/net/qeth_l2_main.c | 4 +- drivers/scsi/bnx2fc/bnx2fc_els.c | 4 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- drivers/scsi/fcoe/fcoe.c | 12 ++-- drivers/scsi/fcoe/fcoe_ctlr.c | 8 ++-- drivers/scsi/fnic/fnic_fcs.c | 6 +- drivers/staging/ccg/u_ether.c | 6 +- drivers/staging/csr/sme_wext.c | 2 +- drivers/staging/et131x/et131x.c | 4 +- drivers/staging/gdm72xx/gdm_wimax.c | 2 +- drivers/staging/octeon/ethernet.c | 2 +- drivers/staging/ozwpan/ozcdev.c | 2 +- .../rtl8187se/ieee80211/ieee80211_softmac.c | 2 +- .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8187se/r8180_core.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 8 ++-- drivers/staging/rtl8192e/rtllib_softmac.c | 4 +- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 +- drivers/staging/rtl8192e/rtllib_tx.c | 12 ++-- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 12 ++-- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192u/r8192U_core.c | 8 ++-- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_set.c | 2 +- drivers/staging/rtl8712/rtl871x_mlme.c | 2 +- drivers/staging/rtl8712/rtl871x_recv.c | 8 ++-- drivers/staging/slicoss/slicoss.c | 2 +- drivers/staging/vt6655/bssdb.c | 2 +- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/dpc.c | 4 +- drivers/staging/vt6655/hostap.c | 4 +- drivers/staging/vt6655/iwctl.c | 2 +- drivers/staging/vt6655/key.c | 2 +- drivers/staging/vt6655/mib.c | 8 ++-- drivers/staging/vt6655/rxtx.c | 10 ++-- drivers/staging/vt6655/wpactl.c | 4 +- drivers/staging/vt6656/bssdb.c | 2 +- drivers/staging/vt6656/dpc.c | 4 +- drivers/staging/vt6656/hostap.c | 4 +- drivers/staging/vt6656/iwctl.c | 2 +- drivers/staging/vt6656/key.c | 2 +- drivers/staging/vt6656/rxtx.c | 14 +++--- drivers/staging/vt6656/wpactl.c | 2 +- drivers/staging/wlags49_h2/wl_wext.c | 2 +- drivers/usb/gadget/u_ether.c | 6 +- drivers/uwb/address.c | 2 +- include/linux/etherdevice.h | 36 ++++++++----- include/linux/in.h | 40 ++++++++++---- include/linux/lockd/lockd.h | 4 +- include/net/llc_if.h | 4 +- include/net/sctp/constants.h | 12 ++-- net/802/stp.c | 4 +- net/8021q/vlan_dev.c | 6 +- net/8021q/vlan_netlink.c | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bridge_loop_avoidance.c | 8 ++-- net/batman-adv/routing.c | 20 ++++---- net/batman-adv/soft-interface.c | 4 +- net/batman-adv/unicast.c | 2 +- net/batman-adv/vis.c | 4 +- net/bridge/br_device.c | 6 +- net/bridge/br_fdb.c | 2 +- net/bridge/br_if.c | 2 +- net/bridge/br_input.c | 8 ++-- net/bridge/br_multicast.c | 4 +- net/bridge/br_netlink.c | 2 +- net/core/netpoll.c | 2 +- net/core/pktgen.c | 14 +++--- net/core/rtnetlink.c | 2 +- net/dsa/slave.c | 2 +- net/ethernet/eth.c | 6 +- net/ipv4/arp.c | 4 +- net/ipv4/datagram.c | 2 +- net/ipv4/devinet.c | 4 +- net/ipv4/fib_frontend.c | 12 ++-- net/ipv4/igmp.c | 12 ++-- net/ipv4/ip_gre.c | 22 ++++---- net/ipv4/ipmr.c | 4 +- net/ipv4/netfilter/ipt_rpfilter.c | 10 ++-- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/route.c | 58 ++++++++++---------- net/ipv4/udp.c | 2 +- net/ipv6/addrconf.c | 12 ++-- net/ipv6/ip6_gre.c | 2 +- net/l2tp/l2tp_ip.c | 2 +- net/l2tp/l2tp_ip6.c | 2 +- net/mac80211/cfg.c | 2 +- net/mac80211/ibss.c | 8 ++-- net/mac80211/ieee80211_i.h | 2 +- net/mac80211/iface.c | 12 ++-- net/mac80211/mesh.c | 2 +- net/mac80211/mesh_hwmp.c | 4 +- net/mac80211/mesh_pathtbl.c | 4 +- net/mac80211/mesh_plink.c | 2 +- net/mac80211/mlme.c | 4 +- net/mac80211/rx.c | 50 +++++++++--------- net/mac80211/sta_info.c | 2 +- net/mac80211/status.c | 6 +- net/mac80211/tx.c | 22 ++++---- net/mac80211/wme.c | 4 +- net/netfilter/ipvs/ip_vs_xmit.c | 6 +- net/netfilter/xt_cluster.c | 2 +- net/netfilter/xt_pkttype.c | 2 +- net/openvswitch/flow.c | 4 +- net/openvswitch/vport-internal_dev.c | 2 +- net/sctp/protocol.c | 10 ++-- net/wireless/core.c | 2 +- net/wireless/ibss.c | 2 +- net/wireless/nl80211.c | 4 +- net/wireless/util.c | 4 +- net/wireless/wext-compat.c | 2 +- net/wireless/wext-sme.c | 2 +- 331 files changed, 833 insertions(+), 809 deletions(-) -- 1.7.8.111.gad25c.dirty

3 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Simplify crc for skb with skb_prepare_seq_read
by Sven Eckelmann 19 Oct '12

19 Oct '12

a7fe30736a46d203b74e9fb2df3fb4e1d94222bc ("batman-adv: Add function to calculate crc32c for the skb payload") introduced a function that walked through the three different socket buffer classes to compute the crc32 for an skb. This function is affected by many changes to the sk_buff structure in future. This can be avoided by using the sequential read functions to access blocks transparently. Reported-by: Martin Hundebøll <martin(a)hundeboll.net> Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat.h | 35 ----------------------------------- main.c | 31 +++++++++++++------------------ main.h | 2 +- 3 files changed, 14 insertions(+), 54 deletions(-) diff --git a/compat.h b/compat.h index 83befd1..be685aa 100644 --- a/compat.h +++ b/compat.h @@ -37,9 +37,6 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) -#define skb_walk_frags(skb, iter) \ - for (iter = skb_shinfo(skb)->frag_list; iter; iter = iter->next) - #define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ __module_param_call(p1, p2, p3, p4, p5, p7) @@ -81,18 +78,6 @@ #endif /* < KERNEL_VERSION(2, 6, 35) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) - -#define kmap_atomic(p) kmap_atomic(p, KM_SKB_DATA_SOFTIRQ) - -#ifdef kunmap_atomic -#undef kunmap_atomic -#endif -#define kunmap_atomic(x, arg...) do { pagefault_enable(); } while (0) - -#endif /* < KERNEL_VERSION(2, 6, 37) */ - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) #define __rcu @@ -160,26 +145,6 @@ static inline void skb_reset_mac_len(struct sk_buff *skb) #endif /* < KERNEL_VERSION(3, 0, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) - -static inline struct page *skb_frag_page(const skb_frag_t *frag) -{ - return frag->page; -} - -static inline void *skb_frag_address(const skb_frag_t *frag) -{ - return page_address(skb_frag_page(frag)) + frag->page_offset; -} - -static inline unsigned int skb_frag_size(const skb_frag_t *frag) -{ - return frag->size; -} - -#endif /* < KERNEL_VERSION(3, 2, 0) */ - - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) static inline void eth_hw_addr_random(struct net_device *dev) diff --git a/main.c b/main.c index 2b1123d..253e240 100644 --- a/main.c +++ b/main.c @@ -444,29 +444,24 @@ int batadv_compat_seq_print_text(struct seq_file *seq, void *offset) * payload_ptr must always point to an address in the skb head buffer and not to * a fragment. */ -__be32 batadv_skb_crc32(const struct sk_buff *skb, u8 *payload_ptr) +__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr) { u32 crc = 0; - struct sk_buff *iter; - size_t skip_len, read_len; - const skb_frag_t *f; - u8 *vaddr; - int i; + unsigned int from; + unsigned int to = skb->len; + struct skb_seq_state st; + const u8 *data; + unsigned int len; + unsigned int consumed = 0; - skip_len = payload_ptr - skb->data; - read_len = skb_headlen(skb) - skip_len; - if (read_len) - crc = crc32c(crc, payload_ptr, read_len); + from = (unsigned int)(payload_ptr - skb->data); - for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { - f = &skb_shinfo(skb)->frags[i]; - vaddr = kmap_atomic(skb_frag_page(f)); - crc = crc32c(crc, vaddr + f->page_offset, skb_frag_size(f)); - kunmap_atomic(vaddr); + skb_prepare_seq_read(skb, from, to, &st); + while ((len = skb_seq_read(consumed, &data, &st)) != 0) { + crc = crc32c(crc, data, len); + consumed += len; } - - skb_walk_frags(skb, iter) - crc = crc32c(crc, iter->data, skb_headlen(iter)); + skb_abort_seq_read(&st); return htonl(crc); } diff --git a/main.h b/main.h index e147261..3321173 100644 --- a/main.h +++ b/main.h @@ -177,7 +177,7 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); int batadv_algo_select(struct batadv_priv *bat_priv, char *name); int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); int batadv_compat_seq_print_text(struct seq_file *seq, void *offset); -__be32 batadv_skb_crc32(const struct sk_buff *skb, u8 *payload_ptr); +__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr); /** * enum batadv_dbg_level - available log levels -- 1.7.10.4

2 1

[B.A.T.M.A.N.] How to detect gateway mode in openwrt?
by Sophana K 19 Oct '12

19 Oct '12

Hi I'm trying batman-adv on openwrt on tp-link hardware. Some month ago, there were some bugs in the ar71xx adhoc mode which now seem resolved. I could setup a 2 node mesh test with batman-adv quite easily. One node is a gateway, the other is a repeater. The gateway has coova-chilli and 2 networks exported with batman-adv: the private and the public network. Both networks are bridged to batman-adv vlans, ethernet ports and wifi ssids. The repeater doesn't have coova-chilli, but bridge both networks to the wifi ssid and ethernet ports. But I would like to automate deployment with a single firmware, and need to auto-detect if the internet come from the WAN port or not. The problem is that if I bridge the wan port, I can't use hotplug.d/iface feature because the whole bridge is declared up wether or not the internet port is connected. Should I unconfigure the bridges first, then detect if internet works, then connect the bridge to batman? Anyone have an idea on how I could do this? Thanks

2 9

[B.A.T.M.A.N.] pull request: batman-adv 2012-10-18
by Antonio Quartulli 18 Oct '12

18 Oct '12

Hello David, here are two fixes intended for net. The first one fixes the CRC computation used to check for broadcast packet duplicates. The wrong result lead to many (more than 80%) broadcast packets being dropped and so making the network very slow and mostly unusable. Think about all the ARP or DHCP requests not going through. The second patch fixes a potential race condition, still in the same duplicated broadcast check procedure, which can lead to wrong outcomes under certain circumstances. I would also like to enqueue patch 1/2 for sending to stable-{3.5/3.6}. Thanks a lot, Antonio The following changes since commit 43c422eda99b894f18d1cca17bcd2401efaf7bd0: apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40 (2012-10-17 16:29:46 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to 7dac7b76b8db87fc79857a53a09730fb2148579b: batman-adv: Fix potential broadcast BLA-duplicate-check race condition (2012-10-18 18:17:31 +0200) ---------------------------------------------------------------- Included fixes: - Fix broadcast packet CRC calculation which can lead to ~80% broadcast packet loss - Fix a race condition in duplicate broadcast packet check ---------------------------------------------------------------- Linus Lüssing (2): batman-adv: Fix broadcast packet CRC calculation batman-adv: Fix potential broadcast BLA-duplicate-check race condition net/batman-adv/bridge_loop_avoidance.c | 27 ++++++++++++++++++--------- net/batman-adv/routing.c | 8 +++++++- net/batman-adv/types.h | 2 ++ 3 files changed, 27 insertions(+), 10 deletions(-)

2 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N October 2012