Name of failed tests
====================
Comment ending without space master
Comment ending without space next
Multiline comment ending at a non-empty line master
Multiline comment ending at a non-empty line next
Multiline comment starting with empty line master
Multiline comment starting with empty line next
unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y
Output of different failed tests
================================
Comment ending without space master:
>>>>>>>>
bat_sysfs.c:156: * unsigned integer value*/
bridge_loop_avoidance.c:1200: **/
gateway_client.c:161: **/
gateway_client.c:198: **/
gateway_client.c:284: **/
gateway_common.c:163: **/
routing.c:704: * refcount.*/
soft-interface.c:312:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/
vis.c:503: * hash.*/
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
types.h:403: /* vis_info may follow here*/
Comment ending without space next:
>>>>>>>>
bat_sysfs.c:156: * unsigned integer value*/
bridge_loop_avoidance.c:1187: **/
gateway_client.c:159: **/
gateway_client.c:196: **/
gateway_client.c:281: **/
gateway_common.c:162: **/
routing.c:702: * refcount.*/
soft-interface.c:305:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/
vis.c:496: * hash.*/
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
types.h:380: /* vis_info may follow here*/
Multiline comment ending at a non-empty line master:
>>>>>>>>
bat_iv_ogm.c:170: * ordinary base packet */
bat_iv_ogm.c:319: * are flooded through the net */
bat_iv_ogm.c:325: * interfaces leave only that interface */
bat_iv_ogm.c:333: * interface only - we still can aggregate */
bat_iv_ogm.c:340: * (= secondary interface packets in general) */
bat_iv_ogm.c:486: * suitable aggregation packet found */
bat_iv_ogm.c:690: * to change */
bat_iv_ogm.c:700: * won't consider it either */
bat_iv_ogm.c:722: * sent through a primary interface */
bat_iv_ogm.c:819: * information */
bat_iv_ogm.c:845: * consider it bidirectional */
bat_iv_ogm.c:1037: * come via the corresponding interface */
bat_iv_ogm.c:1115: * originator mac */
bat_iv_ogm.c:1125: * don't route towards it */
bat_iv_ogm.c:1138: * seqno and similar ttl as the non-duplicate */
bat_sysfs.c:87: * (bat_priv) on or off */
bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */
bat_sysfs.c:156: * unsigned integer value*/
bitarray.c:49: * higher than this one, so we just mark it. */
bitarray.c:58: * set the mark if required */
bitarray.c:84: * seqno window is protected. */
distributed-arp-table.c:335: * IP information */
distributed-arp-table.c:349: * will simply ignore it */
gateway_client.c:36: * the beginning of the dhcp header */
gateway_client.c:537: * - octet 3: option data */
gateway_client.c:542: * Jump the len octet and go to the data octet */
gateway_client.c:670: * set the tq towards ourself as the maximum value */
gateway_client.c:684: * reliable enough */
hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */
hard-interface.c:550: * 802.11 wireless device */
hard-interface.c:565: * check for wireless_handlers != NULL */
icmp_socket.c:315: * deleted */
main.c:40: * list traversals just rcu-locked */
main.c:62: * http://lwn.net/Articles/23634/ */
originator.c:192: * address if it does not exits */
originator.c:524: * if_num */
originator.c:607: * if_num */
routing.c:180: * considered as candidate. */
routing.c:476: * returned router's refcount. */
routing.c:509: * after the current router */
routing.c:512: * does not exist as rcu version */
routing.c:527: * Increases the returned router's refcount */
routing.c:548: * or this one is better, choose it. */
routing.c:552: * previously selected router */
routing.c:604: * forwarded */
routing.c:618: * changes */
routing.c:693: * packets for the correct destination. */
routing.c:704: * refcount.*/
routing.c:723: * always choose the default router. */
routing.c:736: * for a potential bonding candidate. */
routing.c:741: * even be the same as our router_orig in many cases */
routing.c:755: * bonding and prefer the original router. */
routing.c:761: * in. */
routing.c:1086: * if required. */
send.c:36: * specified batman interface */
send.c:73: * (which is > 0). This will not be treated as an error. */
send.c:136: * skb is freed. */
soft-interface.c:185: * requests into the mesh */
soft-interface.c:192: * via unicast to their gateway */
soft-interface.c:223: * this mac is known throughout the mesh */
soft-interface.c:234: * the original skb. */
soft-interface.c:310: * -- Dec 21st 2009, Simon Wunderlich */
translation-table.c:235: * (consistency check) */
translation-table.c:440: * response issued before the net ttvn increment (consistency check) */
translation-table.c:901: * the global entry, since it is useless now. */
translation-table.c:1074: * isolation */
translation-table.c:1173: * account while computing the CRC */
translation-table.c:1210: * last OGM (the OGM could carry no changes) */
translation-table.c:1239: * has already been issued for this orig_node, NULL otherwise */
translation-table.c:1349: * copied */
translation-table.c:1372: * reply from the same orig_node yet */
translation-table.c:1480: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1592: * is too big send the whole local translation table */
translation-table.c:1600: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1766: * consistency purpose) */
translation-table.c:1817: * unset the flag */
translation-table.c:1874: * returns true if the ROAMING_ADV can be sent, false otherwise */
translation-table.c:1883: * reply from the same orig_node yet */
translation-table.c:1926: * already roamed to us too many times */
translation-table.c:2000: * in the given hash table and returns the number of modified entries */
translation-table.c:2170: * increased by one -> we can apply the attached changes */
translation-table.c:2175: * In this case send a tt request */
translation-table.c:2186: * in the global table */
translation-table.c:2196: * inconsistency */
translation-table.c:2201: * unset the flag */
translation-table.c:2205: * in sync anymore -> request fresh tt data */
unicast.c:368: * returns NULL in case of AP isolation */
vis.c:121: * does not already exist in the list */
vis.c:337: * already linked in. */
vis.c:347: * linked in. */
vis.c:391: * is newer than old entries in the hash. */
vis.c:503: * hash.*/
vis.c:557: * Must be called with the originator hash locked */
vis.c:608: * returns 0 on success, -1 if no packet could be generated */
vis.c:706: * held */
vis.c:765: * this node. */
vis.c:881: * initialized (e.g. bat0 is initialized, interfaces have been added) */
bitarray.h:26: * and curr_seqno is within range of last_seqno */
bitarray.h:50: * new, 0 if old */
hash.h:30: * same */
hash.h:35: * argument and the size the second */
hash.h:57: * elements, memory might be leaked. */
hash.h:137: * comparing. */
main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */
main.h:48: * (should be a multiple of our word size) */
main.h:51: * pending tt_req */
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
main.h:84: * candidates */
main.h:88: * forw_packet->direct_link_flags */
main.h:254: * - after adding more than 127 to the starting value - it is a successor */
packet.h:92: * 1 << 15 are used for local computation only */
packet.h:153: * as this is assumed by code that handles ICMP packets */
packet.h:209: * - TT_FULL_TABLE */
packet.h:217: * orig_node */
packet.h:222: * if TT_RESPONSE: table_size */
types.h:103: * soon as I receive a new TTVN from this orig_node */
types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */
types.h:214: * increase my TTVN */
types.h:395: * from. we should not reply to them. */
vis.h:26: * in miliseconds */
Multiline comment ending at a non-empty line next:
>>>>>>>>
bat_iv_ogm.c:169: * ordinary base packet */
bat_iv_ogm.c:314: * are flooded through the net */
bat_iv_ogm.c:320: * interfaces leave only that interface */
bat_iv_ogm.c:328: * interface only - we still can aggregate */
bat_iv_ogm.c:335: * (= secondary interface packets in general) */
bat_iv_ogm.c:481: * suitable aggregation packet found */
bat_iv_ogm.c:685: * to change */
bat_iv_ogm.c:695: * won't consider it either */
bat_iv_ogm.c:717: * sent through a primary interface */
bat_iv_ogm.c:814: * information */
bat_iv_ogm.c:840: * consider it bidirectional */
bat_iv_ogm.c:1031: * come via the corresponding interface */
bat_iv_ogm.c:1109: * originator mac */
bat_iv_ogm.c:1119: * don't route towards it */
bat_iv_ogm.c:1132: * seqno and similar ttl as the non-duplicate */
bat_sysfs.c:87: * (bat_priv) on or off */
bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */
bat_sysfs.c:156: * unsigned integer value*/
bitarray.c:49: * higher than this one, so we just mark it. */
bitarray.c:58: * set the mark if required */
bitarray.c:84: * seqno window is protected. */
distributed-arp-table.c:336: * IP information */
distributed-arp-table.c:350: * will simply ignore it */
gateway_client.c:36: * the beginning of the dhcp header */
gateway_client.c:533: * - octet 3: option data */
gateway_client.c:538: * Jump the len octet and go to the data octet */
gateway_client.c:666: * set the tq towards ourself as the maximum value */
gateway_client.c:680: * reliable enough */
hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */
hard-interface.c:550: * 802.11 wireless device */
hard-interface.c:565: * check for wireless_handlers != NULL */
icmp_socket.c:315: * deleted */
main.c:40: * list traversals just rcu-locked */
main.c:62: * http://lwn.net/Articles/23634/ */
originator.c:192: * address if it does not exits */
originator.c:523: * if_num */
originator.c:606: * if_num */
routing.c:180: * considered as candidate. */
routing.c:476: * returned router's refcount. */
routing.c:509: * after the current router */
routing.c:512: * does not exist as rcu version */
routing.c:527: * Increases the returned router's refcount */
routing.c:548: * or this one is better, choose it. */
routing.c:552: * previously selected router */
routing.c:604: * forwarded */
routing.c:617: * changes */
routing.c:691: * packets for the correct destination. */
routing.c:702: * refcount.*/
routing.c:721: * always choose the default router. */
routing.c:734: * for a potential bonding candidate. */
routing.c:739: * even be the same as our router_orig in many cases */
routing.c:753: * bonding and prefer the original router. */
routing.c:759: * in. */
routing.c:1080: * if required. */
send.c:36: * specified batman interface */
send.c:73: * (which is > 0). This will not be treated as an error. */
send.c:109: * and wait for the tt table request which will be fragmented */
send.c:208: * skb is freed. */
soft-interface.c:178: * requests into the mesh */
soft-interface.c:185: * via unicast to their gateway */
soft-interface.c:216: * this mac is known throughout the mesh */
soft-interface.c:227: * the original skb. */
soft-interface.c:303: * -- Dec 21st 2009, Simon Wunderlich */
translation-table.c:235: * (consistency check) */
translation-table.c:308: * problems */
translation-table.c:392: * response issued before the net ttvn increment (consistency check) */
translation-table.c:853: * the global entry, since it is useless now. */
translation-table.c:1026: * isolation */
translation-table.c:1125: * account while computing the CRC */
translation-table.c:1162: * last OGM (the OGM could carry no changes) */
translation-table.c:1191: * has already been issued for this orig_node, NULL otherwise */
translation-table.c:1301: * copied */
translation-table.c:1324: * reply from the same orig_node yet */
translation-table.c:1430: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1540: * is too big send the whole local translation table */
translation-table.c:1548: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1712: * consistency purpose) */
translation-table.c:1761: * unset the flag */
translation-table.c:1814: * returns true if the ROAMING_ADV can be sent, false otherwise */
translation-table.c:1823: * reply from the same orig_node yet */
translation-table.c:1866: * already roamed to us too many times */
translation-table.c:1938: * in the given hash table and returns the number of modified entries */
translation-table.c:2019: * entries */
translation-table.c:2072: * increased by one -> we can apply the attached changes */
translation-table.c:2077: * In this case send a tt request */
translation-table.c:2088: * in the global table */
translation-table.c:2098: * inconsistency */
translation-table.c:2103: * unset the flag */
translation-table.c:2107: * in sync anymore -> request fresh tt data */
unicast.c:368: * returns NULL in case of AP isolation */
vis.c:121: * does not already exist in the list */
vis.c:330: * already linked in. */
vis.c:340: * linked in. */
vis.c:384: * is newer than old entries in the hash. */
vis.c:496: * hash.*/
vis.c:550: * Must be called with the originator hash locked */
vis.c:601: * returns 0 on success, -1 if no packet could be generated */
vis.c:699: * held */
vis.c:758: * this node. */
vis.c:874: * initialized (e.g. bat0 is initialized, interfaces have been added) */
bitarray.h:26: * and curr_seqno is within range of last_seqno */
bitarray.h:50: * new, 0 if old */
hash.h:30: * same */
hash.h:35: * argument and the size the second */
hash.h:53: * elements, memory might be leaked. */
hash.h:136: * comparing. */
main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */
main.h:48: * (should be a multiple of our word size) */
main.h:51: * pending tt_req */
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
main.h:84: * candidates */
main.h:88: * forw_packet->direct_link_flags */
main.h:252: * - after adding more than 127 to the starting value - it is a successor */
packet.h:92: * 1 << 15 are used for local computation only */
packet.h:153: * as this is assumed by code that handles ICMP packets */
packet.h:209: * - TT_FULL_TABLE */
packet.h:217: * orig_node */
packet.h:222: * if TT_RESPONSE: table_size */
types.h:103: * soon as I receive a new TTVN from this orig_node */
types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */
types.h:191: * increase my TTVN */
types.h:372: * from. we should not reply to them. */
vis.h:26: * in miliseconds */
Multiline comment starting with empty line master:
>>>>>>>>
bat_debugfs.c:1:/*
bat_iv_ogm.c:1:/*
bat_iv_ogm.c:291: /**
bat_iv_ogm.c:305: /**
bat_iv_ogm.c:456: /**
bat_iv_ogm.c:491: /**
bat_sysfs.c:1:/*
bitarray.c:1:/*
bridge_loop_avoidance.c:1:/*
bridge_loop_avoidance.c:126:/**
bridge_loop_avoidance.c:165:/**
bridge_loop_avoidance.c:244:/**
bridge_loop_avoidance.c:350:/**
bridge_loop_avoidance.c:425:/**
bridge_loop_avoidance.c:471:/**
bridge_loop_avoidance.c:498:/**
bridge_loop_avoidance.c:519:/**
bridge_loop_avoidance.c:734:/**
bridge_loop_avoidance.c:813:/**
bridge_loop_avoidance.c:966:/**
bridge_loop_avoidance.c:1014:/**
bridge_loop_avoidance.c:1186:/**
bridge_loop_avoidance.c:1253:/**
bridge_loop_avoidance.c:1294:/**
bridge_loop_avoidance.c:1363:/**
bridge_loop_avoidance.c:1452:/**
compat.c:1:/*
distributed-arp-table.c:1:/*
gateway_client.c:1:/*
gateway_client.c:154: default: /**
gateway_client.c:193: /**
gateway_client.c:281: /**
gateway_client.c:340: /**
gateway_client.c:429:/**
gateway_common.c:1:/*
gateway_common.c:159: /**
hard-interface.c:1:/*
hard-interface.c:237: /**
hard-interface.c:444: /**
hash.c:1:/*
icmp_socket.c:1:/*
main.c:1:/*
originator.c:1:/*
ring_buffer.c:1:/*
routing.c:1:/*
routing.c:168: /**
routing.c:400: /**
send.c:1:/*
send.c:89: /**
send.c:254: /**
send.c:290: /**
send.c:300: /**
send.c:319: /**
send.c:329: /**
soft-interface.c:1:/*
soft-interface.c:69: /**
soft-interface.c:357: /**
translation-table.c:1:/*
unicast.c:1:/*
unicast.c:372: /**
vis.c:1:/*
bat_algo.h:1:/*
bat_debugfs.h:1:/*
bat_sysfs.h:1:/*
bitarray.h:1:/*
bridge_loop_avoidance.h:1:/*
compat.h:1:/*
distributed-arp-table.h:1:/*
gateway_client.h:1:/*
gateway_common.h:1:/*
hard-interface.h:1:/*
hash.h:1:/*
hash.h:83:/**
icmp_socket.h:1:/*
main.h:1:/*
main.h:218:/**
main.h:229:/**
originator.h:1:/*
packet.h:1:/*
ring_buffer.h:1:/*
routing.h:1:/*
send.h:1:/*
soft-interface.h:1:/*
translation-table.h:1:/*
types.h:1:/*
types.h:63:/**
types.h:135:/**
types.h:352:/**
unicast.h:1:/*
vis.h:1:/*
Multiline comment starting with empty line next:
>>>>>>>>
bat_debugfs.c:1:/*
bat_iv_ogm.c:1:/*
bat_iv_ogm.c:286: /**
bat_iv_ogm.c:300: /**
bat_iv_ogm.c:451: /**
bat_iv_ogm.c:486: /**
bat_sysfs.c:1:/*
bitarray.c:1:/*
bridge_loop_avoidance.c:1:/*
bridge_loop_avoidance.c:126:/**
bridge_loop_avoidance.c:165:/**
bridge_loop_avoidance.c:244:/**
bridge_loop_avoidance.c:350:/**
bridge_loop_avoidance.c:425:/**
bridge_loop_avoidance.c:471:/**
bridge_loop_avoidance.c:498:/**
bridge_loop_avoidance.c:519:/**
bridge_loop_avoidance.c:734:/**
bridge_loop_avoidance.c:813:/**
bridge_loop_avoidance.c:966:/**
bridge_loop_avoidance.c:1014:/**
bridge_loop_avoidance.c:1173:/**
bridge_loop_avoidance.c:1240:/**
bridge_loop_avoidance.c:1281:/**
bridge_loop_avoidance.c:1350:/**
bridge_loop_avoidance.c:1439:/**
compat.c:1:/*
distributed-arp-table.c:1:/*
gateway_client.c:1:/*
gateway_client.c:152: default: /**
gateway_client.c:191: /**
gateway_client.c:278: /**
gateway_client.c:337: /**
gateway_client.c:425:/**
gateway_common.c:1:/*
gateway_common.c:158: /**
hard-interface.c:1:/*
hard-interface.c:237: /**
hard-interface.c:444: /**
hash.c:1:/*
icmp_socket.c:1:/*
main.c:1:/*
originator.c:1:/*
ring_buffer.c:1:/*
routing.c:1:/*
routing.c:168: /**
routing.c:400: /**
send.c:1:/*
send.c:142: /**
send.c:326: /**
send.c:362: /**
send.c:372: /**
send.c:391: /**
send.c:401: /**
soft-interface.c:1:/*
soft-interface.c:62: /**
soft-interface.c:350: /**
translation-table.c:1:/*
translation-table.c:310: /**
unicast.c:1:/*
unicast.c:372: /**
vis.c:1:/*
bat_algo.h:1:/*
bat_debugfs.h:1:/*
bat_sysfs.h:1:/*
bitarray.h:1:/*
bridge_loop_avoidance.h:1:/*
compat.h:1:/*
distributed-arp-table.h:1:/*
gateway_client.h:1:/*
gateway_common.h:1:/*
hard-interface.h:1:/*
hash.h:1:/*
hash.h:79:/**
icmp_socket.h:1:/*
main.h:1:/*
main.h:216:/**
main.h:227:/**
originator.h:1:/*
packet.h:1:/*
ring_buffer.h:1:/*
routing.h:1:/*
send.h:1:/*
soft-interface.h:1:/*
translation-table.h:1:/*
types.h:1:/*
types.h:63:/**
types.h:135:/**
types.h:329:/**
unicast.h:1:/*
vis.h:1:/*
unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n:
>>>>>>>>
prepare_unicast_4addr_packet
tt_local_crc
unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y:
>>>>>>>>
tt_local_crc
unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n:
>>>>>>>>
prepare_unicast_4addr_packet
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y:
>>>>>>>>
add_bcast_packet_to_list
bat_algo_register
bat_algo_select
bat_algo_seq_print_text
bat_event_workqueue
bat_routing_algo
bat_socket_init
bat_socket_receive_packet
bat_socket_setup
batman_skb_recv
bonding_candidate_add
bonding_candidate_del
bonding_save_primary
broadcast_addr
check_management_packet
dec_module_count
find_router
frag_list_free
frag_reassemble_skb
frag_send_skb
get_orig_node
handle_tt_response
hard_if_notifier
hardif_disable_interface
hardif_enable_interface
hardif_free_rcu
hardif_get_by_netdev
hardif_list
hardif_min_mtu
hardif_remove_interfaces
hash_destroy
hash_new
inc_module_count
interface_rx
is_ap_isolated
is_my_client
is_my_mac
is_wifi_iface
mesh_free
mesh_init
my_skb_head_push
neigh_node_free_ref
orig_hash_add_if
orig_hash_del_if
orig_node_free_ref
orig_node_get_router
orig_seq_print_text
originator_free
originator_init
prepare_unicast_4addr_packet
purge_orig_ref
purge_outstanding_packets
receive_client_update_packet
receive_server_sync_packet
recv_bcast_packet
recv_handler_register
recv_handler_unregister
recv_icmp_packet
recv_roam_adv
recv_tt_query
recv_ucast_frag_packet
recv_unicast_packet
recv_vis_packet
ring_buffer_avg
ring_buffer_set
schedule_bat_ogm
send_outstanding_bat_ogm_packet
send_skb_packet
send_tt_response
slide_own_bcast_window
softif_create
softif_destroy
softif_is_valid
transtable_search
tt_free
tt_global_add
tt_global_client_is_roaming
tt_global_del_orig
tt_global_seq_print_text
tt_init
tt_len
tt_local_add
tt_local_crc
tt_local_remove
tt_local_seq_print_text
tt_update_orig
unicast_generic_send_skb
update_min_mtu
update_route
vis_init
vis_quit
vis_seq_print_text
window_protected
Name of failed tests
====================
Comment ending without space master
Comment ending without space next
Multiline comment ending at a non-empty line master
Multiline comment ending at a non-empty line next
Multiline comment starting with empty line master
Multiline comment starting with empty line next
unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
Output of different failed tests
================================
Comment ending without space master:
>>>>>>>>
bat_sysfs.c:156: * unsigned integer value*/
bridge_loop_avoidance.c:1199: **/
gateway_client.c:159: **/
gateway_client.c:196: **/
gateway_client.c:281: **/
gateway_common.c:162: **/
routing.c:704: * refcount.*/
soft-interface.c:312:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/
vis.c:503: * hash.*/
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
types.h:403: /* vis_info may follow here*/
Comment ending without space next:
>>>>>>>>
bat_sysfs.c:156: * unsigned integer value*/
bridge_loop_avoidance.c:1187: **/
gateway_client.c:159: **/
gateway_client.c:196: **/
gateway_client.c:281: **/
gateway_common.c:162: **/
routing.c:702: * refcount.*/
soft-interface.c:305:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/
vis.c:496: * hash.*/
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
types.h:380: /* vis_info may follow here*/
Multiline comment ending at a non-empty line master:
>>>>>>>>
bat_iv_ogm.c:170: * ordinary base packet */
bat_iv_ogm.c:319: * are flooded through the net */
bat_iv_ogm.c:325: * interfaces leave only that interface */
bat_iv_ogm.c:333: * interface only - we still can aggregate */
bat_iv_ogm.c:340: * (= secondary interface packets in general) */
bat_iv_ogm.c:486: * suitable aggregation packet found */
bat_iv_ogm.c:690: * to change */
bat_iv_ogm.c:700: * won't consider it either */
bat_iv_ogm.c:722: * sent through a primary interface */
bat_iv_ogm.c:819: * information */
bat_iv_ogm.c:845: * consider it bidirectional */
bat_iv_ogm.c:1037: * come via the corresponding interface */
bat_iv_ogm.c:1115: * originator mac */
bat_iv_ogm.c:1125: * don't route towards it */
bat_iv_ogm.c:1138: * seqno and similar ttl as the non-duplicate */
bat_sysfs.c:87: * (bat_priv) on or off */
bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */
bat_sysfs.c:156: * unsigned integer value*/
bitarray.c:49: * higher than this one, so we just mark it. */
bitarray.c:58: * set the mark if required */
bitarray.c:84: * seqno window is protected. */
distributed-arp-table.c:335: * IP information */
distributed-arp-table.c:349: * will simply ignore it */
gateway_client.c:36: * the beginning of the dhcp header */
gateway_client.c:533: * - octet 3: option data */
gateway_client.c:538: * Jump the len octet and go to the data octet */
gateway_client.c:666: * set the tq towards ourself as the maximum value */
gateway_client.c:680: * reliable enough */
hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */
hard-interface.c:550: * 802.11 wireless device */
hard-interface.c:565: * check for wireless_handlers != NULL */
icmp_socket.c:315: * deleted */
main.c:40: * list traversals just rcu-locked */
main.c:62: * http://lwn.net/Articles/23634/ */
originator.c:192: * address if it does not exits */
originator.c:523: * if_num */
originator.c:606: * if_num */
routing.c:180: * considered as candidate. */
routing.c:476: * returned router's refcount. */
routing.c:509: * after the current router */
routing.c:512: * does not exist as rcu version */
routing.c:527: * Increases the returned router's refcount */
routing.c:548: * or this one is better, choose it. */
routing.c:552: * previously selected router */
routing.c:604: * forwarded */
routing.c:618: * changes */
routing.c:693: * packets for the correct destination. */
routing.c:704: * refcount.*/
routing.c:723: * always choose the default router. */
routing.c:736: * for a potential bonding candidate. */
routing.c:741: * even be the same as our router_orig in many cases */
routing.c:755: * bonding and prefer the original router. */
routing.c:761: * in. */
routing.c:931: * not try to reroute the packet!! */
routing.c:1085: * if required. */
send.c:36: * specified batman interface */
send.c:73: * (which is > 0). This will not be treated as an error. */
send.c:136: * skb is freed. */
soft-interface.c:185: * requests into the mesh */
soft-interface.c:192: * via unicast to their gateway */
soft-interface.c:223: * this mac is known throughout the mesh */
soft-interface.c:234: * the original skb. */
soft-interface.c:310: * -- Dec 21st 2009, Simon Wunderlich */
translation-table.c:235: * (consistency check) */
translation-table.c:440: * response issued before the net ttvn increment (consistency check) */
translation-table.c:901: * the global entry, since it is useless now. */
translation-table.c:1074: * isolation */
translation-table.c:1173: * account while computing the CRC */
translation-table.c:1210: * last OGM (the OGM could carry no changes) */
translation-table.c:1239: * has already been issued for this orig_node, NULL otherwise */
translation-table.c:1349: * copied */
translation-table.c:1372: * reply from the same orig_node yet */
translation-table.c:1480: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1592: * is too big send the whole local translation table */
translation-table.c:1600: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1766: * consistency purpose) */
translation-table.c:1817: * unset the flag */
translation-table.c:1874: * returns true if the ROAMING_ADV can be sent, false otherwise */
translation-table.c:1883: * reply from the same orig_node yet */
translation-table.c:1926: * already roamed to us too many times */
translation-table.c:2000: * in the given hash table and returns the number of modified entries */
translation-table.c:2170: * increased by one -> we can apply the attached changes */
translation-table.c:2175: * In this case send a tt request */
translation-table.c:2186: * in the global table */
translation-table.c:2196: * inconsistency */
translation-table.c:2201: * unset the flag */
translation-table.c:2205: * in sync anymore -> request fresh tt data */
translation-table.c:2223: * purposes */
unicast.c:368: * returns NULL in case of AP isolation */
unicast.c:401: * than the current one */
vis.c:121: * does not already exist in the list */
vis.c:337: * already linked in. */
vis.c:347: * linked in. */
vis.c:391: * is newer than old entries in the hash. */
vis.c:503: * hash.*/
vis.c:557: * Must be called with the originator hash locked */
vis.c:608: * returns 0 on success, -1 if no packet could be generated */
vis.c:706: * held */
vis.c:765: * this node. */
vis.c:881: * initialized (e.g. bat0 is initialized, interfaces have been added) */
bitarray.h:26: * and curr_seqno is within range of last_seqno */
bitarray.h:50: * new, 0 if old */
hash.h:30: * same */
hash.h:35: * argument and the size the second */
hash.h:56: * elements, memory might be leaked. */
hash.h:136: * comparing. */
main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */
main.h:48: * (should be a multiple of our word size) */
main.h:51: * pending tt_req */
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
main.h:84: * candidates */
main.h:88: * forw_packet->direct_link_flags */
main.h:253: * - after adding more than 127 to the starting value - it is a successor */
packet.h:92: * 1 << 15 are used for local computation only */
packet.h:153: * as this is assumed by code that handles ICMP packets */
packet.h:209: * - TT_FULL_TABLE */
packet.h:217: * orig_node */
packet.h:222: * if TT_RESPONSE: table_size */
types.h:103: * soon as I receive a new TTVN from this orig_node */
types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */
types.h:214: * increase my TTVN */
types.h:395: * from. we should not reply to them. */
vis.h:26: * in miliseconds */
Multiline comment ending at a non-empty line next:
>>>>>>>>
bat_iv_ogm.c:169: * ordinary base packet */
bat_iv_ogm.c:314: * are flooded through the net */
bat_iv_ogm.c:320: * interfaces leave only that interface */
bat_iv_ogm.c:328: * interface only - we still can aggregate */
bat_iv_ogm.c:335: * (= secondary interface packets in general) */
bat_iv_ogm.c:481: * suitable aggregation packet found */
bat_iv_ogm.c:685: * to change */
bat_iv_ogm.c:695: * won't consider it either */
bat_iv_ogm.c:717: * sent through a primary interface */
bat_iv_ogm.c:814: * information */
bat_iv_ogm.c:840: * consider it bidirectional */
bat_iv_ogm.c:1031: * come via the corresponding interface */
bat_iv_ogm.c:1109: * originator mac */
bat_iv_ogm.c:1119: * don't route towards it */
bat_iv_ogm.c:1132: * seqno and similar ttl as the non-duplicate */
bat_sysfs.c:87: * (bat_priv) on or off */
bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */
bat_sysfs.c:156: * unsigned integer value*/
bitarray.c:49: * higher than this one, so we just mark it. */
bitarray.c:58: * set the mark if required */
bitarray.c:84: * seqno window is protected. */
distributed-arp-table.c:336: * IP information */
distributed-arp-table.c:350: * will simply ignore it */
gateway_client.c:36: * the beginning of the dhcp header */
gateway_client.c:533: * - octet 3: option data */
gateway_client.c:538: * Jump the len octet and go to the data octet */
gateway_client.c:666: * set the tq towards ourself as the maximum value */
gateway_client.c:680: * reliable enough */
hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */
hard-interface.c:550: * 802.11 wireless device */
hard-interface.c:565: * check for wireless_handlers != NULL */
icmp_socket.c:315: * deleted */
main.c:40: * list traversals just rcu-locked */
main.c:62: * http://lwn.net/Articles/23634/ */
originator.c:192: * address if it does not exits */
originator.c:523: * if_num */
originator.c:606: * if_num */
routing.c:180: * considered as candidate. */
routing.c:476: * returned router's refcount. */
routing.c:509: * after the current router */
routing.c:512: * does not exist as rcu version */
routing.c:527: * Increases the returned router's refcount */
routing.c:548: * or this one is better, choose it. */
routing.c:552: * previously selected router */
routing.c:604: * forwarded */
routing.c:617: * changes */
routing.c:691: * packets for the correct destination. */
routing.c:702: * refcount.*/
routing.c:721: * always choose the default router. */
routing.c:734: * for a potential bonding candidate. */
routing.c:739: * even be the same as our router_orig in many cases */
routing.c:753: * bonding and prefer the original router. */
routing.c:759: * in. */
routing.c:925: * not try to reroute the packet!! */
routing.c:1079: * if required. */
send.c:36: * specified batman interface */
send.c:73: * (which is > 0). This will not be treated as an error. */
send.c:109: * and wait for the tt table request which will be fragmented */
send.c:208: * skb is freed. */
soft-interface.c:178: * requests into the mesh */
soft-interface.c:185: * via unicast to their gateway */
soft-interface.c:216: * this mac is known throughout the mesh */
soft-interface.c:227: * the original skb. */
soft-interface.c:303: * -- Dec 21st 2009, Simon Wunderlich */
translation-table.c:235: * (consistency check) */
translation-table.c:308: * problems */
translation-table.c:392: * response issued before the net ttvn increment (consistency check) */
translation-table.c:853: * the global entry, since it is useless now. */
translation-table.c:1026: * isolation */
translation-table.c:1125: * account while computing the CRC */
translation-table.c:1162: * last OGM (the OGM could carry no changes) */
translation-table.c:1191: * has already been issued for this orig_node, NULL otherwise */
translation-table.c:1301: * copied */
translation-table.c:1324: * reply from the same orig_node yet */
translation-table.c:1430: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1540: * is too big send the whole local translation table */
translation-table.c:1548: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1712: * consistency purpose) */
translation-table.c:1761: * unset the flag */
translation-table.c:1814: * returns true if the ROAMING_ADV can be sent, false otherwise */
translation-table.c:1823: * reply from the same orig_node yet */
translation-table.c:1866: * already roamed to us too many times */
translation-table.c:1938: * in the given hash table and returns the number of modified entries */
translation-table.c:2019: * entries */
translation-table.c:2072: * increased by one -> we can apply the attached changes */
translation-table.c:2077: * In this case send a tt request */
translation-table.c:2088: * in the global table */
translation-table.c:2098: * inconsistency */
translation-table.c:2103: * unset the flag */
translation-table.c:2107: * in sync anymore -> request fresh tt data */
translation-table.c:2125: * purposes */
unicast.c:368: * returns NULL in case of AP isolation */
unicast.c:401: * than the current one */
vis.c:121: * does not already exist in the list */
vis.c:330: * already linked in. */
vis.c:340: * linked in. */
vis.c:384: * is newer than old entries in the hash. */
vis.c:496: * hash.*/
vis.c:550: * Must be called with the originator hash locked */
vis.c:601: * returns 0 on success, -1 if no packet could be generated */
vis.c:699: * held */
vis.c:758: * this node. */
vis.c:874: * initialized (e.g. bat0 is initialized, interfaces have been added) */
bitarray.h:26: * and curr_seqno is within range of last_seqno */
bitarray.h:50: * new, 0 if old */
hash.h:30: * same */
hash.h:35: * argument and the size the second */
hash.h:53: * elements, memory might be leaked. */
hash.h:136: * comparing. */
main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */
main.h:48: * (should be a multiple of our word size) */
main.h:51: * pending tt_req */
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
main.h:84: * candidates */
main.h:88: * forw_packet->direct_link_flags */
main.h:252: * - after adding more than 127 to the starting value - it is a successor */
packet.h:92: * 1 << 15 are used for local computation only */
packet.h:153: * as this is assumed by code that handles ICMP packets */
packet.h:209: * - TT_FULL_TABLE */
packet.h:217: * orig_node */
packet.h:222: * if TT_RESPONSE: table_size */
types.h:103: * soon as I receive a new TTVN from this orig_node */
types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */
types.h:191: * increase my TTVN */
types.h:372: * from. we should not reply to them. */
vis.h:26: * in miliseconds */
Multiline comment starting with empty line master:
>>>>>>>>
bat_debugfs.c:1:/*
bat_iv_ogm.c:1:/*
bat_iv_ogm.c:291: /**
bat_iv_ogm.c:305: /**
bat_iv_ogm.c:456: /**
bat_iv_ogm.c:491: /**
bat_sysfs.c:1:/*
bitarray.c:1:/*
bridge_loop_avoidance.c:1:/*
bridge_loop_avoidance.c:126:/**
bridge_loop_avoidance.c:165:/**
bridge_loop_avoidance.c:244:/**
bridge_loop_avoidance.c:350:/**
bridge_loop_avoidance.c:425:/**
bridge_loop_avoidance.c:471:/**
bridge_loop_avoidance.c:498:/**
bridge_loop_avoidance.c:519:/**
bridge_loop_avoidance.c:734:/**
bridge_loop_avoidance.c:813:/**
bridge_loop_avoidance.c:966:/**
bridge_loop_avoidance.c:1014:/**
bridge_loop_avoidance.c:1185:/**
bridge_loop_avoidance.c:1252:/**
bridge_loop_avoidance.c:1293:/**
bridge_loop_avoidance.c:1362:/**
bridge_loop_avoidance.c:1451:/**
compat.c:1:/*
distributed-arp-table.c:1:/*
gateway_client.c:1:/*
gateway_client.c:152: default: /**
gateway_client.c:191: /**
gateway_client.c:278: /**
gateway_client.c:337: /**
gateway_client.c:425:/**
gateway_common.c:1:/*
gateway_common.c:158: /**
hard-interface.c:1:/*
hard-interface.c:237: /**
hard-interface.c:444: /**
hash.c:1:/*
icmp_socket.c:1:/*
main.c:1:/*
originator.c:1:/*
ring_buffer.c:1:/*
routing.c:1:/*
routing.c:168: /**
routing.c:400: /**
send.c:1:/*
send.c:89: /**
send.c:254: /**
send.c:290: /**
send.c:300: /**
send.c:319: /**
send.c:329: /**
soft-interface.c:1:/*
soft-interface.c:69: /**
soft-interface.c:357: /**
translation-table.c:1:/*
unicast.c:1:/*
unicast.c:372: /**
vis.c:1:/*
bat_algo.h:1:/*
bat_debugfs.h:1:/*
bat_sysfs.h:1:/*
bitarray.h:1:/*
bridge_loop_avoidance.h:1:/*
compat.h:1:/*
distributed-arp-table.h:1:/*
gateway_client.h:1:/*
gateway_common.h:1:/*
hard-interface.h:1:/*
hash.h:1:/*
hash.h:82:/**
icmp_socket.h:1:/*
main.h:1:/*
main.h:217:/**
main.h:228:/**
originator.h:1:/*
packet.h:1:/*
ring_buffer.h:1:/*
routing.h:1:/*
send.h:1:/*
soft-interface.h:1:/*
translation-table.h:1:/*
types.h:1:/*
types.h:63:/**
types.h:135:/**
types.h:352:/**
unicast.h:1:/*
vis.h:1:/*
Multiline comment starting with empty line next:
>>>>>>>>
bat_debugfs.c:1:/*
bat_iv_ogm.c:1:/*
bat_iv_ogm.c:286: /**
bat_iv_ogm.c:300: /**
bat_iv_ogm.c:451: /**
bat_iv_ogm.c:486: /**
bat_sysfs.c:1:/*
bitarray.c:1:/*
bridge_loop_avoidance.c:1:/*
bridge_loop_avoidance.c:126:/**
bridge_loop_avoidance.c:165:/**
bridge_loop_avoidance.c:244:/**
bridge_loop_avoidance.c:350:/**
bridge_loop_avoidance.c:425:/**
bridge_loop_avoidance.c:471:/**
bridge_loop_avoidance.c:498:/**
bridge_loop_avoidance.c:519:/**
bridge_loop_avoidance.c:734:/**
bridge_loop_avoidance.c:813:/**
bridge_loop_avoidance.c:966:/**
bridge_loop_avoidance.c:1014:/**
bridge_loop_avoidance.c:1173:/**
bridge_loop_avoidance.c:1240:/**
bridge_loop_avoidance.c:1281:/**
bridge_loop_avoidance.c:1350:/**
bridge_loop_avoidance.c:1439:/**
compat.c:1:/*
distributed-arp-table.c:1:/*
gateway_client.c:1:/*
gateway_client.c:152: default: /**
gateway_client.c:191: /**
gateway_client.c:278: /**
gateway_client.c:337: /**
gateway_client.c:425:/**
gateway_common.c:1:/*
gateway_common.c:158: /**
hard-interface.c:1:/*
hard-interface.c:237: /**
hard-interface.c:444: /**
hash.c:1:/*
icmp_socket.c:1:/*
main.c:1:/*
originator.c:1:/*
ring_buffer.c:1:/*
routing.c:1:/*
routing.c:168: /**
routing.c:400: /**
send.c:1:/*
send.c:142: /**
send.c:326: /**
send.c:362: /**
send.c:372: /**
send.c:391: /**
send.c:401: /**
soft-interface.c:1:/*
soft-interface.c:62: /**
soft-interface.c:350: /**
translation-table.c:1:/*
translation-table.c:310: /**
unicast.c:1:/*
unicast.c:372: /**
vis.c:1:/*
bat_algo.h:1:/*
bat_debugfs.h:1:/*
bat_sysfs.h:1:/*
bitarray.h:1:/*
bridge_loop_avoidance.h:1:/*
compat.h:1:/*
distributed-arp-table.h:1:/*
gateway_client.h:1:/*
gateway_common.h:1:/*
hard-interface.h:1:/*
hash.h:1:/*
hash.h:79:/**
icmp_socket.h:1:/*
main.h:1:/*
main.h:216:/**
main.h:227:/**
originator.h:1:/*
packet.h:1:/*
ring_buffer.h:1:/*
routing.h:1:/*
send.h:1:/*
soft-interface.h:1:/*
translation-table.h:1:/*
types.h:1:/*
types.h:63:/**
types.h:135:/**
types.h:329:/**
unicast.h:1:/*
vis.h:1:/*
unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n:
>>>>>>>>
tt_local_crc
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n:
>>>>>>>>
add_bcast_packet_to_list
bat_algo_register
bat_algo_select
bat_algo_seq_print_text
bat_event_workqueue
bat_iv_init
bat_routing_algo
bat_socket_init
bat_socket_receive_packet
bat_socket_setup
batman_skb_recv
bit_get_packet
bla_check_bcast_duplist
bla_claim_table_seq_print_text
bla_free
bla_init
bla_is_backbone_gw
bla_is_backbone_gw_orig
bla_rx
bla_tx
bla_update_orig_address
bonding_candidate_add
bonding_candidate_del
bonding_save_primary
broadcast_addr
check_management_packet
debugfs_add_meshif
debugfs_del_meshif
debugfs_destroy
debugfs_init
dec_module_count
find_router
frag_list_free
frag_reassemble_skb
frag_send_skb
get_orig_node
gw_bandwidth_set
gw_bandwidth_to_kbit
gw_check_election
gw_client_seq_print_text
gw_deselect
gw_election
gw_get_selected_orig
gw_is_dhcp_target
gw_node_delete
gw_node_purge
gw_node_update
gw_out_of_range
handle_tt_response
hard_if_notifier
hardif_disable_interface
hardif_enable_interface
hardif_free_rcu
hardif_get_by_netdev
hardif_list
hardif_min_mtu
hardif_remove_interfaces
hash_destroy
hash_new
hash_set_lock_class
inc_module_count
interface_rx
is_ap_isolated
is_my_client
is_my_mac
is_wifi_iface
mesh_free
mesh_init
my_skb_head_push
neigh_node_free_ref
orig_hash_add_if
orig_hash_del_if
orig_node_free_ref
orig_node_get_router
orig_seq_print_text
originator_free
originator_init
prepare_unicast_4addr_packet
purge_orig_ref
purge_outstanding_packets
receive_client_update_packet
receive_server_sync_packet
recv_bcast_packet
recv_handler_register
recv_handler_unregister
recv_icmp_packet
recv_roam_adv
recv_tt_query
recv_ucast_frag_packet
recv_unicast_packet
recv_vis_packet
ring_buffer_avg
ring_buffer_set
schedule_bat_ogm
send_outstanding_bat_ogm_packet
send_skb_packet
send_tt_response
slide_own_bcast_window
softif_create
softif_destroy
softif_is_valid
sysfs_add_hardif
sysfs_add_meshif
sysfs_del_hardif
sysfs_del_meshif
throw_uevent
transtable_search
tt_free
tt_global_add
tt_global_client_is_roaming
tt_global_del_orig
tt_global_seq_print_text
tt_init
tt_len
tt_local_add
tt_local_crc
tt_local_remove
tt_local_seq_print_text
tt_update_orig
unicast_generic_send_skb
update_min_mtu
update_route
vis_init
vis_quit
vis_seq_print_text
window_protected
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n:
>>>>>>>>
add_bcast_packet_to_list
arp_change_timeout
bat_algo_register
bat_algo_select
bat_algo_seq_print_text
bat_event_workqueue
bat_iv_init
bat_routing_algo
bat_socket_init
bat_socket_receive_packet
bat_socket_setup
batman_skb_recv
bit_get_packet
bonding_candidate_add
bonding_candidate_del
bonding_save_primary
broadcast_addr
check_management_packet
dat_drop_broadcast_packet
dat_snoop_incoming_arp_reply
dat_snoop_incoming_arp_request
dat_snoop_outgoing_arp_reply
dat_snoop_outgoing_arp_request
debugfs_add_meshif
debugfs_del_meshif
debugfs_destroy
debugfs_init
dec_module_count
find_router
frag_list_free
frag_reassemble_skb
frag_send_skb
get_orig_node
gw_bandwidth_set
gw_bandwidth_to_kbit
gw_check_election
gw_client_seq_print_text
gw_deselect
gw_election
gw_get_selected_orig
gw_is_dhcp_target
gw_node_delete
gw_node_purge
gw_node_update
gw_out_of_range
handle_tt_response
hard_if_notifier
hardif_disable_interface
hardif_enable_interface
hardif_free_rcu
hardif_get_by_netdev
hardif_list
hardif_min_mtu
hardif_remove_interfaces
hash_destroy
hash_new
hash_set_lock_class
inc_module_count
interface_rx
is_ap_isolated
is_my_client
is_my_mac
is_wifi_iface
mesh_free
mesh_init
my_skb_head_push
neigh_node_free_ref
orig_hash_add_if
orig_hash_del_if
orig_node_free_ref
orig_node_get_router
orig_seq_print_text
originator_free
originator_init
prepare_unicast_4addr_packet
purge_orig_ref
purge_outstanding_packets
receive_client_update_packet
receive_server_sync_packet
recv_bcast_packet
recv_handler_register
recv_handler_unregister
recv_icmp_packet
recv_roam_adv
recv_tt_query
recv_ucast_frag_packet
recv_unicast_packet
recv_vis_packet
ring_buffer_avg
ring_buffer_set
schedule_bat_ogm
send_outstanding_bat_ogm_packet
send_skb_packet
send_tt_response
slide_own_bcast_window
softif_create
softif_destroy
softif_is_valid
sysfs_add_hardif
sysfs_add_meshif
sysfs_del_hardif
sysfs_del_meshif
throw_uevent
transtable_search
tt_free
tt_global_add
tt_global_client_is_roaming
tt_global_del_orig
tt_global_seq_print_text
tt_init
tt_len
tt_local_add
tt_local_crc
tt_local_remove
tt_local_seq_print_text
tt_update_orig
unicast_generic_send_skb
update_min_mtu
update_route
vis_init
vis_quit
vis_seq_print_text
window_protected
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n:
>>>>>>>>
add_bcast_packet_to_list
arp_change_timeout
bat_algo_register
bat_algo_select
bat_algo_seq_print_text
bat_event_workqueue
bat_iv_init
bat_routing_algo
bat_socket_init
bat_socket_receive_packet
bat_socket_setup
batman_skb_recv
bit_get_packet
bla_check_bcast_duplist
bla_claim_table_seq_print_text
bla_free
bla_init
bla_is_backbone_gw
bla_is_backbone_gw_orig
bla_rx
bla_tx
bla_update_orig_address
bonding_candidate_add
bonding_candidate_del
bonding_save_primary
broadcast_addr
check_management_packet
dat_drop_broadcast_packet
dat_snoop_incoming_arp_reply
dat_snoop_incoming_arp_request
dat_snoop_outgoing_arp_reply
dat_snoop_outgoing_arp_request
debugfs_add_meshif
debugfs_del_meshif
debugfs_destroy
debugfs_init
dec_module_count
find_router
frag_list_free
frag_reassemble_skb
frag_send_skb
get_orig_node
gw_bandwidth_set
gw_bandwidth_to_kbit
gw_check_election
gw_client_seq_print_text
gw_deselect
gw_election
gw_get_selected_orig
gw_is_dhcp_target
gw_node_delete
gw_node_purge
gw_node_update
gw_out_of_range
handle_tt_response
hard_if_notifier
hardif_disable_interface
hardif_enable_interface
hardif_free_rcu
hardif_get_by_netdev
hardif_list
hardif_min_mtu
hardif_remove_interfaces
hash_destroy
hash_new
hash_set_lock_class
inc_module_count
interface_rx
is_ap_isolated
is_my_client
is_my_mac
is_wifi_iface
mesh_free
mesh_init
my_skb_head_push
neigh_node_free_ref
orig_hash_add_if
orig_hash_del_if
orig_node_free_ref
orig_node_get_router
orig_seq_print_text
originator_free
originator_init
prepare_unicast_4addr_packet
purge_orig_ref
purge_outstanding_packets
receive_client_update_packet
receive_server_sync_packet
recv_bcast_packet
recv_handler_register
recv_handler_unregister
recv_icmp_packet
recv_roam_adv
recv_tt_query
recv_ucast_frag_packet
recv_unicast_packet
recv_vis_packet
ring_buffer_avg
ring_buffer_set
schedule_bat_ogm
send_outstanding_bat_ogm_packet
send_skb_packet
send_tt_response
slide_own_bcast_window
softif_create
softif_destroy
softif_is_valid
sysfs_add_hardif
sysfs_add_meshif
sysfs_del_hardif
sysfs_del_meshif
throw_uevent
transtable_search
tt_free
tt_global_add
tt_global_client_is_roaming
tt_global_del_orig
tt_global_seq_print_text
tt_init
tt_len
tt_local_add
tt_local_crc
tt_local_remove
tt_local_seq_print_text
tt_update_orig
unicast_generic_send_skb
update_min_mtu
update_route
vis_init
vis_quit
vis_seq_print_text
window_protected
Name of failed tests
====================
Comment ending without space master
Comment ending without space next
Multiline comment ending at a non-empty line master
Multiline comment ending at a non-empty line next
Multiline comment starting with empty line master
Multiline comment starting with empty line next
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y
wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y
wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y
wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n
Output of different failed tests
================================
Comment ending without space master:
>>>>>>>>
bat_iv_ogm.c:531: */
bat_sysfs.c:156: * unsigned integer value*/
bridge_loop_avoidance.c:1199: **/
gateway_client.c:159: **/
gateway_client.c:196: **/
gateway_client.c:281: **/
gateway_common.c:162: **/
routing.c:704: * refcount.*/
soft-interface.c:312:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/
vis.c:503: * hash.*/
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
types.h:403: /* vis_info may follow here*/
Comment ending without space next:
>>>>>>>>
bat_iv_ogm.c:527: */
bat_sysfs.c:156: * unsigned integer value*/
bridge_loop_avoidance.c:1187: **/
gateway_client.c:159: **/
gateway_client.c:196: **/
gateway_client.c:281: **/
gateway_common.c:162: **/
routing.c:702: * refcount.*/
soft-interface.c:305:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/
vis.c:496: * hash.*/
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
types.h:380: /* vis_info may follow here*/
Multiline comment ending at a non-empty line master:
>>>>>>>>
bat_iv_ogm.c:169: * ordinary base packet */
bat_iv_ogm.c:318: * are flooded through the net */
bat_iv_ogm.c:324: * interfaces leave only that interface */
bat_iv_ogm.c:332: * interface only - we still can aggregate */
bat_iv_ogm.c:339: * (= secondary interface packets in general) */
bat_iv_ogm.c:485: * suitable aggregation packet found */
bat_iv_ogm.c:686: * to change */
bat_iv_ogm.c:696: * won't consider it either */
bat_iv_ogm.c:718: * sent through a primary interface */
bat_iv_ogm.c:815: * information */
bat_iv_ogm.c:841: * consider it bidirectional */
bat_iv_ogm.c:1033: * come via the corresponding interface */
bat_iv_ogm.c:1111: * originator mac */
bat_iv_ogm.c:1121: * don't route towards it */
bat_iv_ogm.c:1134: * seqno and similar ttl as the non-duplicate */
bat_iv_ogm.c:1204: * that does not have B.A.T.M.A.N. IV enabled ? */
bat_sysfs.c:87: * (bat_priv) on or off */
bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */
bat_sysfs.c:156: * unsigned integer value*/
bitarray.c:49: * higher than this one, so we just mark it. */
bitarray.c:58: * set the mark if required */
bitarray.c:84: * seqno window is protected. */
distributed-arp-table.c:335: * IP information */
distributed-arp-table.c:349: * will simply ignore it */
gateway_client.c:36: * the beginning of the dhcp header */
gateway_client.c:533: * - octet 3: option data */
gateway_client.c:538: * Jump the len octet and go to the data octet */
gateway_client.c:666: * set the tq towards ourself as the maximum value */
gateway_client.c:680: * reliable enough */
hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */
hard-interface.c:550: * 802.11 wireless device */
hard-interface.c:565: * check for wireless_handlers != NULL */
icmp_socket.c:315: * deleted */
main.c:40: * list traversals just rcu-locked */
main.c:62: * http://lwn.net/Articles/23634/ */
originator.c:191: * address if it does not exits */
originator.c:522: * if_num */
originator.c:605: * if_num */
routing.c:180: * considered as candidate. */
routing.c:476: * returned router's refcount. */
routing.c:509: * after the current router */
routing.c:512: * does not exist as rcu version */
routing.c:527: * Increases the returned router's refcount */
routing.c:548: * or this one is better, choose it. */
routing.c:552: * previously selected router */
routing.c:604: * forwarded */
routing.c:618: * changes */
routing.c:693: * packets for the correct destination. */
routing.c:704: * refcount.*/
routing.c:723: * always choose the default router. */
routing.c:736: * for a potential bonding candidate. */
routing.c:741: * even be the same as our router_orig in many cases */
routing.c:755: * bonding and prefer the original router. */
routing.c:761: * in. */
routing.c:931: * not try to reroute the packet!! */
routing.c:1085: * if required. */
send.c:36: * specified batman interface */
send.c:73: * (which is > 0). This will not be treated as an error. */
send.c:109: * and wait for the tt table request which will be fragmented */
send.c:208: * skb is freed. */
soft-interface.c:185: * requests into the mesh */
soft-interface.c:192: * via unicast to their gateway */
soft-interface.c:223: * this mac is known throughout the mesh */
soft-interface.c:234: * the original skb. */
soft-interface.c:310: * -- Dec 21st 2009, Simon Wunderlich */
translation-table.c:235: * (consistency check) */
translation-table.c:308: * problems */
translation-table.c:392: * response issued before the net ttvn increment (consistency check) */
translation-table.c:853: * the global entry, since it is useless now. */
translation-table.c:1026: * isolation */
translation-table.c:1125: * account while computing the CRC */
translation-table.c:1162: * last OGM (the OGM could carry no changes) */
translation-table.c:1191: * has already been issued for this orig_node, NULL otherwise */
translation-table.c:1301: * copied */
translation-table.c:1324: * reply from the same orig_node yet */
translation-table.c:1432: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1544: * is too big send the whole local translation table */
translation-table.c:1552: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1718: * consistency purpose) */
translation-table.c:1769: * unset the flag */
translation-table.c:1826: * returns true if the ROAMING_ADV can be sent, false otherwise */
translation-table.c:1835: * reply from the same orig_node yet */
translation-table.c:1878: * already roamed to us too many times */
translation-table.c:1952: * in the given hash table and returns the number of modified entries */
translation-table.c:2033: * entries */
translation-table.c:2086: * increased by one -> we can apply the attached changes */
translation-table.c:2091: * In this case send a tt request */
translation-table.c:2102: * in the global table */
translation-table.c:2112: * inconsistency */
translation-table.c:2117: * unset the flag */
translation-table.c:2121: * in sync anymore -> request fresh tt data */
translation-table.c:2139: * purposes */
unicast.c:368: * returns NULL in case of AP isolation */
unicast.c:401: * than the current one */
vis.c:121: * does not already exist in the list */
vis.c:337: * already linked in. */
vis.c:347: * linked in. */
vis.c:391: * is newer than old entries in the hash. */
vis.c:503: * hash.*/
vis.c:557: * Must be called with the originator hash locked */
vis.c:608: * returns 0 on success, -1 if no packet could be generated */
vis.c:706: * held */
vis.c:765: * this node. */
vis.c:881: * initialized (e.g. bat0 is initialized, interfaces have been added) */
bitarray.h:26: * and curr_seqno is within range of last_seqno */
bitarray.h:50: * new, 0 if old */
hash.h:30: * same */
hash.h:35: * argument and the size the second */
hash.h:56: * elements, memory might be leaked. */
hash.h:139: * comparing. */
main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */
main.h:48: * (should be a multiple of our word size) */
main.h:51: * pending tt_req */
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
main.h:84: * candidates */
main.h:88: * forw_packet->direct_link_flags */
main.h:253: * - after adding more than 127 to the starting value - it is a successor */
packet.h:92: * 1 << 15 are used for local computation only */
packet.h:153: * as this is assumed by code that handles ICMP packets */
packet.h:209: * - TT_FULL_TABLE */
packet.h:217: * orig_node */
packet.h:222: * if TT_RESPONSE: table_size */
types.h:103: * soon as I receive a new TTVN from this orig_node */
types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */
types.h:214: * increase my TTVN */
types.h:395: * from. we should not reply to them. */
types.h:425: * belonging to this hard-interface */
vis.h:26: * in miliseconds */
Multiline comment ending at a non-empty line next:
>>>>>>>>
bat_iv_ogm.c:169: * ordinary base packet */
bat_iv_ogm.c:314: * are flooded through the net */
bat_iv_ogm.c:320: * interfaces leave only that interface */
bat_iv_ogm.c:328: * interface only - we still can aggregate */
bat_iv_ogm.c:335: * (= secondary interface packets in general) */
bat_iv_ogm.c:481: * suitable aggregation packet found */
bat_iv_ogm.c:686: * to change */
bat_iv_ogm.c:696: * won't consider it either */
bat_iv_ogm.c:718: * sent through a primary interface */
bat_iv_ogm.c:815: * information */
bat_iv_ogm.c:841: * consider it bidirectional */
bat_iv_ogm.c:1032: * come via the corresponding interface */
bat_iv_ogm.c:1110: * originator mac */
bat_iv_ogm.c:1120: * don't route towards it */
bat_iv_ogm.c:1133: * seqno and similar ttl as the non-duplicate */
bat_iv_ogm.c:1203: * that does not have B.A.T.M.A.N. IV enabled ? */
bat_sysfs.c:87: * (bat_priv) on or off */
bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */
bat_sysfs.c:156: * unsigned integer value*/
bitarray.c:49: * higher than this one, so we just mark it. */
bitarray.c:58: * set the mark if required */
bitarray.c:84: * seqno window is protected. */
distributed-arp-table.c:336: * IP information */
distributed-arp-table.c:350: * will simply ignore it */
gateway_client.c:36: * the beginning of the dhcp header */
gateway_client.c:533: * - octet 3: option data */
gateway_client.c:538: * Jump the len octet and go to the data octet */
gateway_client.c:666: * set the tq towards ourself as the maximum value */
gateway_client.c:680: * reliable enough */
hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */
hard-interface.c:550: * 802.11 wireless device */
hard-interface.c:565: * check for wireless_handlers != NULL */
icmp_socket.c:315: * deleted */
main.c:40: * list traversals just rcu-locked */
main.c:62: * http://lwn.net/Articles/23634/ */
originator.c:191: * address if it does not exits */
originator.c:522: * if_num */
originator.c:605: * if_num */
routing.c:180: * considered as candidate. */
routing.c:476: * returned router's refcount. */
routing.c:509: * after the current router */
routing.c:512: * does not exist as rcu version */
routing.c:527: * Increases the returned router's refcount */
routing.c:548: * or this one is better, choose it. */
routing.c:552: * previously selected router */
routing.c:604: * forwarded */
routing.c:617: * changes */
routing.c:691: * packets for the correct destination. */
routing.c:702: * refcount.*/
routing.c:721: * always choose the default router. */
routing.c:734: * for a potential bonding candidate. */
routing.c:739: * even be the same as our router_orig in many cases */
routing.c:753: * bonding and prefer the original router. */
routing.c:759: * in. */
routing.c:925: * not try to reroute the packet!! */
routing.c:1079: * if required. */
send.c:36: * specified batman interface */
send.c:73: * (which is > 0). This will not be treated as an error. */
send.c:109: * and wait for the tt table request which will be fragmented */
send.c:208: * skb is freed. */
soft-interface.c:178: * requests into the mesh */
soft-interface.c:185: * via unicast to their gateway */
soft-interface.c:216: * this mac is known throughout the mesh */
soft-interface.c:227: * the original skb. */
soft-interface.c:303: * -- Dec 21st 2009, Simon Wunderlich */
translation-table.c:235: * (consistency check) */
translation-table.c:308: * problems */
translation-table.c:392: * response issued before the net ttvn increment (consistency check) */
translation-table.c:853: * the global entry, since it is useless now. */
translation-table.c:1026: * isolation */
translation-table.c:1125: * account while computing the CRC */
translation-table.c:1162: * last OGM (the OGM could carry no changes) */
translation-table.c:1191: * has already been issued for this orig_node, NULL otherwise */
translation-table.c:1301: * copied */
translation-table.c:1324: * reply from the same orig_node yet */
translation-table.c:1430: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1540: * is too big send the whole local translation table */
translation-table.c:1548: * I'll send only one packet with as much TT entries as I can */
translation-table.c:1712: * consistency purpose) */
translation-table.c:1761: * unset the flag */
translation-table.c:1814: * returns true if the ROAMING_ADV can be sent, false otherwise */
translation-table.c:1823: * reply from the same orig_node yet */
translation-table.c:1866: * already roamed to us too many times */
translation-table.c:1938: * in the given hash table and returns the number of modified entries */
translation-table.c:2019: * entries */
translation-table.c:2072: * increased by one -> we can apply the attached changes */
translation-table.c:2077: * In this case send a tt request */
translation-table.c:2088: * in the global table */
translation-table.c:2098: * inconsistency */
translation-table.c:2103: * unset the flag */
translation-table.c:2107: * in sync anymore -> request fresh tt data */
translation-table.c:2125: * purposes */
unicast.c:368: * returns NULL in case of AP isolation */
unicast.c:401: * than the current one */
vis.c:121: * does not already exist in the list */
vis.c:330: * already linked in. */
vis.c:340: * linked in. */
vis.c:384: * is newer than old entries in the hash. */
vis.c:496: * hash.*/
vis.c:550: * Must be called with the originator hash locked */
vis.c:601: * returns 0 on success, -1 if no packet could be generated */
vis.c:699: * held */
vis.c:758: * this node. */
vis.c:874: * initialized (e.g. bat0 is initialized, interfaces have been added) */
bitarray.h:26: * and curr_seqno is within range of last_seqno */
bitarray.h:50: * new, 0 if old */
hash.h:30: * same */
hash.h:35: * argument and the size the second */
hash.h:53: * elements, memory might be leaked. */
hash.h:136: * comparing. */
main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */
main.h:48: * (should be a multiple of our word size) */
main.h:51: * pending tt_req */
main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/
main.h:84: * candidates */
main.h:88: * forw_packet->direct_link_flags */
main.h:252: * - after adding more than 127 to the starting value - it is a successor */
packet.h:92: * 1 << 15 are used for local computation only */
packet.h:153: * as this is assumed by code that handles ICMP packets */
packet.h:209: * - TT_FULL_TABLE */
packet.h:217: * orig_node */
packet.h:222: * if TT_RESPONSE: table_size */
types.h:103: * soon as I receive a new TTVN from this orig_node */
types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */
types.h:191: * increase my TTVN */
types.h:372: * from. we should not reply to them. */
types.h:402: * belonging to this hard-interface */
vis.h:26: * in miliseconds */
Multiline comment starting with empty line master:
>>>>>>>>
bat_debugfs.c:1:/*
bat_iv_ogm.c:1:/*
bat_iv_ogm.c:290: /**
bat_iv_ogm.c:304: /**
bat_iv_ogm.c:455: /**
bat_iv_ogm.c:490: /**
bat_iv_ogm.c:525: /**
bat_sysfs.c:1:/*
bitarray.c:1:/*
bridge_loop_avoidance.c:1:/*
bridge_loop_avoidance.c:126:/**
bridge_loop_avoidance.c:165:/**
bridge_loop_avoidance.c:244:/**
bridge_loop_avoidance.c:350:/**
bridge_loop_avoidance.c:425:/**
bridge_loop_avoidance.c:471:/**
bridge_loop_avoidance.c:498:/**
bridge_loop_avoidance.c:519:/**
bridge_loop_avoidance.c:734:/**
bridge_loop_avoidance.c:813:/**
bridge_loop_avoidance.c:966:/**
bridge_loop_avoidance.c:1014:/**
bridge_loop_avoidance.c:1185:/**
bridge_loop_avoidance.c:1252:/**
bridge_loop_avoidance.c:1293:/**
bridge_loop_avoidance.c:1362:/**
bridge_loop_avoidance.c:1451:/**
compat.c:1:/*
distributed-arp-table.c:1:/*
gateway_client.c:1:/*
gateway_client.c:152: default: /**
gateway_client.c:191: /**
gateway_client.c:278: /**
gateway_client.c:337: /**
gateway_client.c:425:/**
gateway_common.c:1:/*
gateway_common.c:158: /**
hard-interface.c:1:/*
hard-interface.c:237: /**
hard-interface.c:444: /**
hash.c:1:/*
icmp_socket.c:1:/*
main.c:1:/*
originator.c:1:/*
ring_buffer.c:1:/*
routing.c:1:/*
routing.c:168: /**
routing.c:400: /**
send.c:1:/*
send.c:142: /**
send.c:326: /**
send.c:362: /**
send.c:372: /**
send.c:391: /**
send.c:401: /**
soft-interface.c:1:/*
soft-interface.c:69: /**
soft-interface.c:357: /**
translation-table.c:1:/*
translation-table.c:310: /**
unicast.c:1:/*
unicast.c:372: /**
vis.c:1:/*
bat_algo.h:1:/*
bat_debugfs.h:1:/*
bat_sysfs.h:1:/*
bitarray.h:1:/*
bridge_loop_avoidance.h:1:/*
compat.h:1:/*
distributed-arp-table.h:1:/*
gateway_client.h:1:/*
gateway_common.h:1:/*
hard-interface.h:1:/*
hash.h:1:/*
hash.h:82:/**
icmp_socket.h:1:/*
main.h:1:/*
main.h:217:/**
main.h:228:/**
originator.h:1:/*
packet.h:1:/*
ring_buffer.h:1:/*
routing.h:1:/*
send.h:1:/*
soft-interface.h:1:/*
translation-table.h:1:/*
types.h:1:/*
types.h:63:/**
types.h:135:/**
types.h:352:/**
unicast.h:1:/*
vis.h:1:/*
Multiline comment starting with empty line next:
>>>>>>>>
bat_debugfs.c:1:/*
bat_iv_ogm.c:1:/*
bat_iv_ogm.c:286: /**
bat_iv_ogm.c:300: /**
bat_iv_ogm.c:451: /**
bat_iv_ogm.c:486: /**
bat_iv_ogm.c:521: /**
bat_sysfs.c:1:/*
bitarray.c:1:/*
bridge_loop_avoidance.c:1:/*
bridge_loop_avoidance.c:126:/**
bridge_loop_avoidance.c:165:/**
bridge_loop_avoidance.c:244:/**
bridge_loop_avoidance.c:350:/**
bridge_loop_avoidance.c:425:/**
bridge_loop_avoidance.c:471:/**
bridge_loop_avoidance.c:498:/**
bridge_loop_avoidance.c:519:/**
bridge_loop_avoidance.c:734:/**
bridge_loop_avoidance.c:813:/**
bridge_loop_avoidance.c:966:/**
bridge_loop_avoidance.c:1014:/**
bridge_loop_avoidance.c:1173:/**
bridge_loop_avoidance.c:1240:/**
bridge_loop_avoidance.c:1281:/**
bridge_loop_avoidance.c:1350:/**
bridge_loop_avoidance.c:1439:/**
compat.c:1:/*
distributed-arp-table.c:1:/*
gateway_client.c:1:/*
gateway_client.c:152: default: /**
gateway_client.c:191: /**
gateway_client.c:278: /**
gateway_client.c:337: /**
gateway_client.c:425:/**
gateway_common.c:1:/*
gateway_common.c:158: /**
hard-interface.c:1:/*
hard-interface.c:237: /**
hard-interface.c:444: /**
hash.c:1:/*
icmp_socket.c:1:/*
main.c:1:/*
originator.c:1:/*
ring_buffer.c:1:/*
routing.c:1:/*
routing.c:168: /**
routing.c:400: /**
send.c:1:/*
send.c:142: /**
send.c:326: /**
send.c:362: /**
send.c:372: /**
send.c:391: /**
send.c:401: /**
soft-interface.c:1:/*
soft-interface.c:62: /**
soft-interface.c:350: /**
translation-table.c:1:/*
translation-table.c:310: /**
unicast.c:1:/*
unicast.c:372: /**
vis.c:1:/*
bat_algo.h:1:/*
bat_debugfs.h:1:/*
bat_sysfs.h:1:/*
bitarray.h:1:/*
bridge_loop_avoidance.h:1:/*
compat.h:1:/*
distributed-arp-table.h:1:/*
gateway_client.h:1:/*
gateway_common.h:1:/*
hard-interface.h:1:/*
hash.h:1:/*
hash.h:79:/**
icmp_socket.h:1:/*
main.h:1:/*
main.h:216:/**
main.h:227:/**
originator.h:1:/*
packet.h:1:/*
ring_buffer.h:1:/*
routing.h:1:/*
send.h:1:/*
soft-interface.h:1:/*
translation-table.h:1:/*
types.h:1:/*
types.h:63:/**
types.h:135:/**
types.h:329:/**
unicast.h:1:/*
vis.h:1:/*
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n:
>>>>>>>>
__this_module
add_bcast_packet_to_list
bat_algo_register
bat_algo_select
bat_algo_seq_print_text
bat_event_workqueue
bat_iv_init
bat_routing_algo
bat_socket_init
bat_socket_receive_packet
bat_socket_setup
batman_skb_recv
bit_get_packet
bonding_candidate_add
bonding_candidate_del
bonding_save_primary
broadcast_addr
check_management_packet
cleanup_module
debugfs_add_meshif
debugfs_del_meshif
debugfs_destroy
debugfs_init
dec_module_count
find_router
frag_list_free
frag_reassemble_skb
frag_send_skb
get_orig_node
gw_bandwidth_set
gw_bandwidth_to_kbit
gw_check_election
gw_client_seq_print_text
gw_deselect
gw_election
gw_get_selected_orig
gw_is_dhcp_target
gw_node_delete
gw_node_purge
gw_node_update
gw_out_of_range
handle_tt_response
hard_if_notifier
hardif_disable_interface
hardif_enable_interface
hardif_free_rcu
hardif_get_by_netdev
hardif_list
hardif_min_mtu
hardif_remove_interfaces
hash_destroy
hash_new
hash_set_lock_class
inc_module_count
init_module
interface_rx
is_ap_isolated
is_my_client
is_my_mac
is_wifi_iface
mesh_free
mesh_init
my_skb_head_push
neigh_node_free_ref
neigh_node_new
orig_hash_add_if
orig_hash_del_if
orig_node_free_ref
orig_node_get_router
orig_seq_print_text
originator_free
originator_init
prepare_unicast_4addr_packet
purge_orig_ref
purge_outstanding_packets
receive_client_update_packet
receive_server_sync_packet
recv_bcast_packet
recv_handler_register
recv_handler_unregister
recv_icmp_packet
recv_roam_adv
recv_tt_query
recv_ucast_frag_packet
recv_unicast_packet
recv_vis_packet
ring_buffer_avg
ring_buffer_set
schedule_bat_ogm
send_outstanding_bat_ogm_packet
send_skb_packet
send_tt_response
slide_own_bcast_window
softif_create
softif_destroy
softif_is_valid
sysfs_add_hardif
sysfs_add_meshif
sysfs_del_hardif
sysfs_del_meshif
throw_uevent
transtable_search
tt_changes_fill_buffer
tt_commit_changes
tt_free
tt_global_add
tt_global_client_is_roaming
tt_global_del_orig
tt_global_seq_print_text
tt_init
tt_len
tt_local_add
tt_local_crc
tt_local_remove
tt_local_seq_print_text
tt_update_orig
unicast_generic_send_skb
update_min_mtu
update_route
vis_init
vis_quit
vis_seq_print_text
window_protected
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n:
>>>>>>>>
__this_module
add_bcast_packet_to_list
arp_change_timeout
bat_algo_register
bat_algo_select
bat_algo_seq_print_text
bat_event_workqueue
bat_iv_init
bat_routing_algo
bat_socket_init
bat_socket_receive_packet
bat_socket_setup
batman_skb_recv
bit_get_packet
bonding_candidate_add
bonding_candidate_del
bonding_save_primary
broadcast_addr
check_management_packet
cleanup_module
dat_drop_broadcast_packet
dat_snoop_incoming_arp_reply
dat_snoop_incoming_arp_request
dat_snoop_outgoing_arp_reply
dat_snoop_outgoing_arp_request
debugfs_add_meshif
debugfs_del_meshif
debugfs_destroy
debugfs_init
dec_module_count
find_router
frag_list_free
frag_reassemble_skb
frag_send_skb
get_orig_node
gw_bandwidth_set
gw_bandwidth_to_kbit
gw_check_election
gw_client_seq_print_text
gw_deselect
gw_election
gw_get_selected_orig
gw_is_dhcp_target
gw_node_delete
gw_node_purge
gw_node_update
gw_out_of_range
handle_tt_response
hard_if_notifier
hardif_disable_interface
hardif_enable_interface
hardif_free_rcu
hardif_get_by_netdev
hardif_list
hardif_min_mtu
hardif_remove_interfaces
hash_destroy
hash_new
hash_set_lock_class
inc_module_count
init_module
interface_rx
is_ap_isolated
is_my_client
is_my_mac
is_wifi_iface
mesh_free
mesh_init
my_skb_head_push
neigh_node_free_ref
neigh_node_new
orig_hash_add_if
orig_hash_del_if
orig_node_free_ref
orig_node_get_router
orig_seq_print_text
originator_free
originator_init
prepare_unicast_4addr_packet
purge_orig_ref
purge_outstanding_packets
receive_client_update_packet
receive_server_sync_packet
recv_bcast_packet
recv_handler_register
recv_handler_unregister
recv_icmp_packet
recv_roam_adv
recv_tt_query
recv_ucast_frag_packet
recv_unicast_packet
recv_vis_packet
ring_buffer_avg
ring_buffer_set
schedule_bat_ogm
send_outstanding_bat_ogm_packet
send_skb_packet
send_tt_response
slide_own_bcast_window
softif_create
softif_destroy
softif_is_valid
sysfs_add_hardif
sysfs_add_meshif
sysfs_del_hardif
sysfs_del_meshif
throw_uevent
transtable_search
tt_changes_fill_buffer
tt_commit_changes
tt_free
tt_global_add
tt_global_client_is_roaming
tt_global_del_orig
tt_global_seq_print_text
tt_init
tt_len
tt_local_add
tt_local_crc
tt_local_remove
tt_local_seq_print_text
tt_update_orig
unicast_generic_send_skb
update_min_mtu
update_route
vis_init
vis_quit
vis_seq_print_text
window_protected
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y:
>>>>>>>>
__this_module
add_bcast_packet_to_list
arp_change_timeout
bat_algo_register
bat_algo_select
bat_algo_seq_print_text
bat_event_workqueue
bat_iv_init
bat_routing_algo
bat_socket_init
bat_socket_receive_packet
bat_socket_setup
batman_skb_recv
bit_get_packet
bonding_candidate_add
bonding_candidate_del
bonding_save_primary
broadcast_addr
check_management_packet
cleanup_module
dat_drop_broadcast_packet
dat_snoop_incoming_arp_reply
dat_snoop_incoming_arp_request
dat_snoop_outgoing_arp_reply
dat_snoop_outgoing_arp_request
debug_log
debugfs_add_meshif
debugfs_del_meshif
debugfs_destroy
debugfs_init
dec_module_count
find_router
frag_list_free
frag_reassemble_skb
frag_send_skb
get_orig_node
gw_bandwidth_set
gw_bandwidth_to_kbit
gw_check_election
gw_client_seq_print_text
gw_deselect
gw_election
gw_get_selected_orig
gw_is_dhcp_target
gw_node_delete
gw_node_purge
gw_node_update
gw_out_of_range
handle_tt_response
hard_if_notifier
hardif_disable_interface
hardif_enable_interface
hardif_free_rcu
hardif_get_by_netdev
hardif_list
hardif_min_mtu
hardif_remove_interfaces
hash_destroy
hash_new
hash_set_lock_class
inc_module_count
init_module
interface_rx
is_ap_isolated
is_my_client
is_my_mac
is_wifi_iface
mesh_free
mesh_init
my_skb_head_push
neigh_node_free_ref
neigh_node_new
orig_hash_add_if
orig_hash_del_if
orig_node_free_ref
orig_node_get_router
orig_seq_print_text
originator_free
originator_init
prepare_unicast_4addr_packet
purge_orig_ref
purge_outstanding_packets
receive_client_update_packet
receive_server_sync_packet
recv_bcast_packet
recv_handler_register
recv_handler_unregister
recv_icmp_packet
recv_roam_adv
recv_tt_query
recv_ucast_frag_packet
recv_unicast_packet
recv_vis_packet
ring_buffer_avg
ring_buffer_set
schedule_bat_ogm
send_outstanding_bat_ogm_packet
send_skb_packet
send_tt_response
slide_own_bcast_window
softif_create
softif_destroy
softif_is_valid
sysfs_add_hardif
sysfs_add_meshif
sysfs_del_hardif
sysfs_del_meshif
throw_uevent
transtable_search
tt_changes_fill_buffer
tt_commit_changes
tt_free
tt_global_add
tt_global_client_is_roaming
tt_global_del_orig
tt_global_seq_print_text
tt_init
tt_len
tt_local_add
tt_local_crc
tt_local_remove
tt_local_seq_print_text
tt_update_orig
unicast_generic_send_skb
update_min_mtu
update_route
vis_init
vis_quit
vis_seq_print_text
window_protected
wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n:
>>>>>>>>
__this_module
add_bcast_packet_to_list
arp_change_timeout
bat_algo_register
bat_algo_select
bat_algo_seq_print_text
bat_event_workqueue
bat_iv_init
bat_routing_algo
bat_socket_init
bat_socket_receive_packet
bat_socket_setup
batman_skb_recv
bit_get_packet
bla_check_bcast_duplist
bla_claim_table_seq_print_text
bla_free
bla_init
bla_is_backbone_gw
bla_is_backbone_gw_orig
bla_rx
bla_tx
bla_update_orig_address
bonding_candidate_add
bonding_candidate_del
bonding_save_primary
broadcast_addr
check_management_packet
cleanup_module
dat_drop_broadcast_packet
dat_snoop_incoming_arp_reply
dat_snoop_incoming_arp_request
dat_snoop_outgoing_arp_reply
dat_snoop_outgoing_arp_request
debugfs_add_meshif
debugfs_del_meshif
debugfs_destroy
debugfs_init
dec_module_count
find_router
frag_list_free
frag_reassemble_skb
frag_send_skb
get_orig_node
gw_bandwidth_set
gw_bandwidth_to_kbit
gw_check_election
gw_client_seq_print_text
gw_deselect
gw_election
gw_get_selected_orig
gw_is_dhcp_target
gw_node_delete
gw_node_purge
gw_node_update
gw_out_of_range
handle_tt_response
hard_if_notifier
hardif_disable_interface
hardif_enable_interface
hardif_free_rcu
hardif_get_by_netdev
hardif_list
hardif_min_mtu
hardif_remove_interfaces
hash_destroy
hash_new
hash_set_lock_class
inc_module_count
init_module
interface_rx
is_ap_isolated
is_my_client
is_my_mac
is_wifi_iface
mesh_free
mesh_init
my_skb_head_push
neigh_node_free_ref
neigh_node_new
orig_hash_add_if
orig_hash_del_if
orig_node_free_ref
orig_node_get_router
orig_seq_print_text
originator_free
originator_init
prepare_unicast_4addr_packet
purge_orig_ref
purge_outstanding_packets
receive_client_update_packet
receive_server_sync_packet
recv_bcast_packet
recv_handler_register
recv_handler_unregister
recv_icmp_packet
recv_roam_adv
recv_tt_query
recv_ucast_frag_packet
recv_unicast_packet
recv_vis_packet
ring_buffer_avg
ring_buffer_set
schedule_bat_ogm
send_outstanding_bat_ogm_packet
send_skb_packet
send_tt_response
slide_own_bcast_window
softif_create
softif_destroy
softif_is_valid
sysfs_add_hardif
sysfs_add_meshif
sysfs_del_hardif
sysfs_del_meshif
throw_uevent
transtable_search
tt_changes_fill_buffer
tt_commit_changes
tt_free
tt_global_add
tt_global_client_is_roaming
tt_global_del_orig
tt_global_seq_print_text
tt_init
tt_len
tt_local_add
tt_local_crc
tt_local_remove
tt_local_seq_print_text
tt_update_orig
unicast_generic_send_skb
update_min_mtu
update_route
vis_init
vis_quit
vis_seq_print_text
window_protected