The following commit has been merged in the merge/master branch: commit 9792df7f96182890c1c962d3cb115eaaffac8bd6 Merge: ae926bc6cd9e569e8a16b20187444bfea5bcd591 d523a2f417dfdecbee5ef87f7d98694d60c39ac6 Author: Marek Lindner lindner_marek@yahoo.de Date: Tue Feb 28 19:10:06 2012 +0800
Merge remote-tracking branch 'origin/standalone/next' into merge/master
diff --combined net/batman-adv/bat_sysfs.c index 7317729,b00101d..b00101d --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@@ -321,11 -321,11 +321,11 @@@ static ssize_t store_gw_mode(struct kob gw_mode_tmp = GW_MODE_OFF;
if (strncmp(buff, GW_MODE_CLIENT_NAME, - strlen(GW_MODE_CLIENT_NAME)) == 0) + strlen(GW_MODE_CLIENT_NAME)) == 0) gw_mode_tmp = GW_MODE_CLIENT;
if (strncmp(buff, GW_MODE_SERVER_NAME, - strlen(GW_MODE_SERVER_NAME)) == 0) + strlen(GW_MODE_SERVER_NAME)) == 0) gw_mode_tmp = GW_MODE_SERVER;
if (gw_mode_tmp < 0) { diff --combined net/batman-adv/bitarray.c index e63069d,6d0aa21..6d0aa21 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c @@@ -154,8 -154,8 +154,8 @@@ int bit_get_packet(void *priv, unsigne
/* sequence number is much newer, probably missed a lot of packets */
- if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) - && (seq_num_diff < EXPECTED_SEQNO_RANGE)) { + if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) && + (seq_num_diff < EXPECTED_SEQNO_RANGE)) { bat_dbg(DBG_BATMAN, bat_priv, "We missed a lot of packets (%i) !\n", seq_num_diff - 1); @@@ -170,8 -170,8 +170,8 @@@ * packet should be dropped without calling this function if the * seqno window is protected. */
- if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) - || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { + if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) || + (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
bat_dbg(DBG_BATMAN, bat_priv, "Other host probably restarted!\n"); diff --combined net/batman-adv/gateway_client.c index 65a77a1,0fa8e2d..0fa8e2d --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@@ -629,7 -629,7 +629,7 @@@ bool gw_is_dhcp_target(struct sk_buff *
/* check for bootp port */ if ((ntohs(ethhdr->h_proto) == ETH_P_IP) && - (ntohs(udphdr->dest) != 67)) + (ntohs(udphdr->dest) != 67)) return false;
if ((ntohs(ethhdr->h_proto) == ETH_P_IPV6) && diff --combined net/batman-adv/gateway_common.c index 7f79e15,3ccb9c8..3ccb9c8 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@@ -93,7 -93,7 +93,7 @@@ static bool parse_gw_bandwidth(struct n multi = 1024;
if ((strnicmp(tmp_ptr, "kbit", 4) == 0) || - (multi > 1)) + (multi > 1)) *tmp_ptr = '\0'; }
@@@ -118,7 -118,7 +118,7 @@@ multi = 1024;
if ((strnicmp(tmp_ptr, "kbit", 4) == 0) || - (multi > 1)) + (multi > 1)) *tmp_ptr = '\0'; }
diff --combined net/batman-adv/hard-interface.c index 41826b9,409d027..409d027 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@@ -341,23 -341,23 +341,23 @@@ int hardif_enable_interface(struct hard if (atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < ETH_DATA_LEN + BAT_HEADER_LEN) bat_info(hard_iface->soft_iface, - "The MTU of interface %s is too small (%i) to handle " - "the transport of batman-adv packets. Packets going " - "over this interface will be fragmented on layer2 " - "which could impact the performance. Setting the MTU " - "to %zi would solve the problem.\n", - hard_iface->net_dev->name, hard_iface->net_dev->mtu, - ETH_DATA_LEN + BAT_HEADER_LEN); + "The MTU of interface %s is too small (%i) to handle " + "the transport of batman-adv packets. Packets going " + "over this interface will be fragmented on layer2 " + "which could impact the performance. Setting the MTU " + "to %zi would solve the problem.\n", + hard_iface->net_dev->name, hard_iface->net_dev->mtu, + ETH_DATA_LEN + BAT_HEADER_LEN);
if (!atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < ETH_DATA_LEN + BAT_HEADER_LEN) bat_info(hard_iface->soft_iface, - "The MTU of interface %s is too small (%i) to handle " - "the transport of batman-adv packets. If you experience" - " problems getting traffic through try increasing the " - "MTU to %zi.\n", - hard_iface->net_dev->name, hard_iface->net_dev->mtu, - ETH_DATA_LEN + BAT_HEADER_LEN); + "The MTU of interface %s is too small (%i) to handle " + "the transport of batman-adv packets. If you " + "experience problems getting traffic through try " + "increasing the MTU to %zi.\n", + hard_iface->net_dev->name, hard_iface->net_dev->mtu, + ETH_DATA_LEN + BAT_HEADER_LEN);
if (hardif_is_iface_up(hard_iface)) hardif_activate_interface(hard_iface); @@@ -580,8 -580,8 +580,8 @@@ static int batman_skb_recv(struct sk_bu goto err_free;
/* expect a valid ethernet header here. */ - if (unlikely(skb->mac_len != sizeof(struct ethhdr) - || !skb_mac_header(skb))) + if (unlikely(skb->mac_len != sizeof(struct ethhdr) || + !skb_mac_header(skb))) goto err_free;
if (!hard_iface->soft_iface) diff --combined net/batman-adv/originator.c index c2e46b5,371cc93..371cc93 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@@ -143,7 -143,7 +143,7 @@@ static void orig_node_free_rcu(struct r
frag_list_free(&orig_node->frag_list); tt_global_del_orig(orig_node->bat_priv, orig_node, - "originator timed out"); + "originator timed out");
kfree(orig_node->tt_buff); kfree(orig_node->bcast_own); @@@ -333,9 -333,8 +333,8 @@@ static bool purge_orig_node(struct bat_ return true; } else { if (purge_orig_neighbors(bat_priv, orig_node, - &best_neigh_node)) { + &best_neigh_node)) update_route(bat_priv, orig_node, best_neigh_node); - } }
return false; diff --combined net/batman-adv/routing.c index cf9a2f6,f535155..f535155 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@@ -72,7 -72,7 +72,7 @@@ static void _update_route(struct bat_pr bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n", orig_node->orig); tt_global_del_orig(bat_priv, orig_node, - "Deleted route towards originator"); + "Deleted route towards originator");
/* route added */ } else if ((!curr_router) && (neigh_node)) { @@@ -229,8 -229,8 +229,8 @@@ void bonding_save_primary(const struct int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, unsigned long *last_reset) { - if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) - || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { + if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) || + (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) {
*last_reset = jiffies; @@@ -429,7 -429,7 +429,7 @@@ int recv_icmp_packet(struct sk_buff *sk if ((hdr_size == sizeof(struct icmp_packet_rr)) && (icmp_packet->rr_cur < BAT_RR_LEN)) { memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]), - ethhdr->h_dest, ETH_ALEN); + ethhdr->h_dest, ETH_ALEN); icmp_packet->rr_cur++; }
diff --combined net/batman-adv/soft-interface.c index 37fbcb5,8fb16d2..8fb16d2 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -397,7 -397,7 +397,7 @@@ void softif_neigh_purge(struct bat_pri &softif_neigh_vid->softif_neigh_list, list) { if ((!has_timed_out(softif_neigh->last_seen, - SOFTIF_NEIGH_TIMEOUT)) && + SOFTIF_NEIGH_TIMEOUT)) && (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)) continue;
diff --combined net/batman-adv/translation-table.c index 9a6f315,c950705..c950705 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -261,7 -261,7 +261,7 @@@ int tt_changes_fill_buffer(struct bat_p atomic_set(&bat_priv->tt_local_changes, 0);
list_for_each_entry_safe(entry, safe, &bat_priv->tt_changes_list, - list) { + list) { if (count < tot_changes) { memcpy(buff + tt_len(count), &entry->change, sizeof(struct tt_change)); @@@ -333,17 -333,17 +333,17 @@@ int tt_local_seq_print_text(struct seq_ hlist_for_each_entry_rcu(tt_common_entry, node, head, hash_entry) { seq_printf(seq, " * %pM [%c%c%c%c%c]\n", - tt_common_entry->addr, - (tt_common_entry->flags & - TT_CLIENT_ROAM ? 'R' : '.'), - (tt_common_entry->flags & - TT_CLIENT_NOPURGE ? 'P' : '.'), - (tt_common_entry->flags & - TT_CLIENT_NEW ? 'N' : '.'), - (tt_common_entry->flags & - TT_CLIENT_PENDING ? 'X' : '.'), - (tt_common_entry->flags & - TT_CLIENT_WIFI ? 'W' : '.')); + tt_common_entry->addr, + (tt_common_entry->flags & + TT_CLIENT_ROAM ? 'R' : '.'), + (tt_common_entry->flags & + TT_CLIENT_NOPURGE ? 'P' : '.'), + (tt_common_entry->flags & + TT_CLIENT_NEW ? 'N' : '.'), + (tt_common_entry->flags & + TT_CLIENT_PENDING ? 'X' : '.'), + (tt_common_entry->flags & + TT_CLIENT_WIFI ? 'W' : '.')); } rcu_read_unlock(); } @@@ -704,7 -704,7 +704,7 @@@ void tt_global_del_orig(struct bat_pri
spin_lock_bh(list_lock); hlist_for_each_entry_safe(tt_common_entry, node, safe, - head, hash_entry) { + head, hash_entry) { tt_global_entry = container_of(tt_common_entry, struct tt_global_entry, common);