linux-merge December 2012

linux-merge@lists.open-mesh.org

2 participants
32 discussions

Build check errors found: 2012-12-12
by postmaster＠open-mesh.org 11 Dec '12

11 Dec '12

Name of failed tests ==================== checkpatch next bat_iv_ogm.c checkpatch next bridge_loop_avoidance.c checkpatch next debugfs.c checkpatch next originator.c checkpatch next routing.c checkpatch next send.c checkpatch next translation-table.c checkpatch next unicast.c Output of different failed tests ================================ checkpatch next bat_iv_ogm.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #186: FILE: bat_iv_ogm.c:186: + batadv_ogm_packet->tt_num_changes)) { + CHECK: Blank lines aren't necessary after an open brace '{' #264: FILE: bat_iv_ogm.c:264: + (forw_packet->own && (forw_packet->if_incoming != primary_if))) { + CHECK: Blank lines aren't necessary after an open brace '{' #328: FILE: bat_iv_ogm.c:328: + (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) { + CHECK: Blank lines aren't necessary after an open brace '{' #818: FILE: bat_iv_ogm.c:818: + &orig_neigh_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #952: FILE: bat_iv_ogm.c:952: + &orig_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #1226: FILE: bat_iv_ogm.c:1226: + if (is_single_hop_neigh) { + total: 0 errors, 0 warnings, 6 checks, 1349 lines checked checkpatch next bridge_loop_avoidance.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #238: FILE: bridge_loop_avoidance.c:238: + head, hash_entry) { + CHECK: Blank lines aren't necessary before a close brace '}' #342: FILE: bridge_loop_avoidance.c:342: + + } CHECK: Blank lines aren't necessary before a close brace '}' #543: FILE: bridge_loop_avoidance.c:543: + +} CHECK: Blank lines aren't necessary before a close brace '}' #602: FILE: bridge_loop_avoidance.c:602: + + } total: 0 errors, 0 warnings, 4 checks, 1706 lines checked checkpatch next debugfs.c: >>>>>>>> CHECK: Blank lines aren't necessary before a close brace '}' #168: FILE: debugfs.c:168: + + } WARNING: debugfs_remove_recursive(NULL) is safe this check is probably not required #401: FILE: debugfs.c:401: + if (batadv_debugfs) { + debugfs_remove_recursive(batadv_debugfs); total: 0 errors, 1 warnings, 1 checks, 459 lines checked checkpatch next originator.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #181: FILE: originator.c:181: + head, hash_entry) { + CHECK: Blank lines aren't necessary after an open brace '{' #288: FILE: originator.c:288: + &orig_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #296: FILE: originator.c:296: + (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) { + total: 0 errors, 0 warnings, 3 checks, 645 lines checked checkpatch next routing.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #83: FILE: routing.c:83: + } else if ((!curr_router) && (neigh_node)) { + CHECK: Blank lines aren't necessary after an open brace '{' #175: FILE: routing.c:175: + &orig_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #839: FILE: routing.c:839: + neigh_node->if_incoming->net_dev->mtu)) { + CHECK: Blank lines aren't necessary after an open brace '{' #1106: FILE: routing.c:1106: + if (batadv_is_my_mac(unicast_packet->dest)) { + total: 0 errors, 0 warnings, 4 checks, 1281 lines checked checkpatch next send.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #333: FILE: send.c:333: + &bat_priv->forw_bcast_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #360: FILE: send.c:360: + &bat_priv->forw_bat_list, list) { + total: 0 errors, 0 warnings, 2 checks, 382 lines checked checkpatch next translation-table.c: >>>>>>>> CHECK: Blank lines aren't necessary before a close brace '}' #116: FILE: translation-table.c:116: + +} CHECK: Blank lines aren't necessary before a close brace '}' #253: FILE: translation-table.c:253: + +} CHECK: Blank lines aren't necessary before a close brace '}' #631: FILE: translation-table.c:631: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1053: FILE: translation-table.c:1053: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1829: FILE: translation-table.c:1829: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2356: FILE: translation-table.c:2356: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2553: FILE: translation-table.c:2553: + +} total: 0 errors, 0 warnings, 7 checks, 2579 lines checked checkpatch next unicast.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #136: FILE: unicast.c:136: + list_for_each_entry(tfp, head, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #165: FILE: unicast.c:165: + if (!list_empty(head)) { + total: 0 errors, 0 warnings, 2 checks, 480 lines checked

1 0

Build check errors found: 2012-12-11
by postmaster＠open-mesh.org 10 Dec '12

10 Dec '12

1 0

Build check errors found: 2012-12-10
by postmaster＠open-mesh.org 09 Dec '12

09 Dec '12

1 0

Build check errors found: 2012-12-09
by postmaster＠open-mesh.org 08 Dec '12

08 Dec '12

1 0

Build check errors found: 2012-12-08
by postmaster＠open-mesh.org 07 Dec '12

07 Dec '12

1 0

Build check errors found: 2012-12-07
by postmaster＠open-mesh.org 06 Dec '12

06 Dec '12

1 0

Build check errors found: 2012-12-06
by postmaster＠open-mesh.org 05 Dec '12

05 Dec '12

1 0

Build check errors found: 2012-12-05
by postmaster＠open-mesh.org 05 Dec '12

05 Dec '12

1 0

Build check errors found: 2012-12-04
by postmaster＠open-mesh.org 03 Dec '12

03 Dec '12

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20121203
by batman＠open-mesh.org 03 Dec '12

03 Dec '12

The following commit has been merged in the master branch: commit af5d4f7737963f2112f148f97c5820425f050650 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 26 00:38:50 2012 +0100 batman-adv: use ETH_P_BATMAN The ETH_P_BATMAN ethertype is now defined kernel-wide. Use it instead of the private BATADV_ETH_P_BATMAN define. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 365ed74..f1d37cd 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -30,6 +30,7 @@ #include "bridge_loop_avoidance.h" #include <linux/if_arp.h> +#include <linux/if_ether.h> void batadv_hardif_free_rcu(struct rcu_head *rcu) { @@ -311,7 +312,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, { struct batadv_priv *bat_priv; struct net_device *soft_iface; - __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN); + __be16 ethertype = __constant_htons(ETH_P_BATMAN); int ret; if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 1c5454d..cb6405bf 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -20,8 +20,6 @@ #ifndef _NET_BATMAN_ADV_PACKET_H_ #define _NET_BATMAN_ADV_PACKET_H_ -#define BATADV_ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ - enum batadv_packettype { BATADV_IV_OGM = 0x01, BATADV_ICMP = 0x02, diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index c7f7023..4425af9 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -28,6 +28,8 @@ #include "gateway_common.h" #include "originator.h" +#include <linux/if_ether.h> + static void batadv_send_outstanding_bcast_packet(struct work_struct *work); /* send out an already prepared packet to the given address via the @@ -60,11 +62,11 @@ int batadv_send_skb_packet(struct sk_buff *skb, ethhdr = (struct ethhdr *)skb_mac_header(skb); memcpy(ethhdr->h_source, hard_iface->net_dev->dev_addr, ETH_ALEN); memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN); - ethhdr->h_proto = __constant_htons(BATADV_ETH_P_BATMAN); + ethhdr->h_proto = __constant_htons(ETH_P_BATMAN); skb_set_network_header(skb, ETH_HLEN); skb->priority = TC_PRIO_CONTROL; - skb->protocol = __constant_htons(BATADV_ETH_P_BATMAN); + skb->protocol = __constant_htons(ETH_P_BATMAN); skb->dev = hard_iface->net_dev; diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 54800c7..6b548fd 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -34,6 +34,7 @@ #include <linux/ethtool.h> #include <linux/etherdevice.h> #include <linux/if_vlan.h> +#include <linux/if_ether.h> #include "unicast.h" #include "bridge_loop_avoidance.h" @@ -146,7 +147,7 @@ static int batadv_interface_tx(struct sk_buff *skb, struct batadv_hard_iface *primary_if = NULL; struct batadv_bcast_packet *bcast_packet; struct vlan_ethhdr *vhdr; - __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN); + __be16 ethertype = __constant_htons(ETH_P_BATMAN); static const uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; static const uint8_t ectp_addr[ETH_ALEN] = {0xCF, 0x00, 0x00, 0x00, @@ -172,7 +173,7 @@ static int batadv_interface_tx(struct sk_buff *skb, break; /* fall through */ - case BATADV_ETH_P_BATMAN: + case ETH_P_BATMAN: goto dropped; } @@ -302,7 +303,7 @@ void batadv_interface_rx(struct net_device *soft_iface, struct vlan_ethhdr *vhdr; struct batadv_header *batadv_header = (struct batadv_header *)skb->data; short vid __maybe_unused = -1; - __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN); + __be16 ethertype = __constant_htons(ETH_P_BATMAN); bool is_bcast; is_bcast = (batadv_header->packet_type == BATADV_BCAST); @@ -325,7 +326,7 @@ void batadv_interface_rx(struct net_device *soft_iface, break; /* fall through */ - case BATADV_ETH_P_BATMAN: + case ETH_P_BATMAN: goto dropped; } -- LinuxNextTracking

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge December 2012