Commit f9ab70e7 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Greg Kroah-Hartman

Staging: batman-adv: Fix whitespace problems criticized by checkpatch.pl

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: default avatarMikal Sande <mikal.sande@gmail.com>
Reported-by: default avatarLuis de Bethencourt <luisbg@ubuntu.com>
Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cee42f49
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#define MODULE_DEACTIVATING 2 #define MODULE_DEACTIVATING 2
#define BCAST_QUEUE_LEN 256 #define BCAST_QUEUE_LEN 256
#define BATMAN_QUEUE_LE 256 #define BATMAN_QUEUE_LEN 256
/* /*
* Debug Messages * Debug Messages
......
...@@ -297,7 +297,7 @@ ssize_t orig_fill_buffer_text(struct net_device *net_dev, char *buff, ...@@ -297,7 +297,7 @@ ssize_t orig_fill_buffer_text(struct net_device *net_dev, char *buff,
rcu_read_lock(); rcu_read_lock();
hdr_len = sprintf(buff, 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", "Originator", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF",
"Potential nexthops", SOURCE_VERSION, REVISION_VERSION_STR, "Potential nexthops", SOURCE_VERSION, REVISION_VERSION_STR,
bat_priv->primary_if->dev, bat_priv->primary_if->addr_str, bat_priv->primary_if->dev, bat_priv->primary_if->addr_str,
...@@ -354,7 +354,7 @@ ssize_t orig_fill_buffer_text(struct net_device *net_dev, char *buff, ...@@ -354,7 +354,7 @@ ssize_t orig_fill_buffer_text(struct net_device *net_dev, char *buff,
if ((batman_count == 0) && (off == 0)) if ((batman_count == 0) && (off == 0))
bytes_written += sprintf(buff + bytes_written, bytes_written += sprintf(buff + bytes_written,
"No batman nodes in range ... \n"); "No batman nodes in range ...\n");
return bytes_written; return bytes_written;
} }
......
...@@ -59,8 +59,7 @@ struct orig_node { /* structure for orig_list maintaining nodes of ...@@ -59,8 +59,7 @@ struct orig_node { /* structure for orig_list maintaining nodes of
seqno window was reset. */ seqno window was reset. */
unsigned long batman_seqno_reset;/* time when the batman seqno unsigned long batman_seqno_reset;/* time when the batman seqno
window was reset. */ window was reset. */
/* uint8_t gwflags; * flags related to gateway functions: gateway class */ uint8_t flags; /* for now only VIS_SERVER flag. */
uint8_t flags; /* for now only VIS_SERVER flag. */
unsigned char *hna_buff; unsigned char *hna_buff;
int16_t hna_buff_len; int16_t hna_buff_len;
uint16_t last_real_seqno; /* last and best known squence number */ uint16_t last_real_seqno; /* last and best known squence number */
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* when adding 128 - it is neither a predecessor nor a successor, * when adding 128 - it is neither a predecessor nor a successor,
* after adding more than 127 to the starting value - it is 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); \ #define seq_before(x, y) ({typeof(x) _dummy = (x - y); \
_dummy > smallest_signed_int(_dummy); }) _dummy > smallest_signed_int(_dummy); })
#define seq_after(x, y) seq_before(y, x) #define seq_after(x, y) seq_before(y, x)
struct hashtable_t *vis_hash; struct hashtable_t *vis_hash;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment