Included changes:

Browse source

* remove duplicated line in comment
 * add htons() invocation for tt_crc as suggested by Al Viro
 * OriGinator Message seqno initial value is now random
 * some cleanups and fixes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJPjnVmAAoJEFMQTLzJFOZFqpkH/33gzND7Ukfdax6CPYqb1AVm
 A63gtnZlNCwPf7dCJkq4yF4RVn/ir1pp+BwX5C9BIN9V/ZSaTsIKsMXAaZzUK3DH
 PCZEJCn+iys+ZX5KrpLum0wMSQyxt08GsGZLueiu+Rm0zRZLSCy58THNqLt2b6ZK
 mDH6tdbGxKXxrKeWzVz3PzQv8dPuFqApPiQ+M6ugf4YvjdYYEiGWFn8gad+XObeA
 oxbFGMt6MKdc+9EsKqd0Br1lqHiQ+RC2xXQiFEBizPe34LiYJ69irkEBki/6KV9Z
 ujeB0RxlMHXL75vUWoqyGcv/F2lzZd/tXQA6qz7ioCBHqzb1Mk/KGmVJ3KZ5CK8=
 =9lku
 -----END PGP SIGNATURE-----

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
* remove duplicated line in comment
* add htons() invocation for tt_crc as suggested by Al Viro
* OriGinator Message seqno initial value is now random
* some cleanups and fixes

...

This commit is contained in:

David S. Miller 2012-04-18 13:21:59 -04:00

parent 798ec84d45 1e5cc266db

commit 91fbe33034

12 changed files with 96 additions and 74 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

63

net/batman-adv/bat_iv_ogm.c

View file

11

net/batman-adv/bridge_loop_avoidance.c

View file

33

net/batman-adv/hard-interface.c

View file

4

net/batman-adv/icmp_socket.c

View file

5

net/batman-adv/main.c

View file

6

net/batman-adv/packet.h

View file

10

net/batman-adv/routing.c

View file

14

net/batman-adv/send.c

View file

2

net/batman-adv/soft-interface.c

View file

2

net/batman-adv/translation-table.c

View file

12

net/batman-adv/types.h

View file

8

net/batman-adv/vis.c

View file