commits June 2010

commits@lists.open-mesh.org

1 participants
61 discussions

r1726 - trunk/batman-adv
by postmaster＠open-mesh.net 25 Jun '10

25 Jun '10

Author: marek Date: 2010-06-25 23:59:18 +0200 (Fri, 25 Jun 2010) New Revision: 1726 Modified: trunk/batman-adv/main.c Log: batman-adv: fix early debugfs deinitialization The debugfs files are initialized at load time only but would get deinitialized when the module changed in it deactivate (sleeping) state. As a consequence the debugfs files are not accessible anymore. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv/main.c =================================================================== --- trunk/batman-adv/main.c 2010-06-24 15:57:29 UTC (rev 1725) +++ trunk/batman-adv/main.c 2010-06-25 21:59:18 UTC (rev 1726) @@ -144,6 +144,7 @@ { deactivate_module(); + debugfs_destroy(); unregister_netdevice_notifier(&hard_if_notifier); hardif_remove_interfaces(); @@ -209,7 +210,6 @@ hna_global_free(); synchronize_net(); - debugfs_destroy(); synchronize_rcu(); atomic_set(&module_state, MODULE_INACTIVE);

1 0

[git] linux integration tag, GregKH-20100625, created. GregKH-20091208-22762-gf2204f0
by postmaster＠open-mesh.net 25 Jun '10

25 Jun '10

The tag, GregKH-20100625 has been created at f2204f0631662cc7431fb06c7897ac58df8e4b89 (commit) - Shortlog ------------------------------------------------------------ commit f2204f0631662cc7431fb06c7897ac58df8e4b89 Merge: 89b7f22 9ec2d8f Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Fri Jun 25 23:08:01 2010 +0200 Merge branch 'maint' into linux Conflicts: drivers/staging/batman-adv/Makefile drivers/staging/batman-adv/Makefile.kbuild drivers/staging/batman-adv/compat.h ----------------------------------------------------------------------- -- linux integration

1 0

r1725 - trunk/batctl
by postmaster＠open-mesh.net 24 Jun '10

24 Jun '10

Author: marek Date: 2010-06-24 17:57:29 +0200 (Thu, 24 Jun 2010) New Revision: 1725 Modified: trunk/batctl/main.h Log: batctl: adapting source version to revised versioning scheme The new versioning scheme looks like this: * the trunk will simply be named "devel" followed by a revision number * the upcoming release branch will be "maint" followed by a revision number * the releases will carry their respective names (e.g. 2010.0.0) Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batctl/main.h =================================================================== --- trunk/batctl/main.h 2010-06-24 15:57:28 UTC (rev 1724) +++ trunk/batctl/main.h 2010-06-24 15:57:29 UTC (rev 1725) @@ -21,6 +21,6 @@ -#define SOURCE_VERSION "0.3.0-alpha" /*put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */ +#define SOURCE_VERSION "devel" /*put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */ #define SOCKET_PATH "batman_adv/bat0/socket"

1 0

r1724 - trunk/batman-adv
by postmaster＠open-mesh.net 24 Jun '10

24 Jun '10

Author: marek Date: 2010-06-24 17:57:28 +0200 (Thu, 24 Jun 2010) New Revision: 1724 Modified: trunk/batman-adv/main.h Log: batman-adv: adapting source version to revised versioning scheme The new versioning scheme looks like this: * the trunk will simply be named "devel" followed by a revision number * the upcoming release branch will be "maint" followed by a revision number * the releases will carry their respective names (e.g. 2010.0.0) Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv/main.h =================================================================== --- trunk/batman-adv/main.h 2010-06-24 15:36:27 UTC (rev 1723) +++ trunk/batman-adv/main.h 2010-06-24 15:57:28 UTC (rev 1724) @@ -30,7 +30,7 @@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv" -#define SOURCE_VERSION "0.3.0-alpha" +#define SOURCE_VERSION "devel" /* B.A.T.M.A.N. parameters */

1 0

r1723 - trunk/batman-adv
by postmaster＠open-mesh.net 24 Jun '10

24 Jun '10

Author: marek Date: 2010-06-24 17:36:27 +0200 (Thu, 24 Jun 2010) New Revision: 1723 Modified: trunk/batman-adv/Makefile trunk/batman-adv/Makefile.kbuild Log: batman-adv: Add support for git revision string The Makefile tries to find a version number which describes the state of the version somebody compiles. Currently this can only be a subversion revision. This must also be done for git as it is used to prepare the actual releases. The revision string consists of 4 parts: 1. last annotated tag name 2. number of commits inbetween last tag name and this commit 3. shortened sha1 sum of the commit 4. indicator whether the files where modified The first part is only shown when there was a tag before the commit or the current commit was tagged. Part two and three is only shown when the current commit is not tagged. The indicator is also only shown when the files were modified. This should make it quite easy understandable for humans and still makes it possible to find the commit in the repository using standard git tools (for that purpose the "-dirty" string must be ommited). A full example would be v2010.0.0-25-gdc3f30c-dirty Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv/Makefile =================================================================== --- trunk/batman-adv/Makefile 2010-06-24 15:36:26 UTC (rev 1722) +++ trunk/batman-adv/Makefile 2010-06-24 15:36:27 UTC (rev 1723) @@ -29,17 +29,25 @@ export KERNELPATH -REVISION= $(shell if [ -d .svn ]; then \ - if which svn > /dev/null; then \ - svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'; \ - fi; \ - else \ - if [ -d ~/.svk ]; then \ - if which svk > /dev/null; then \ - echo $$(svk info | grep "Mirrored From" | awk '{print $$5}'); \ - fi; \ - fi; \ - fi) +REVISION= $(shell if [ -d .svn ]; then \ + if which svn > /dev/null; then \ + echo rv$$(svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'); \ + else \ + echo "[unknown]"; \ + fi; \ + elif [ -d .git ]; then \ + if which git > /dev/null; then \ + echo $$(git describe --always --dirty 2> /dev/null); \ + else \ + echo "[unknown]"; \ + fi; \ + elif [ -d ~/.svk ]; then \ + if which svk > /dev/null; then \ + echo rv$$(svk info | grep "Mirrored From" | awk '{print $$5}'); \ + else \ + echo "[unknown]"; \ + fi; \ + fi) NUM_CPUS = $(shell nproc 2> /dev/null || echo 1) Modified: trunk/batman-adv/Makefile.kbuild =================================================================== --- trunk/batman-adv/Makefile.kbuild 2010-06-24 15:36:26 UTC (rev 1722) +++ trunk/batman-adv/Makefile.kbuild 2010-06-24 15:36:27 UTC (rev 1723) @@ -28,7 +28,7 @@ # EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG ifneq ($(REVISION),) -EXTRA_CFLAGS += -DREVISION_VERSION=\"r$(REVISION)\" +EXTRA_CFLAGS += -DREVISION_VERSION=\"$(REVISION)\" endif obj-m += batman-adv.o

1 0

r1722 - trunk/batctl
by postmaster＠open-mesh.net 24 Jun '10

24 Jun '10

Author: marek Date: 2010-06-24 17:36:26 +0200 (Thu, 24 Jun 2010) New Revision: 1722 Modified: trunk/batctl/Makefile Log: batctl: Add support for git revision string The Makefile tries to find a version number which describes the state of the version somebody compiles. Currently this can only be a subversion revision. This must also be done for git as it is used to prepare the actual releases. The revision string consists of 4 parts: 1. last annotated tag name 2. number of commits inbetween last tag name and this commit 3. shortened sha1 sum of the commit 4. indicator whether the files where modified The first part is only shown when there was a tag before the commit or the current commit was tagged. Part two and three is only shown when the current commit is not tagged. The indicator is also only shown when the files were modified. This should make it quite easy understandable for humans and still makes it possible to find the commit in the repository using standard git tools (for that purpose the "-dirty" string must be ommited). A full example would be v2010.0.0-15-g154f68a-dirty Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batctl/Makefile =================================================================== --- trunk/batctl/Makefile 2010-06-24 15:22:06 UTC (rev 1721) +++ trunk/batctl/Makefile 2010-06-24 15:36:26 UTC (rev 1722) @@ -47,23 +47,27 @@ BINARY_NAME = batctl SOURCE_VERSION_HEADER = main.h -REVISION = $(shell if [ -d .svn ]; then \ - if which svn > /dev/null; then \ - svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'; \ - else \ - echo "[unknown]"; \ - fi ; \ +REVISION= $(shell if [ -d .svn ]; then \ + if which svn > /dev/null; then \ + echo rv$$(svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'); \ else \ - if [ -d ~/.svk ]; then \ - if which svk > /dev/null; then \ - echo $$(svk info | grep "Mirrored From" | awk '{print $$5}'); \ - else \ - echo "[unknown]"; \ - fi; \ - fi; \ - fi) + echo "[unknown]"; \ + fi; \ + elif [ -d .git ]; then \ + if which git > /dev/null; then \ + echo $$(git describe --always --dirty 2> /dev/null); \ + else \ + echo "[unknown]"; \ + fi; \ + elif [ -d ~/.svk ]; then \ + if which svk > /dev/null; then \ + echo rv$$(svk info | grep "Mirrored From" | awk '{print $$5}'); \ + else \ + echo "[unknown]"; \ + fi; \ + fi) -REVISION_VERSION =\"\ rv$(REVISION)\" +REVISION_VERSION =\"\ $(REVISION)\" BAT_VERSION = $(shell grep "^\#define SOURCE_VERSION " $(SOURCE_VERSION_HEADER) | sed -e '1p' -n | awk -F '"' '{print $$2}' | awk '{print $$1}') FILE_NAME = $(PACKAGE_NAME)_$(BAT_VERSION)-rv$(REVISION)_$@

1 0

r1721 - trunk/batman-adv
by postmaster＠open-mesh.net 24 Jun '10

24 Jun '10

Author: marek Date: 2010-06-24 17:22:06 +0200 (Thu, 24 Jun 2010) New Revision: 1721 Modified: trunk/batman-adv/aggregation.h trunk/batman-adv/bat_debugfs.h trunk/batman-adv/bat_sysfs.h trunk/batman-adv/bitarray.h trunk/batman-adv/compat.h trunk/batman-adv/gateway_client.h trunk/batman-adv/gateway_common.h trunk/batman-adv/hard-interface.h trunk/batman-adv/hash.h trunk/batman-adv/icmp_socket.h trunk/batman-adv/main.h trunk/batman-adv/originator.h trunk/batman-adv/packet.h trunk/batman-adv/ring_buffer.h trunk/batman-adv/routing.h trunk/batman-adv/send.h trunk/batman-adv/soft-interface.h trunk/batman-adv/translation-table.h trunk/batman-adv/types.h trunk/batman-adv/vis.h Log: batman-adv: Add include guards to all header files We include different header files indirectly to the same source file. This creates weird compiler errors from time to time. Include guards should prefend that functions/variables/... gets redefined by itself. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv/aggregation.h =================================================================== --- trunk/batman-adv/aggregation.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/aggregation.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_AGGREGATION_H_ +#define _NET_BATMAN_ADV_AGGREGATION_H_ + #include "main.h" /* is there another aggregated packet here? */ @@ -36,3 +39,5 @@ unsigned long send_time); void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, int packet_len, struct batman_if *if_incoming); + +#endif /* _NET_BATMAN_ADV_AGGREGATION_H_ */ Modified: trunk/batman-adv/bat_debugfs.h =================================================================== --- trunk/batman-adv/bat_debugfs.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/bat_debugfs.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -20,8 +20,8 @@ */ -#ifndef BAT_DEBUGFS_H -#define BAT_DEBUGFS_H +#ifndef _NET_BATMAN_ADV_DEBUGFS_H_ +#define _NET_BATMAN_ADV_DEBUGFS_H_ #define DEBUGFS_BAT_SUBDIR "batman_adv" @@ -30,4 +30,4 @@ int debugfs_add_meshif(struct net_device *dev); void debugfs_del_meshif(struct net_device *dev); -#endif +#endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */ Modified: trunk/batman-adv/bat_sysfs.h =================================================================== --- trunk/batman-adv/bat_sysfs.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/bat_sysfs.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -20,8 +20,8 @@ */ -#ifndef BAT_SYSFS_H -#define BAT_SYSFS_H +#ifndef _NET_BATMAN_ADV_SYSFS_H_ +#define _NET_BATMAN_ADV_SYSFS_H_ #define SYSFS_IF_MESH_SUBDIR "mesh" #define SYSFS_IF_BAT_SUBDIR "batman_adv" @@ -39,4 +39,4 @@ int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev); void sysfs_del_hardif(struct kobject **hardif_obj); -#endif +#endif /* _NET_BATMAN_ADV_SYSFS_H_ */ Modified: trunk/batman-adv/bitarray.h =================================================================== --- trunk/batman-adv/bitarray.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/bitarray.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,8 @@ * */ +#ifndef _NET_BATMAN_ADV_BITARRAY_H_ +#define _NET_BATMAN_ADV_BITARRAY_H_ /* you should choose something big, if you don't want to waste cpu */ #define TYPE_OF_WORD unsigned long @@ -40,3 +42,5 @@ /* count the hamming weight, how many good packets did we receive? */ int bit_packet_count(TYPE_OF_WORD *seq_bits); + +#endif /* _NET_BATMAN_ADV_BITARRAY_H_ */ Modified: trunk/batman-adv/compat.h =================================================================== --- trunk/batman-adv/compat.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/compat.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -22,6 +22,9 @@ * of the Linux kernel. */ +#ifndef _NET_BATMAN_ADV_COMPAT_H_ +#define _NET_BATMAN_ADV_COMPAT_H_ + #include <linux/version.h> /* LINUX_VERSION_CODE */ #include "bat_sysfs.h" /* struct bat_attribute */ @@ -232,3 +235,5 @@ } #endif /* < KERNEL_VERSION(2, 6, 29) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_H_ */ Modified: trunk/batman-adv/gateway_client.h =================================================================== --- trunk/batman-adv/gateway_client.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/gateway_client.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ +#define _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ + void gw_deselect(void); void gw_election(void); void *gw_get_selected(void); @@ -29,3 +32,5 @@ void gw_node_list_free(void); int gw_client_seq_print_text(struct seq_file *seq, void *offset); bool gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb); + +#endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */ Modified: trunk/batman-adv/gateway_common.h =================================================================== --- trunk/batman-adv/gateway_common.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/gateway_common.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_ +#define _NET_BATMAN_ADV_GATEWAY_COMMON_H_ + enum gw_modes { GW_MODE_OFF, GW_MODE_CLIENT, @@ -31,3 +34,5 @@ void gw_srv_class_to_kbit(uint8_t gw_class, int *down, int *up); ssize_t gw_mode_set(struct bat_priv *bat_priv, char *buff, size_t count); + +#endif /* _NET_BATMAN_ADV_GATEWAY_COMMON_H_ */ Modified: trunk/batman-adv/hard-interface.h =================================================================== --- trunk/batman-adv/hard-interface.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/hard-interface.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_ +#define _NET_BATMAN_ADV_HARD_INTERFACE_H_ + #define IF_NOT_IN_USE 0 #define IF_TO_BE_REMOVED 1 #define IF_INACTIVE 2 @@ -38,3 +41,5 @@ struct net_device *orig_dev); int hardif_min_mtu(void); void update_min_mtu(void); + +#endif /* _NET_BATMAN_ADV_HARD_INTERFACE_H_ */ Modified: trunk/batman-adv/hash.h =================================================================== --- trunk/batman-adv/hash.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/hash.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,8 +19,9 @@ * */ -#ifndef _BATMAN_HASH_H -#define _BATMAN_HASH_H +#ifndef _NET_BATMAN_ADV_HASH_H_ +#define _NET_BATMAN_ADV_HASH_H_ + #define HASHIT(name) struct hash_it_t name = { \ .index = -1, .bucket = NULL, \ .prev_bucket = NULL, \ @@ -95,4 +96,5 @@ * the returned iterator to access the elements until hash_it_t returns NULL. */ struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_in); -#endif + +#endif /* _NET_BATMAN_ADV_HASH_H_ */ Modified: trunk/batman-adv/icmp_socket.h =================================================================== --- trunk/batman-adv/icmp_socket.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/icmp_socket.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ +#define _NET_BATMAN_ADV_ICMP_SOCKET_H_ + #include "types.h" #define ICMP_SOCKET "socket" @@ -27,3 +30,5 @@ int bat_socket_setup(struct bat_priv *bat_priv); void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet, size_t icmp_len); + +#endif /* _NET_BATMAN_ADV_ICMP_SOCKET_H_ */ Modified: trunk/batman-adv/main.h =================================================================== --- trunk/batman-adv/main.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/main.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_MAIN_H_ +#define _NET_BATMAN_ADV_MAIN_H_ + /* Kernel Programming */ #define LINUX @@ -160,3 +163,5 @@ int is_my_mac(uint8_t *addr); int is_bcast(uint8_t *addr); int is_mcast(uint8_t *addr); + +#endif /* _NET_BATMAN_ADV_MAIN_H_ */ Modified: trunk/batman-adv/originator.h =================================================================== --- trunk/batman-adv/originator.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/originator.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_ORIGINATOR_H_ +#define _NET_BATMAN_ADV_ORIGINATOR_H_ + int originator_init(void); void originator_free(void); void purge_orig(struct work_struct *work); @@ -29,3 +32,5 @@ int orig_seq_print_text(struct seq_file *seq, void *offset); int orig_hash_add_if(struct batman_if *batman_if, int max_if_num); int orig_hash_del_if(struct batman_if *batman_if, int max_if_num); + +#endif /* _NET_BATMAN_ADV_ORIGINATOR_H_ */ Modified: trunk/batman-adv/packet.h =================================================================== --- trunk/batman-adv/packet.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/packet.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_PACKET_H_ +#define _NET_BATMAN_ADV_PACKET_H_ + #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ #define BAT_PACKET 0x01 @@ -115,3 +118,5 @@ uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ } __attribute__((packed)); + +#endif /* _NET_BATMAN_ADV_PACKET_H_ */ Modified: trunk/batman-adv/ring_buffer.h =================================================================== --- trunk/batman-adv/ring_buffer.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/ring_buffer.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,5 +19,10 @@ * */ +#ifndef _NET_BATMAN_ADV_RING_BUFFER_H_ +#define _NET_BATMAN_ADV_RING_BUFFER_H_ + void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value); uint8_t ring_buffer_avg(uint8_t lq_recv[]); + +#endif /* _NET_BATMAN_ADV_RING_BUFFER_H_ */ Modified: trunk/batman-adv/routing.h =================================================================== --- trunk/batman-adv/routing.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/routing.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_ROUTING_H_ +#define _NET_BATMAN_ADV_ROUTING_H_ + #include "types.h" void slide_own_bcast_window(struct batman_if *batman_if); @@ -39,3 +42,5 @@ struct batman_if *recv_if); void update_bonding_candidates(struct bat_priv *bat_priv, struct orig_node *orig_node); + +#endif /* _NET_BATMAN_ADV_ROUTING_H_ */ Modified: trunk/batman-adv/send.h =================================================================== --- trunk/batman-adv/send.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/send.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_SEND_H_ +#define _NET_BATMAN_ADV_SEND_H_ + #include "types.h" int send_skb_packet(struct sk_buff *skb, @@ -35,3 +38,5 @@ int add_bcast_packet_to_list(struct sk_buff *skb); void send_outstanding_bat_packet(struct work_struct *work); void purge_outstanding_packets(struct batman_if *batman_if); + +#endif /* _NET_BATMAN_ADV_SEND_H_ */ Modified: trunk/batman-adv/soft-interface.h =================================================================== --- trunk/batman-adv/soft-interface.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/soft-interface.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ +#define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ + void set_main_if_addr(uint8_t *addr); void interface_setup(struct net_device *dev); int interface_tx(struct sk_buff *skb, struct net_device *dev); @@ -26,3 +29,5 @@ int my_skb_push(struct sk_buff *skb, unsigned int len); extern unsigned char main_if_addr[]; + +#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */ Modified: trunk/batman-adv/translation-table.h =================================================================== --- trunk/batman-adv/translation-table.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/translation-table.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ +#define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ + #include "types.h" int hna_local_init(void); @@ -38,3 +41,5 @@ extern spinlock_t hna_local_hash_lock; extern struct hashtable_t *hna_local_hash; extern atomic_t hna_local_changed; + +#endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */ Modified: trunk/batman-adv/types.h =================================================================== --- trunk/batman-adv/types.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/types.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -23,8 +23,8 @@ -#ifndef TYPES_H -#define TYPES_H +#ifndef _NET_BATMAN_ADV_TYPES_H_ +#define _NET_BATMAN_ADV_TYPES_H_ #include "packet.h" #include "bitarray.h" @@ -184,4 +184,4 @@ struct hlist_node list; }; -#endif +#endif /* _NET_BATMAN_ADV_TYPES_H_ */ Modified: trunk/batman-adv/vis.h =================================================================== --- trunk/batman-adv/vis.h 2010-06-24 15:03:14 UTC (rev 1720) +++ trunk/batman-adv/vis.h 2010-06-24 15:22:06 UTC (rev 1721) @@ -19,6 +19,9 @@ * */ +#ifndef _NET_BATMAN_ADV_VIS_H_ +#define _NET_BATMAN_ADV_VIS_H_ + #define VIS_TIMEOUT 200 /* timeout of vis packets in seconds */ struct vis_info { @@ -53,3 +56,5 @@ int vis_info_len); int vis_init(void); void vis_quit(void); + +#endif /* _NET_BATMAN_ADV_VIS_H_ */

1 0

r1720 - trunk/batctl
by postmaster＠open-mesh.net 24 Jun '10

24 Jun '10

Author: marek Date: 2010-06-24 17:03:14 +0200 (Thu, 24 Jun 2010) New Revision: 1720 Modified: trunk/batctl/Makefile Log: batctl:Use nproc to get number of available processors The current way of getting the number of cpus uses different assumptions which may or may not be true in the future: * /proc/cpuinfo exists * cpuinfo provides a list of all processing units * all processing units are available for the current process and its childs * the word 'processor' is only used in the cpu index and 'model name' lines * cpu index is strict monotonic increasing * lowest cpu index is 0 and highest cpu index is n-1 (n is the number of processing units) At least the number of available processing units for the current process can be shown to be wrong. on current systems by assigning a singe cpu to a process and its childs: $ numactl --physcpubind=0 nproc 1 $ numactl --physcpubind=0 sh -c 'NUM_CPUS=`cat /proc/cpuinfo | grep -v "model name" | grep processor | tail -1 | awk -F" " '\''{print $$3}'\''`;echo `expr $NUM_CPUS + 1`' 4 nproc is part of coreutils since version 8.1. On systems without nproc it will just assume that a single processing unit is available. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batctl/Makefile =================================================================== --- trunk/batctl/Makefile 2010-06-24 15:03:13 UTC (rev 1719) +++ trunk/batctl/Makefile 2010-06-24 15:03:14 UTC (rev 1720) @@ -67,7 +67,7 @@ BAT_VERSION = $(shell grep "^\#define SOURCE_VERSION " $(SOURCE_VERSION_HEADER) | sed -e '1p' -n | awk -F '"' '{print $$2}' | awk '{print $$1}') FILE_NAME = $(PACKAGE_NAME)_$(BAT_VERSION)-rv$(REVISION)_$@ -NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`) +NUM_CPUS = $(shell nproc 2> /dev/null || echo 1) all:

1 0

r1719 - trunk/batman-adv
by postmaster＠open-mesh.net 24 Jun '10

24 Jun '10

Author: marek Date: 2010-06-24 17:03:13 +0200 (Thu, 24 Jun 2010) New Revision: 1719 Modified: trunk/batman-adv/Makefile Log: batman-adv: Use nproc to get number of available processors The current way of getting the number of cpus uses different assumptions which may or may not be true in the future: * /proc/cpuinfo exists * cpuinfo provides a list of all processing units * all processing units are available for the current process and its childs * the word 'processor' is only used in the cpu index and 'model name' lines * cpu index is strict monotonic increasing * lowest cpu index is 0 and highest cpu index is n-1 (n is the number of processing units) At least the number of available processing units for the current process can be shown to be wrong. on current systems by assigning a singe cpu to a process and its childs: $ numactl --physcpubind=0 nproc 1 $ numactl --physcpubind=0 sh -c 'NUM_CPUS=`cat /proc/cpuinfo | grep -v "model name" | grep processor | tail -1 | awk -F" " '\''{print $$3}'\''`;echo `expr $NUM_CPUS + 1`' 4 nproc is part of coreutils since version 8.1. On systems without nproc it will just assume that a single processing unit is available. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv/Makefile =================================================================== --- trunk/batman-adv/Makefile 2010-06-21 13:30:31 UTC (rev 1718) +++ trunk/batman-adv/Makefile 2010-06-24 15:03:13 UTC (rev 1719) @@ -41,7 +41,7 @@ fi; \ fi) -NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`) +NUM_CPUS = $(shell nproc 2> /dev/null || echo 1) include $(PWD)/Makefile.kbuild

1 0

r1718 - branches
by postmaster＠open-mesh.net 21 Jun '10

21 Jun '10

Author: marek Date: 2010-06-21 15:30:31 +0200 (Mon, 21 Jun 2010) New Revision: 1718 Removed: branches/batctl-maint/ Log: batctl: the batctl-maint branch was moved into the git repository Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2010