From patchwork Thu Apr 29 14:22:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 85 Return-Path: Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (Postfix) with SMTP id 4502C1542A7 for ; Thu, 29 Apr 2010 16:23:00 +0200 (CEST) Received: (qmail invoked by alias); 29 Apr 2010 14:22:59 -0000 Received: from i59F6A89D.versanet.de (EHLO sven-desktop.lazhur.ath.cx) [89.246.168.157] by mail.gmx.net (mp006) with SMTP; 29 Apr 2010 16:22:59 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1/rlPMjPpnr8HarQ5tlWVwYMMzvQ0V8Hk4n/S7ghu pLyzBwwRz6YQbq From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 29 Apr 2010 16:22:23 +0200 Message-Id: <1272550944-8522-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <201004291621.08579.sven.eckelmann@gmx.de> References: <201004291621.08579.sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 X-FuHaFi: 0.40999999999999998 Subject: [B.A.T.M.A.N.] [PATCH-maint 1/2] batman-adv: Fix whitespace problems criticized by checkpatch.pl X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2010 14:23:00 -0000 Trailing spaces at the end of a line or before a tab are against Documentation/CodingStyle "3.1: Spaces" and should be avoided. It is also common style to add a single space after commas unless it is followed either by a newline or a tab. Reported-by: Mikal Sande Reported-by: Luis de Bethencourt Signed-off-by: Sven Eckelmann --- bitarray.c | 2 +- main.h | 2 +- originator.c | 4 ++-- types.h | 4 ++-- vis.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bitarray.c b/bitarray.c index 437cff8..2fef6e3 100644 --- a/bitarray.c +++ b/bitarray.c @@ -150,7 +150,7 @@ char bit_get_packet(TYPE_OF_WORD *seq_bits, int16_t seq_num_diff, /* sequence number is much newer, probably missed a lot of packets */ - if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) + if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) || (seq_num_diff < EXPECTED_SEQNO_RANGE)) { bat_dbg(DBG_BATMAN, "We missed a lot of packets (%i) !\n", diff --git a/main.h b/main.h index 2ce3b45..a2e819b 100644 --- a/main.h +++ b/main.h @@ -70,7 +70,7 @@ #define MODULE_DEACTIVATING 2 #define BCAST_QUEUE_LEN 256 -#define BATMAN_QUEUE_LEN 256 +#define BATMAN_QUEUE_LEN 256 /* * Debug Messages diff --git a/originator.c b/originator.c index 9ccb486..3a9430c 100644 --- a/originator.c +++ b/originator.c @@ -298,7 +298,7 @@ ssize_t orig_fill_buffer_text(struct net_device *net_dev, char *buff, rcu_read_lock(); hdr_len = sprintf(buff, - " %-14s (%s/%i) %17s [%10s]: %20s ... [B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s (%s)] \n", + " %-14s (%s/%i) %17s [%10s]: %20s ... [B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s (%s)]\n", "Originator", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF", "Potential nexthops", SOURCE_VERSION, REVISION_VERSION_STR, bat_priv->primary_if->dev, bat_priv->primary_if->addr_str, @@ -355,7 +355,7 @@ ssize_t orig_fill_buffer_text(struct net_device *net_dev, char *buff, if ((batman_count == 0) && (off == 0)) bytes_written += sprintf(buff + bytes_written, - "No batman nodes in range ... \n"); + "No batman nodes in range ...\n"); return bytes_written; } diff --git a/types.h b/types.h index c926219..c0ede3c 100644 --- a/types.h +++ b/types.h @@ -59,8 +59,8 @@ struct orig_node { /* structure for orig_list maintaining nodes of seqno window was reset. */ unsigned long batman_seqno_reset;/* time when the batman seqno window was reset. */ -/* uint8_t gwflags; * flags related to gateway functions: gateway class */ - uint8_t flags; /* for now only VIS_SERVER flag. */ +/* uint8_t gwflags; * flags related to gateway functions: gateway class */ + uint8_t flags; /* for now only VIS_SERVER flag. */ unsigned char *hna_buff; int16_t hna_buff_len; uint16_t last_real_seqno; /* last and best known squence number */ diff --git a/vis.c b/vis.c index 3144439..b9fa04c 100644 --- a/vis.c +++ b/vis.c @@ -40,9 +40,9 @@ * before adding more than 127 to the starting value - it is a predecessor, * when adding 128 - it is neither a predecessor nor a successor, * after adding more than 127 to the starting value - it is a successor */ -#define seq_before(x,y) ({typeof(x) _dummy = (x - y); \ - _dummy > smallest_signed_int(_dummy); }) -#define seq_after(x,y) seq_before(y,x) +#define seq_before(x, y) ({typeof(x) _dummy = (x - y); \ + _dummy > smallest_signed_int(_dummy); }) +#define seq_after(x, y) seq_before(y, x) struct hashtable_t *vis_hash; DEFINE_SPINLOCK(vis_hash_lock);