aboutsummaryrefslogtreecommitdiff
path: root/sys/netgraph
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:19:14 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:19:14 +0000
commit662c13053f4bf2d6245ba7e2b66c10d1cd5c1fb9 (patch)
tree5cffe4473640975abc443ef4b8047b34cdb4a039 /sys/netgraph
parent586ee69f09c5060621486b34722a4a806581f93d (diff)
downloadsrc-662c13053f4bf2d6245ba7e2b66c10d1cd5c1fb9.tar.gz
src-662c13053f4bf2d6245ba7e2b66c10d1cd5c1fb9.zip
net: clean up empty lines in .c and .h files
Notes
Notes: svn path=/head/; revision=365071
Diffstat (limited to 'sys/netgraph')
-rw-r--r--sys/netgraph/atm/ccatm/ng_ccatm.c5
-rw-r--r--sys/netgraph/atm/ng_sscop.h1
-rw-r--r--sys/netgraph/atm/ngatmbase.c1
-rw-r--r--sys/netgraph/atm/sscfu/ng_sscfu.c5
-rw-r--r--sys/netgraph/atm/sscfu/ng_sscfu_cust.h2
-rw-r--r--sys/netgraph/atm/sscop/ng_sscop.c7
-rw-r--r--sys/netgraph/atm/sscop/ng_sscop_cust.h1
-rw-r--r--sys/netgraph/atm/uni/ng_uni.c9
-rw-r--r--sys/netgraph/bluetooth/common/ng_bluetooth.c1
-rw-r--r--sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c10
-rw-r--r--sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h1
-rw-r--r--sys/netgraph/bluetooth/drivers/h4/ng_h4.c1
-rw-r--r--sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h1
-rw-r--r--sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h3
-rw-r--r--sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c4
-rw-r--r--sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h3
-rw-r--r--sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c1
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_cmds.c12
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_cmds.h1
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_evnt.c12
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_evnt.h1
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_main.c3
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_misc.c3
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_misc.h1
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_prse.h1
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_ulpi.c13
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_ulpi.h1
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_var.h1
-rw-r--r--sys/netgraph/bluetooth/include/ng_bluetooth.h1
-rw-r--r--sys/netgraph/bluetooth/include/ng_bt3c.h1
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket.h3
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h3
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h3
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h1
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket_sco.h1
-rw-r--r--sys/netgraph/bluetooth/include/ng_h4.h1
-rw-r--r--sys/netgraph/bluetooth/include/ng_hci.h19
-rw-r--r--sys/netgraph/bluetooth/include/ng_l2cap.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_ubt.h1
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c1
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h1
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c11
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h1
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c9
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h1
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c1
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c13
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h1
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h1
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c14
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h1
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h3
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c14
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c21
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c14
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c11
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_sco.c4
-rw-r--r--sys/netgraph/netflow/netflow.c6
-rw-r--r--sys/netgraph/netflow/netflow.h1
-rw-r--r--sys/netgraph/netflow/netflow_v9.c9
-rw-r--r--sys/netgraph/netflow/ng_netflow.c13
-rw-r--r--sys/netgraph/netflow/ng_netflow.h5
-rw-r--r--sys/netgraph/netgraph.h6
-rw-r--r--sys/netgraph/ng_UI.c2
-rw-r--r--sys/netgraph/ng_UI.h1
-rw-r--r--sys/netgraph/ng_async.c4
-rw-r--r--sys/netgraph/ng_base.c5
-rw-r--r--sys/netgraph/ng_bpf.c1
-rw-r--r--sys/netgraph/ng_bridge.c10
-rw-r--r--sys/netgraph/ng_bridge.h1
-rw-r--r--sys/netgraph/ng_car.c2
-rw-r--r--sys/netgraph/ng_checksum.c1
-rw-r--r--sys/netgraph/ng_cisco.c1
-rw-r--r--sys/netgraph/ng_cisco.h1
-rw-r--r--sys/netgraph/ng_deflate.c1
-rw-r--r--sys/netgraph/ng_deflate.h1
-rw-r--r--sys/netgraph/ng_device.c1
-rw-r--r--sys/netgraph/ng_echo.c1
-rw-r--r--sys/netgraph/ng_eiface.c3
-rw-r--r--sys/netgraph/ng_etf.c3
-rw-r--r--sys/netgraph/ng_ether.c1
-rw-r--r--sys/netgraph/ng_ether_echo.c1
-rw-r--r--sys/netgraph/ng_frame_relay.c1
-rw-r--r--sys/netgraph/ng_gif.c1
-rw-r--r--sys/netgraph/ng_hub.c1
-rw-r--r--sys/netgraph/ng_iface.c2
-rw-r--r--sys/netgraph/ng_ipfw.c1
-rw-r--r--sys/netgraph/ng_ksocket.c3
-rw-r--r--sys/netgraph/ng_l2tp.c7
-rw-r--r--sys/netgraph/ng_lmi.c1
-rw-r--r--sys/netgraph/ng_message.h1
-rw-r--r--sys/netgraph/ng_mppc.c4
-rw-r--r--sys/netgraph/ng_mppc.h1
-rw-r--r--sys/netgraph/ng_nat.c4
-rw-r--r--sys/netgraph/ng_one2many.h1
-rw-r--r--sys/netgraph/ng_parse.c2
-rw-r--r--sys/netgraph/ng_parse.h2
-rw-r--r--sys/netgraph/ng_patch.c2
-rw-r--r--sys/netgraph/ng_pipe.c4
-rw-r--r--sys/netgraph/ng_ppp.c11
-rw-r--r--sys/netgraph/ng_pppoe.c4
-rw-r--r--sys/netgraph/ng_pppoe.h2
-rw-r--r--sys/netgraph/ng_pptpgre.c3
-rw-r--r--sys/netgraph/ng_pred1.c1
-rw-r--r--sys/netgraph/ng_pred1.h1
-rw-r--r--sys/netgraph/ng_rfc1490.c1
-rw-r--r--sys/netgraph/ng_sample.c3
-rw-r--r--sys/netgraph/ng_socket.c3
-rw-r--r--sys/netgraph/ng_socket.h1
-rw-r--r--sys/netgraph/ng_split.c2
-rw-r--r--sys/netgraph/ng_split.h1
-rw-r--r--sys/netgraph/ng_sppp.c8
-rw-r--r--sys/netgraph/ng_tag.c9
-rw-r--r--sys/netgraph/ng_tcpmss.c3
-rw-r--r--sys/netgraph/ng_tcpmss.h1
-rw-r--r--sys/netgraph/ng_tty.c1
-rw-r--r--sys/netgraph/ng_vjc.c1
-rw-r--r--sys/netgraph/ng_vlan.c3
-rw-r--r--sys/netgraph/ng_vlan.h1
119 files changed, 115 insertions, 327 deletions
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c
index cc3f7519289f..6c27b6aacc0f 100644
--- a/sys/netgraph/atm/ccatm/ng_ccatm.c
+++ b/sys/netgraph/atm/ccatm/ng_ccatm.c
@@ -492,10 +492,8 @@ ng_ccatm_rcvmsg(node_p node, item_p item, hook_p lasthook)
NGI_GET_MSG(item, msg);
switch (msg->header.typecookie) {
-
case NGM_CCATM_COOKIE:
switch (msg->header.cmd) {
-
case NGM_CCATM_DUMP:
if (priv->dump)
error = ng_ccatm_dump(node);
@@ -769,14 +767,12 @@ ng_ccatm_rcvmsg(node_p node, item_p item, hook_p lasthook)
default:
error = EINVAL;
break;
-
}
break;
default:
error = EINVAL;
break;
-
}
NG_RESPOND_MSG(error, node, item, resp);
@@ -1181,7 +1177,6 @@ ng_ccatm_mod_event(module_t mod, int event, void *data)
int error = 0;
switch (event) {
-
case MOD_LOAD:
break;
diff --git a/sys/netgraph/atm/ng_sscop.h b/sys/netgraph/atm/ng_sscop.h
index d535c3c2505f..cc67916ca49c 100644
--- a/sys/netgraph/atm/ng_sscop.h
+++ b/sys/netgraph/atm/ng_sscop.h
@@ -67,7 +67,6 @@ enum {
{ NULL } \
}
-
struct ng_sscop_setparam {
uint32_t mask;
struct sscop_param param;
diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c
index 1b0f0969f6e4..85409b35e4bd 100644
--- a/sys/netgraph/atm/ngatmbase.c
+++ b/sys/netgraph/atm/ngatmbase.c
@@ -483,7 +483,6 @@ ngatm_handler(module_t mod, int what, void *arg)
int error = 0;
switch (what) {
-
case MOD_LOAD:
uni_msg_init();
break;
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c
index 9036e7740ab6..7fe3728b7eae 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu.c
+++ b/sys/netgraph/atm/sscfu/ng_sscfu.c
@@ -92,7 +92,6 @@ static const struct ng_parse_type ng_sscfu_getdefparam_type = {
ng_sscfu_getdefparam_type_info
};
-
static const struct ng_cmdlist ng_sscfu_cmdlist[] = {
{
NGM_SSCFU_COOKIE,
@@ -224,10 +223,8 @@ ng_sscfu_rcvmsg(node_p node, item_p item, hook_p lasthook)
NGI_GET_MSG(item, msg);
switch (msg->header.typecookie) {
-
case NGM_GENERIC_COOKIE:
switch (msg->header.cmd) {
-
case NGM_TEXT_STATUS:
NG_MKRESPONSE(resp, msg, NG_TEXTRESPONSE, M_NOWAIT);
if (resp == NULL) {
@@ -246,7 +243,6 @@ ng_sscfu_rcvmsg(node_p node, item_p item, hook_p lasthook)
case NGM_SSCFU_COOKIE:
switch (msg->header.cmd) {
-
case NGM_SSCFU_GETDEFPARAM:
{
struct ng_sscfu_getdefparam *p;
@@ -592,7 +588,6 @@ ng_sscfu_mod_event(module_t mod, int event, void *data)
int error = 0;
switch (event) {
-
case MOD_LOAD:
break;
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
index eb0250e5ec02..f97245833be1 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
+++ b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
@@ -82,7 +82,6 @@
#endif
-
/*
* Signal queues
*/
@@ -120,7 +119,6 @@ ng_sscfu_sigq_get(struct sscfu_sigq *q) \
TAILQ_INIT(Q); \
} while (0)
-
/*
* Message buffers
*/
diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c
index 67a3f07efd83..b15ef5e258a1 100644
--- a/sys/netgraph/atm/sscop/ng_sscop.c
+++ b/sys/netgraph/atm/sscop/ng_sscop.c
@@ -302,7 +302,6 @@ flow_upper(node_p node, struct ng_mesg *msg)
q = (struct ngm_queue_state *)msg->data;
switch (msg->header.cmd) {
-
case NGM_HIGH_WATER_PASSED:
if (priv->flow) {
VERBOSE(priv, SSCOP_DBG_FLOW, (priv->sscop, priv,
@@ -355,7 +354,6 @@ flow_lower(node_p node, struct ng_mesg *msg)
return (EINVAL);
switch (msg->header.cmd) {
-
case NGM_HIGH_WATER_PASSED:
sscop_setbusy(priv->sscop, 1);
break;
@@ -435,7 +433,6 @@ text_status(node_p node, struct priv *priv, char *arg, u_int len)
return (sbuf_len(&sbuf));
}
-
/*
* Control message received.
*/
@@ -450,10 +447,8 @@ ng_sscop_rcvmsg(node_p node, item_p item, hook_p lasthook)
NGI_GET_MSG(item, msg);
switch (msg->header.typecookie) {
-
case NGM_GENERIC_COOKIE:
switch (msg->header.cmd) {
-
case NGM_TEXT_STATUS:
NG_MKRESPONSE(resp, msg, NG_TEXTRESPONSE, M_NOWAIT);
if (resp == NULL) {
@@ -482,7 +477,6 @@ ng_sscop_rcvmsg(node_p node, item_p item, hook_p lasthook)
case NGM_SSCOP_COOKIE:
switch (msg->header.cmd) {
-
case NGM_SSCOP_GETPARAM:
{
struct sscop_param *p;
@@ -864,7 +858,6 @@ ng_sscop_mod_event(module_t mod, int event, void *data)
int error = 0;
switch (event) {
-
case MOD_LOAD:
break;
diff --git a/sys/netgraph/atm/sscop/ng_sscop_cust.h b/sys/netgraph/atm/sscop/ng_sscop_cust.h
index 29d701aacb4c..97456a165220 100644
--- a/sys/netgraph/atm/sscop/ng_sscop_cust.h
+++ b/sys/netgraph/atm/sscop/ng_sscop_cust.h
@@ -133,7 +133,6 @@ T##_func(node_p node, hook_p hook, void *arg1, int arg2) \
sscop_signal(sscop, SIG_T_##N, NULL); \
}
-
/*
* Message queues
*/
diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c
index d3adad5ac9e4..c4e1c2c523b5 100644
--- a/sys/netgraph/atm/uni/ng_uni.c
+++ b/sys/netgraph/atm/uni/ng_uni.c
@@ -315,10 +315,8 @@ ng_uni_rcvmsg(node_p node, item_p item, hook_p lasthook)
NGI_GET_MSG(item, msg);
switch (msg->header.typecookie) {
-
case NGM_GENERIC_COOKIE:
switch (msg->header.cmd) {
-
case NGM_TEXT_STATUS:
NG_MKRESPONSE(resp, msg, NG_TEXTRESPONSE, M_NOWAIT);
if (resp == NULL) {
@@ -338,7 +336,6 @@ ng_uni_rcvmsg(node_p node, item_p item, hook_p lasthook)
case NGM_UNI_COOKIE:
switch (msg->header.cmd) {
-
case NGM_UNI_SETDEBUG:
{
struct ngm_uni_debug *arg;
@@ -563,7 +560,6 @@ ng_uni_rcvupper(hook_p hook, item_p item)
return (0);
}
-
/*
* Upper layer signal from UNI
*/
@@ -594,7 +590,6 @@ uni_uni_output(struct uni *uni, void *varg, enum uni_sig sig, u_int32_t cookie,
NG_SEND_DATA_ONLY(error, priv->upper, m);
}
-
static void
dump_uni_msg(struct uni_msg *msg)
{
@@ -613,7 +608,6 @@ dump_uni_msg(struct uni_msg *msg)
printf("\n");
}
-
/*
* Dump a SAAL signal in either direction
*/
@@ -625,7 +619,6 @@ dump_saal_signal(node_p node, enum saal_sig sig, struct uni_msg *msg, int to)
printf("signal %s SAAL: ", to ? "to" : "from");
switch (sig) {
-
#define D(S) case S: printf("%s", #S); break
D(SAAL_ESTABLISH_request);
@@ -758,7 +751,6 @@ uni_verbose(struct uni *uni, void *varg, u_int fac, const char *fmt, ...)
printf("\n");
}
-
/************************************************************/
/*
* Memory debugging
@@ -912,7 +904,6 @@ ng_uni_mod_event(module_t mod, int event, void *data)
int error = 0;
switch(event) {
-
case MOD_LOAD:
uni_init();
break;
diff --git a/sys/netgraph/bluetooth/common/ng_bluetooth.c b/sys/netgraph/bluetooth/common/ng_bluetooth.c
index 1a9d1c425a18..c191efae1e6b 100644
--- a/sys/netgraph/bluetooth/common/ng_bluetooth.c
+++ b/sys/netgraph/bluetooth/common/ng_bluetooth.c
@@ -291,4 +291,3 @@ static moduledata_t bluetooth_mod = {
DECLARE_MODULE(ng_bluetooth, bluetooth_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
MODULE_VERSION(ng_bluetooth, NG_BLUETOOTH_VERSION);
-
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index 5a874e989711..c9045e84f256 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -137,7 +137,7 @@ do { \
} while(0)
static MALLOC_DEFINE(M_BT3C, "bt3c", "bt3c data structures");
-
+
/****************************************************************************
****************************************************************************
** Netgraph specific
@@ -834,7 +834,7 @@ bt3c_receive(bt3c_softc_p sc)
bt3c_read_data(sc, c);
if (sc->m->m_pkthdr.len >= MCLBYTES) {
NG_BT3C_ERR(sc->dev, "Oversized frame\n");
-
+
NG_FREE_M(sc->m);
sc->state = NG_BT3C_W4_PKT_IND;
sc->want = 1;
@@ -1181,7 +1181,6 @@ static device_method_t bt3c_pccard_methods[] = {
DEVMETHOD(device_probe, bt3c_pccard_probe),
DEVMETHOD(device_attach, bt3c_pccard_attach),
DEVMETHOD(device_detach, bt3c_pccard_detach),
-
{ 0, 0 }
};
@@ -1193,16 +1192,15 @@ static driver_t bt3c_pccard_driver = {
static devclass_t bt3c_devclass;
-
/*
* Load/Unload the driver module
*/
-
+
static int
bt3c_modevent(module_t mod, int event, void *data)
{
int error;
-
+
switch (event) {
case MOD_LOAD:
error = ng_newtype(&typestruct);
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
index 481e36c87b13..9dfd90795ab7 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
@@ -106,4 +106,3 @@ typedef struct bt3c_softc bt3c_softc_t;
typedef struct bt3c_softc * bt3c_softc_p;
#endif /* ndef _NG_BT3C_VAR_H_ */
-
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index a747e6bce0d3..11560b7c6681 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -1018,4 +1018,3 @@ ng_h4_mod_event(module_t mod, int event, void *data)
return (error);
} /* ng_h4_mod_event */
-
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
index 0a35a3698769..835fd65b9543 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
@@ -123,4 +123,3 @@ static const struct ng_cmdlist ng_h4_cmdlist[] = {
};
#endif /* ndef _NETGRAPH_H4_PRSE_H_ */
-
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
index 2b22fc770aa9..2bfa3d6cde3c 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
@@ -73,7 +73,7 @@ typedef struct ng_h4_info {
ng_h4_node_debug_ep debug; /* Debug level */
ng_h4_node_state_ep state; /* State */
-
+
ng_h4_node_stat_ep stat;
#define NG_H4_STAT_PCKTS_SENT(s) (s).pckts_sent ++
#define NG_H4_STAT_BYTES_SENT(s, n) (s).bytes_sent += (n)
@@ -102,4 +102,3 @@ typedef struct ng_h4_info {
typedef ng_h4_info_t * ng_h4_info_p;
#endif /* _NETGRAPH_H4_VAR_H_ */
-
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index d641aadad60d..30a012702c8f 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -560,7 +560,6 @@ ubt_do_hci_request(struct usb_device *udev, struct ubt_hci_cmd *cmd,
error = usbd_transfer_setup(udev, &iface_index, xfer,
&ubt_probe_config, 1, evt, &mtx);
if (error == USB_ERR_NORMAL_COMPLETION) {
-
mtx_lock(&mtx);
usbd_transfer_start(*xfer);
@@ -703,7 +702,6 @@ ubt_attach(device_t dev)
while ((ed = (struct usb_endpoint_descriptor *)usb_desc_foreach(
usbd_get_config_descriptor(uaa->device),
(struct usb_descriptor *)ed))) {
-
if ((ed->bDescriptorType == UDESC_INTERFACE) &&
(ed->bLength >= sizeof(*id))) {
id = (struct usb_interface_descriptor *)ed;
@@ -1678,7 +1676,7 @@ ng_ubt_disconnect(hook_p hook)
return (0);
} /* ng_ubt_disconnect */
-
+
/*
* Process control message.
* Netgraph context.
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
index d5bf568a5ecb..e93c85569f10 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
@@ -64,7 +64,7 @@ enum {
UBT_IF_0_BULK_DT_RD,
UBT_IF_0_INTR_DT_RD,
UBT_IF_0_CTRL_DT_WR,
-
+
/* Interface #1 transfers */
UBT_IF_1_ISOC_DT_RD1,
UBT_IF_1_ISOC_DT_RD2,
@@ -165,4 +165,3 @@ extern devclass_t ubt_devclass;
extern driver_t ubt_driver;
#endif /* ndef _NG_UBT_VAR_H_ */
-
diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
index 32c9caba94f0..60896597cae7 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -177,7 +177,6 @@ static const STRUCT_USB_HOST_ID ubtbcmfw_devs[] = {
{ USB_VPI(USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033, 0) },
};
-
DRIVER_MODULE(ubtbcmfw, uhub, ubtbcmfw_driver, ubtbcmfw_devclass, NULL, 0);
MODULE_DEPEND(ubtbcmfw, usb, 1, 1, 1);
USB_PNP_HOST_INFO(ubtbcmfw_devs);
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
index 9bef544cc98b..cf192bfb3469 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
@@ -527,7 +527,7 @@ process_link_policy_params(ng_hci_unit_p unit, u_int16_t ocf,
case NG_HCI_OCF_WRITE_LINK_POLICY_SETTINGS:
/* These do not need post processing */
break;
-
+
case NG_HCI_OCF_HOLD_MODE:
case NG_HCI_OCF_SNIFF_MODE:
case NG_HCI_OCF_EXIT_SNIFF_MODE:
@@ -733,7 +733,7 @@ process_info_params(ng_hci_unit_p unit, u_int16_t ocf, struct mbuf *mcp,
ng_hci_node_is_up(unit->node, unit->acl, NULL, 0);
ng_hci_node_is_up(unit->node, unit->sco, NULL, 0);
break;
-
+
default:
error = EINVAL;
break;
@@ -785,14 +785,13 @@ process_testing_params(ng_hci_unit_p unit, u_int16_t ocf, struct mbuf *mcp,
int error = 0;
switch (ocf) {
-
/*
* XXX FIXME
* We do not support these features at this time. However,
* HCI node could support this and do something smart. At least
* node can change unit state.
*/
-
+
case NG_HCI_OCF_READ_LOOPBACK_MODE:
case NG_HCI_OCF_WRITE_LOOPBACK_MODE:
case NG_HCI_OCF_ENABLE_UNIT_UNDER_TEST:
@@ -854,7 +853,6 @@ process_le_params(ng_hci_unit_p unit, u_int16_t ocf,
case NG_HCI_OCF_LE_READ_REMOTE_USED_FEATURES:
case NG_HCI_OCF_LE_START_ENCRYPTION:
-
default:
/*
* None of these command was supposed to generate
@@ -874,8 +872,6 @@ process_le_params(ng_hci_unit_p unit, u_int16_t ocf,
}
-
-
static int
process_le_status(ng_hci_unit_p unit,ng_hci_command_status_ep *ep,
struct mbuf *mcp)
@@ -918,7 +914,6 @@ process_le_status(ng_hci_unit_p unit,ng_hci_command_status_ep *ep,
case NG_HCI_OCF_LE_TRANSMITTER_TEST:
case NG_HCI_OCF_LE_TEST_END:
-
default:
/*
* None of these command was supposed to generate
@@ -1036,4 +1031,3 @@ process_link_policy_status(ng_hci_unit_p unit, ng_hci_command_status_ep *ep,
return (error);
} /* process_link_policy_status */
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
index 9290eddcc8cb..18f14c93ced3 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
@@ -46,4 +46,3 @@ int ng_hci_process_command_status (ng_hci_unit_p, struct mbuf *);
void ng_hci_process_command_timeout (node_p, hook_p, void *, int);
#endif /* ndef _NETGRAPH_HCI_CMDS_H_ */
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
index 5b1916c8ece0..9e299d12fd1e 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
@@ -83,7 +83,7 @@ static int le_event (ng_hci_unit_p, struct mbuf *);
/*
* Process HCI event packet
*/
-
+
int
ng_hci_process_event(ng_hci_unit_p unit, struct mbuf *event)
{
@@ -384,7 +384,7 @@ le_advertizing_report(ng_hci_unit_p unit, struct mbuf *event)
int num_reports = 0;
u_int8_t event_type;
u_int8_t addr_type;
-
+
NG_HCI_M_PULLUP(event, sizeof(*ep));
if (event == NULL)
return (ENOBUFS);
@@ -393,7 +393,7 @@ le_advertizing_report(ng_hci_unit_p unit, struct mbuf *event)
num_reports = ep->num_reports;
m_adj(event, sizeof(*ep));
ep = NULL;
-
+
for (; num_reports > 0; num_reports --) {
/* Get remote unit address */
NG_HCI_M_PULLUP(event, sizeof(u_int8_t));
@@ -554,7 +554,6 @@ static int le_connection_complete(ng_hci_unit_p unit, struct mbuf *event)
* supported link modes. Enable Role switch as well if
* device supports it.
*/
-
}
out:
@@ -568,7 +567,7 @@ static int le_connection_update(ng_hci_unit_p unit, struct mbuf *event)
{
int error = 0;
/*TBD*/
-
+
NG_FREE_M(event);
return error;
@@ -1182,7 +1181,7 @@ mode_change(ng_hci_unit_p unit, struct mbuf *event)
ng_hci_mode_change_ep *ep = NULL;
ng_hci_unit_con_p con = NULL;
int error = 0;
-
+
NG_HCI_M_PULLUP(event, sizeof(*ep));
if (event == NULL)
return (ENOBUFS);
@@ -1392,4 +1391,3 @@ out:
return (error);
} /* page_scan_rep_mode_change */
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
index 1f11b416eae9..efc958d3be9e 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
@@ -44,4 +44,3 @@ int ng_hci_process_event (ng_hci_unit_p, struct mbuf *);
void ng_hci_send_data (ng_hci_unit_p);
#endif /* ndef _NETGRAPH_HCI_EVNT_H_ */
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_main.c b/sys/netgraph/bluetooth/hci/ng_hci_main.c
index ad3bd403de7f..2d93a79cd679 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_main.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_main.c
@@ -755,7 +755,7 @@ ng_hci_drv_rcvdata(hook_p hook, item_p item)
} else
NG_FWD_ITEM_HOOK(error, item, unit->sco);
break;
-
+
case NG_HCI_EVENT_PKT:
NG_HCI_STAT_EVNT_RECV(unit->stat);
@@ -1101,4 +1101,3 @@ drop:
return (error);
} /* ng_hci_raw_rcvdata */
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
index 619b5d4c4430..707af8c84d06 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -232,7 +232,7 @@ ng_hci_get_neighbor(ng_hci_unit_p unit, bdaddr_p bdaddr,int link_type)
n = nn;
}
-
+
return (n);
} /* ng_hci_get_neighbor */
@@ -526,4 +526,3 @@ ng_hci_str_error(u_int16_t code)
return ((code >= LAST_ERROR_CODE)? s[LAST_ERROR_CODE] : s[code]);
} /* ng_hci_str_error */
#endif
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.h b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
index e32a83de909e..dde5f883acb2 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
@@ -57,4 +57,3 @@ int ng_hci_con_timeout (ng_hci_unit_con_p);
int ng_hci_con_untimeout (ng_hci_unit_con_p);
#endif /* ndef _NETGRAPH_HCI_MISC_H_ */
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_prse.h b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
index 5d456ebea4de..9731de6aa9fa 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_prse.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
@@ -218,4 +218,3 @@ static const struct ng_cmdlist ng_hci_cmdlist[] = {
};
#endif /* ndef _NETGRAPH_HCI_PRSE_H_ */
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
index bb85dc6e73c9..4c275f425064 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
@@ -68,7 +68,7 @@ int
ng_hci_lp_con_req(ng_hci_unit_p unit, item_p item, hook_p hook)
{
int link_type;
-
+
if ((unit->state & NG_HCI_UNIT_READY) != NG_HCI_UNIT_READY) {
NG_HCI_WARN(
"%s: %s - unit is not ready, state=%#x\n",
@@ -111,7 +111,7 @@ ng_hci_lp_con_req(ng_hci_unit_p unit, item_p item, hook_p hook)
default:
panic("%s: link_type invalid.", __func__);
}
-
+
return (EINVAL);
} /* ng_hci_lp_con_req */
@@ -618,7 +618,7 @@ ng_hci_lp_le_con_req(ng_hci_unit_p unit, item_p item, hook_p hook, int link_type
req->hdr.length = sizeof(req->cp);
req->hdr.opcode = htole16(NG_HCI_OPCODE(NG_HCI_OGF_LE,
NG_HCI_OCF_LE_CREATE_CONNECTION));
-
+
bcopy(&ep->bdaddr, &req->cp.peer_addr, sizeof(req->cp.peer_addr));
req->cp.own_address_type = 0;
req->cp.peer_addr_type = (link_type == NG_HCI_LINK_LE_RANDOM)? 1:0;
@@ -824,7 +824,6 @@ ng_hci_lp_enc_change(ng_hci_unit_con_p con, int status)
ng_hci_lp_enc_change_ep *ep = NULL;
int error;
-
if (con->link_type != NG_HCI_LINK_SCO) {
if (unit->acl != NULL && NG_HOOK_IS_VALID(unit->acl)) {
NG_MKMESSAGE(msg, NGM_HCI_COOKIE, NGM_HCI_LP_ENC_CHG,
@@ -842,7 +841,6 @@ ng_hci_lp_enc_change(ng_hci_unit_con_p con, int status)
NG_HCI_INFO(
"%s: %s - ACL hook not valid, hook=%p\n",
__func__, NG_NODE_NAME(unit->node), unit->acl);
-
}
return (0);
} /* ng_hci_lp_con_cfm */
@@ -1254,7 +1252,7 @@ ng_hci_lp_qos_req(ng_hci_unit_p unit, item_p item, hook_p hook)
error = ng_hci_send_command(unit);
out:
NG_FREE_ITEM(item);
-
+
return (error);
} /* ng_hci_lp_qos_req */
@@ -1309,7 +1307,7 @@ ng_hci_lp_qos_cfm(ng_hci_unit_con_p con, int status)
con->flags &= ~NG_HCI_CON_NOTIFY_SCO;
}
-
+
return (0);
} /* ng_hci_lp_qos_cfm */
@@ -1428,4 +1426,3 @@ ng_hci_process_con_timeout(node_p node, hook_p hook, void *arg1, int con_handle)
ng_hci_free_con(con);
} /* ng_hci_process_con_timeout */
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
index 18fcb4e8dd40..16fdaa3ced63 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
@@ -54,4 +54,3 @@ int ng_hci_lp_enc_change (ng_hci_unit_con_p, int);
void ng_hci_process_con_timeout (node_p, hook_p, void *, int);
#endif /* ndef _NETGRAPH_HCI_ULPI_H_ */
-
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_var.h b/sys/netgraph/bluetooth/hci/ng_hci_var.h
index d30a5694284f..bb5c1f4624a7 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_var.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_var.h
@@ -219,4 +219,3 @@ typedef struct ng_hci_neighbor {
typedef ng_hci_neighbor_t * ng_hci_neighbor_p;
#endif /* ndef _NETGRAPH_HCI_VAR_H_ */
-
diff --git a/sys/netgraph/bluetooth/include/ng_bluetooth.h b/sys/netgraph/bluetooth/include/ng_bluetooth.h
index 4eb2c7b79d96..ae68392cc54c 100644
--- a/sys/netgraph/bluetooth/include/ng_bluetooth.h
+++ b/sys/netgraph/bluetooth/include/ng_bluetooth.h
@@ -231,4 +231,3 @@ u_int32_t bluetooth_sco_rtx_timeout (void);
#define BDADDR_LE_RANDOM 2
#endif /* _NETGRAPH_BLUETOOTH_H_ */
-
diff --git a/sys/netgraph/bluetooth/include/ng_bt3c.h b/sys/netgraph/bluetooth/include/ng_bt3c.h
index 9c0f2a121525..59cc7c7dba84 100644
--- a/sys/netgraph/bluetooth/include/ng_bt3c.h
+++ b/sys/netgraph/bluetooth/include/ng_bt3c.h
@@ -110,4 +110,3 @@ typedef struct {
} ng_bt3c_firmware_block_ep;
#endif /* ndef _NG_BT3C_H_ */
-
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket.h b/sys/netgraph/bluetooth/include/ng_btsocket.h
index c8c1a0c00aee..acaed2603ab7 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket.h
@@ -239,12 +239,10 @@ struct sockaddr_l2cap {
u_int8_t l2cap_bdaddr_type; /*address type*/
};
-
#if !defined(L2CAP_SOCKET_CHECKED) && !defined(_KERNEL)
#warning "Make sure new member of socket address initialized"
#endif
-
/* L2CAP socket options */
#define SOL_L2CAP 0x1609 /* socket option level */
@@ -375,4 +373,3 @@ struct ng_btsocket_rfcomm_fc_info {
#define NG_BTSOCKET_INFO_LEVEL 4
#endif /* _NETGRAPH_BTSOCKET_H_ */
-
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
index a40470a51894..5a51452dc884 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
@@ -87,6 +87,5 @@ int ng_btsocket_hci_raw_send (struct socket *, int, struct mbuf *,
int ng_btsocket_hci_raw_sockaddr (struct socket *, struct sockaddr **);
#endif /* _KERNEL */
-
-#endif /* ndef _NETGRAPH_BTSOCKET_HCI_RAW_H_ */
+#endif /* ndef _NETGRAPH_BTSOCKET_HCI_RAW_H_ */
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
index 0017f8b6557a..8ecb8821a275 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
@@ -176,7 +176,7 @@ struct ng_btsocket_l2cap_pcb {
struct mtx pcb_mtx; /* pcb mutex */
uint16_t need_encrypt; /*encryption needed*/
-
+
LIST_ENTRY(ng_btsocket_l2cap_pcb) next; /* link to next PCB */
};
typedef struct ng_btsocket_l2cap_pcb ng_btsocket_l2cap_pcb_t;
@@ -215,4 +215,3 @@ int ng_btsocket_l2cap_sockaddr (struct socket *, struct sockaddr **);
#endif /* _KERNEL */
#endif /* _NETGRAPH_BTSOCKET_L2CAP_H_ */
-
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
index 1e3a28b9ede7..569a407ef629 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
@@ -339,4 +339,3 @@ int ng_btsocket_rfcomm_sockaddr (struct socket *, struct sockaddr **);
#endif /* _KERNEL */
#endif /* _NETGRAPH_BTSOCKET_RFCOMM_H_ */
-
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
index f707e7ed1988..979ea408f292 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
@@ -129,4 +129,3 @@ int ng_btsocket_sco_sockaddr (struct socket *, struct sockaddr **);
#endif /* _KERNEL */
#endif /* _NETGRAPH_BTSOCKET_SCO_H_ */
-
diff --git a/sys/netgraph/bluetooth/include/ng_h4.h b/sys/netgraph/bluetooth/include/ng_h4.h
index 803bbaf9609b..872ce6423ad9 100644
--- a/sys/netgraph/bluetooth/include/ng_h4.h
+++ b/sys/netgraph/bluetooth/include/ng_h4.h
@@ -112,4 +112,3 @@ typedef struct {
#define NGM_H4_NODE_RESET_STAT 8
#endif /* _NETGRAPH_H4_H_ */
-
diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h
index fedd2d7696b7..3de0ef337249 100644
--- a/sys/netgraph/bluetooth/include/ng_hci.h
+++ b/sys/netgraph/bluetooth/include/ng_hci.h
@@ -715,7 +715,7 @@ typedef struct {
} __attribute__ ((packed)) ng_hci_periodic_inquiry_cp;
typedef ng_hci_status_rp ng_hci_periodic_inquiry_rp;
-
+
#define NG_HCI_OCF_EXIT_PERIODIC_INQUIRY 0x0004
/* No command parameter(s) */
typedef ng_hci_status_rp ng_hci_exit_periodic_inquiry_rp;
@@ -941,7 +941,7 @@ typedef struct {
typedef struct {
u_int16_t con_handle; /* connection handle */
} __attribute__ ((packed)) ng_hci_read_link_policy_settings_cp;
-
+
typedef struct {
u_int8_t status; /* 0x00 - success */
u_int16_t con_handle; /* connection handle */
@@ -1207,7 +1207,7 @@ typedef struct {
u_int16_t con_handle; /* connection handle */
u_int16_t timeout; /* 0x00 - no flush, timeout * 0.625 msec */
} __attribute__ ((packed)) ng_hci_read_auto_flush_timo_rp;
-
+
#define NG_HCI_OCF_WRITE_AUTO_FLUSH_TIMO 0x0028
typedef struct {
u_int16_t con_handle; /* connection handle */
@@ -1529,7 +1529,7 @@ typedef ng_hci_status_rp ng_hci_enable_unit_under_test_rp;
#define NG_HCI_OCF_LE_SET_EVENT_MASK 0x0001
typedef struct {
u_int8_t event_mask[NG_HCI_LE_EVENT_MASK_SIZE]; /* event_mask*/
-
+
} __attribute__ ((packed)) ng_hci_le_set_event_mask_cp;
typedef ng_hci_status_rp ng_hci_le_set_event_mask_rp;
#define NG_HCI_LE_EVENT_MASK_ALL 0x1f
@@ -1542,7 +1542,6 @@ typedef struct {
u_int8_t hc_total_num_le_data_packets;
} __attribute__ ((packed)) ng_hci_le_read_buffer_size_rp;
-
#define NG_HCI_OCF_LE_READ_LOCAL_SUPPORTED_FEATURES 0x0003
/*No command parameter */
typedef struct {
@@ -1640,7 +1639,7 @@ typedef struct {
u_int8_t status;
u_int8_t white_list_size;
} __attribute__ ((packed)) ng_hci_le_read_white_list_size_rp;
-
+
#define NG_HCI_OCF_LE_CLEAR_WHITE_LIST 0x0010
/* No command parameters. */
typedef ng_hci_status_rp ng_hci_le_clear_white_list_rp;
@@ -1685,7 +1684,7 @@ typedef struct {
u_int16_t connection_handle;
u_int8_t le_channel_map[5];
} __attribute__ ((packed)) ng_hci_le_read_channel_map_rp;
-
+
#define NG_HCI_OCF_LE_READ_REMOTE_USED_FEATURES 0x0016
typedef struct {
u_int16_t connection_handle;
@@ -1708,7 +1707,7 @@ typedef struct {
u_int8_t status;
u_int64_t random_number;
}__attribute__ ((packed)) ng_hci_le_rand_rp;
-
+
#define NG_HCI_OCF_LE_START_ENCRYPTION 0x0019
typedef struct {
u_int16_t connection_handle;
@@ -2044,13 +2043,13 @@ typedef struct {
u_int8_t latency;
u_int16_t supervision_timeout;
u_int8_t master_clock_accuracy;
-
+
} __attribute__ ((packed)) ng_hci_le_connection_complete_ep;
#define NG_HCI_LEEV_ADVREP 0x02
typedef struct {
u_int8_t num_reports;
-
+
}__attribute__ ((packed)) ng_hci_le_advertising_report_ep;
#define NG_HCI_SCAN_RESPONSE_DATA_MAX 0x1f
diff --git a/sys/netgraph/bluetooth/include/ng_l2cap.h b/sys/netgraph/bluetooth/include/ng_l2cap.h
index c8b5dddc6ffc..f7b5e54be59a 100644
--- a/sys/netgraph/bluetooth/include/ng_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_l2cap.h
@@ -84,7 +84,6 @@
#define NG_L2CAP_LAST_CID 0xffff /* dynamically alloc. (end) */
#define NG_L2CAP_LELAST_CID 0x007f
-
/* L2CAP MTU */
#define NG_L2CAP_MTU_LE_MINIMAM 23
#define NG_L2CAP_MTU_MINIMUM 48
@@ -705,4 +704,3 @@ typedef struct {
typedef u_int16_t ng_l2cap_node_auto_discon_ep;
#endif /* ndef _NETGRAPH_L2CAP_H_ */
-
diff --git a/sys/netgraph/bluetooth/include/ng_ubt.h b/sys/netgraph/bluetooth/include/ng_ubt.h
index 48ee265143d5..9f713259d966 100644
--- a/sys/netgraph/bluetooth/include/ng_ubt.h
+++ b/sys/netgraph/bluetooth/include/ng_ubt.h
@@ -90,4 +90,3 @@ typedef struct {
typedef u_int16_t ng_ubt_node_dev_nodes_ep;
#endif /* ndef _NG_UBT_H_ */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
index a1c4d144dfef..a8a11b453223 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
@@ -410,4 +410,3 @@ ng_l2cap_process_command_timeout(node_p node, hook_p hook, void *arg1, int arg2)
ng_l2cap_free_cmd(cmd);
} /* ng_l2cap_process_command_timeout */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
index dafea71bf8ed..1d9b80b173a7 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
@@ -427,4 +427,3 @@ void ng_l2cap_con_fail (ng_l2cap_con_p, u_int16_t);
void ng_l2cap_process_command_timeout (node_p, hook_p, void *, int);
#endif /* ndef _NETGRAPH_L2CAP_CMDS_H_ */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
index 425dfc055677..b64c93c85eea 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
@@ -370,7 +370,7 @@ static int ng_l2cap_process_cmd_urs(ng_l2cap_con_p con, uint8_t ident)
{
/* We only support master side yet .*/
//send_l2cap_reject(con,ident ... );
-
+
NG_FREE_M(con->rx_pkt);
return 0;
}
@@ -463,7 +463,7 @@ ng_l2cap_process_con_req(ng_l2cap_con_p con, u_int8_t ident)
int error = 0;
u_int16_t dcid, psm;
int idtype;
-
+
/* Get command parameters */
NG_L2CAP_M_PULLUP(m, sizeof(*cp));
if (m == NULL)
@@ -713,7 +713,6 @@ ng_l2cap_process_cfg_req(ng_l2cap_con_p con, u_int8_t ident)
respond = 1;
if (error == -3) {
-
/*
* Adjust mbuf so we can get to the start
* of the first option we did not like.
@@ -1244,7 +1243,7 @@ ng_l2cap_process_info_rsp(ng_l2cap_con_p con, u_int8_t ident)
return (ENOENT);
}
-
+
/* If command timeout already happened then ignore response */
if ((error = ng_l2cap_command_untimeout(cmd)) != 0) {
NG_FREE_M(con->rx_pkt);
@@ -1335,7 +1334,7 @@ send_l2cap_con_rej(ng_l2cap_con_p con, u_int8_t ident, u_int16_t scid,
return (ENOBUFS);
}
-
+
/* Link command to the queue */
ng_l2cap_link_cmd(con, cmd);
ng_l2cap_lp_deliver(con);
@@ -1384,7 +1383,6 @@ send_l2cap_param_urs(ng_l2cap_con_p con, u_int8_t ident,
NG_L2CAP_CMD_PARAM_UPDATE_RESPONSE,
0);
if (cmd == NULL) {
-
return (ENOMEM);
}
@@ -1475,4 +1473,3 @@ get_next_l2cap_opt(struct mbuf *m, int *off, ng_l2cap_cfg_opt_p hdr,
return (1);
} /* get_next_l2cap_opt */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
index 945ff0a8e52f..53c6ac3f7218 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
@@ -39,4 +39,3 @@
int ng_l2cap_receive (ng_l2cap_con_p);
#endif /* ndef _NETGRAPH_L2CAP_EVNT_H_ */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
index cf761af3f7c2..b1e7514430e0 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
@@ -127,7 +127,7 @@ ng_l2cap_lp_con_req(ng_l2cap_p l2cap, bdaddr_p bdaddr, int type)
* the caller.
*/
}
-
+
return (error);
} /* ng_l2cap_lp_con_req */
@@ -403,7 +403,7 @@ ng_l2cap_lp_qos_req(ng_l2cap_p l2cap, u_int16_t con_handle,
ep->delay_variation = flow->delay_variation;
NG_SEND_MSG_HOOK(error, l2cap->node, msg, l2cap->hci, 0);
-
+
return (error);
} /* ng_l2cap_lp_con_req */
@@ -524,13 +524,13 @@ ng_l2cap_lp_enc_change(ng_l2cap_p l2cap, struct ng_mesg *msg)
}
con->encryption = ep->status;
-
+
LIST_FOREACH(ch, &l2cap->chan_list, next){
if((ch->con->con_handle == ep->con_handle) &&
(ch->con->linktype == ep->link_type))
ng_l2cap_l2ca_encryption_change(ch, ep->status);
}
-
+
out:
return (error);
} /* ng_l2cap_enc_change */
@@ -967,4 +967,3 @@ ng_l2cap_process_discon_timeout(node_p node, hook_p hook, void *arg1, int con_ha
NG_SEND_MSG_HOOK(error, l2cap->node, msg, l2cap->hci, 0);
} /* ng_l2cap_process_discon_timeout */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
index e3e5b5959c1b..36c118c2dd57 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
@@ -51,4 +51,3 @@ void ng_l2cap_process_lp_timeout (node_p, hook_p, void *, int);
void ng_l2cap_process_discon_timeout (node_p, hook_p, void *, int);
#endif /* ndef _NETGRAPH_L2CAP_LLPI_H_ */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
index b438cf223374..1a60e1be4a62 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
@@ -757,4 +757,3 @@ ng_l2cap_destroy_channels(ng_l2cap_p l2cap)
while (!LIST_EMPTY(&l2cap->chan_list))
ng_l2cap_free_chan(LIST_FIRST(&l2cap->chan_list));
} /* ng_l2cap_destroy_channels_by_hook */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
index eb6df6d7c94c..7a3daf75ead4 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -234,7 +234,7 @@ ng_l2cap_discon_untimeout(ng_l2cap_con_p con)
"%s: %s - no disconnect timeout, state=%d, flags=%#x\n",
__func__, NG_NODE_NAME(con->l2cap->node),
con->state, con->flags);
-
+
if (ng_uncallout(&con->con_timo, con->l2cap->node) == 0)
return (ETIMEDOUT);
@@ -348,7 +348,7 @@ ng_l2cap_new_chan(ng_l2cap_p l2cap, ng_l2cap_con_p con, u_int16_t psm, int idtyp
ch->scid = ng_l2cap_get_cid(l2cap,
(con->linktype!= NG_HCI_LINK_ACL));
}
-
+
ch->idtype = idtype;
if (ch->scid != NG_L2CAP_NULL_CID) {
/* Initialize channel */
@@ -378,7 +378,6 @@ ng_l2cap_new_chan(ng_l2cap_p l2cap, ng_l2cap_con_p con, u_int16_t psm, int idtyp
return (ch);
} /* ng_l2cap_new_chan */
-
ng_l2cap_chan_p
ng_l2cap_chan_by_scid(ng_l2cap_p l2cap, u_int16_t scid, int idtype)
{
@@ -388,7 +387,7 @@ ng_l2cap_chan_by_scid(ng_l2cap_p l2cap, u_int16_t scid, int idtype)
(idtype == NG_L2CAP_L2CA_IDTYPE_SMP)){
return NULL;
}
-
+
LIST_FOREACH(ch, &l2cap->chan_list, next){
if((idtype != NG_L2CAP_L2CA_IDTYPE_BREDR)&&
(ch->con->linktype == NG_HCI_LINK_ACL ))
@@ -408,7 +407,6 @@ ng_l2cap_chan_by_conhandle(ng_l2cap_p l2cap, uint16_t scid,
{
ng_l2cap_chan_p ch = NULL;
-
LIST_FOREACH(ch, &l2cap->chan_list, next){
if ((ch->scid == scid) &&
(ch->con->con_handle == con_handle))
@@ -477,7 +475,7 @@ ng_l2cap_new_cmd(ng_l2cap_con_p con, ng_l2cap_chan_p ch, u_int8_t ident,
return (cmd);
} /* ng_l2cap_new_cmd */
-
+
/*
* Get pending (i.e. initiated by local side) L2CAP command descriptor by ident
*/
@@ -535,7 +533,7 @@ ng_l2cap_lp_untimeout(ng_l2cap_con_p con)
"%s: %s - no LP connection timeout, state=%d, flags=%#x\n",
__func__, NG_NODE_NAME(con->l2cap->node),
con->state, con->flags);
-
+
if (ng_uncallout(&con->con_timo, con->l2cap->node) == 0)
return (ETIMEDOUT);
@@ -697,4 +695,3 @@ ng_l2cap_get_ident(ng_l2cap_con_p con)
return (NG_L2CAP_NULL_IDENT);
} /* ng_l2cap_get_ident */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
index 697432d5b4dc..4e29ec074788 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
@@ -107,4 +107,3 @@ struct mbuf * ng_l2cap_prepend (struct mbuf *, int);
ng_l2cap_flow_p ng_l2cap_default_flow (void);
#endif /* ndef _NETGRAPH_L2CAP_MISC_H_ */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
index f6829adc3a6f..b60be9f5bc06 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
@@ -86,4 +86,3 @@ static const struct ng_cmdlist ng_l2cap_cmdlist[] = {
};
#endif /* ndef _NETGRAPH_L2CAP_PRSE_H_ */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
index b1359cf42aee..098761b013eb 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
@@ -380,12 +380,12 @@ int ng_l2cap_l2ca_encryption_change(ng_l2cap_chan_p ch, uint16_t result)
}
return (error);
-
+
}
/*
* Send L2CAP_ConnectRsp response to the upper layer
*/
-
+
int
ng_l2cap_l2ca_con_rsp_rsp(ng_l2cap_chan_p ch, u_int32_t token, u_int16_t result)
{
@@ -889,7 +889,7 @@ ng_l2cap_l2ca_write_req(ng_l2cap_p l2cap, struct mbuf *m)
ch = ng_l2cap_chan_by_scid(l2cap, l2ca_hdr->lcid,
l2ca_hdr->idtype);
}
-
+
if (ch == NULL) {
NG_L2CAP_ERR(
"%s: %s - invalid L2CA Data packet. Channel does not exist, cid=%d\n",
@@ -995,7 +995,7 @@ ng_l2cap_l2ca_receive(ng_l2cap_con_p con)
int idtype;
uint16_t *idp;
int silent = 0;
-
+
NG_L2CAP_M_PULLUP(con->rx_pkt, sizeof(*hdr));
if (con->rx_pkt == NULL)
return (ENOBUFS);
@@ -1233,7 +1233,6 @@ ng_l2cap_l2ca_discon_req(ng_l2cap_p l2cap, struct ng_mesg *msg)
ip = (ng_l2cap_l2ca_discon_ip *)(msg->data);
-
if(ip->idtype == NG_L2CAP_L2CA_IDTYPE_ATT){
/* Don't send Disconnect request on L2CAP Layer*/
ch = ng_l2cap_chan_by_conhandle(l2cap, NG_L2CAP_ATT_CID,
@@ -1719,7 +1718,7 @@ out:
return (error);
} /* ng_l2cap_l2ca_get_info_rsp */
-
+
/*
* Process L2CA_EnableCLT message from the upper layer protocol
* XXX convert to NGN_L2CAP_NODE_SET_FLAGS?
@@ -1786,7 +1785,7 @@ ng_l2cap_l2ca_enable_clt(ng_l2cap_p l2cap, struct ng_mesg *msg)
else
l2cap->flags |= NG_L2CAP_CLT_TCP_DISABLED;
break;
-
+
default:
NG_L2CAP_ERR(
"%s: %s - unsupported PSM=%d\n", __func__, NG_NODE_NAME(l2cap->node), ip->psm);
@@ -1820,4 +1819,3 @@ ng_l2cap_l2ca_enable_clt(ng_l2cap_p l2cap, struct ng_mesg *msg)
return (error);
} /* ng_l2cap_l2ca_enable_clt */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
index 54d89519fabf..2e60f6f8c675 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
@@ -78,4 +78,3 @@ int ng_l2cap_l2ca_get_info_rsp (ng_l2cap_con_p, u_int32_t, u_int16_t,
int ng_l2cap_l2ca_enable_clt (ng_l2cap_p, struct ng_mesg *);
int ng_l2cap_l2ca_encryption_change(ng_l2cap_chan_p , uint16_t );
#endif /* ndef _NETGRAPH_L2CAP_ULPI_H_ */
-
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
index b71bc3476a82..0bf8e8219e5a 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
@@ -122,7 +122,7 @@ typedef struct ng_l2cap_con {
u_int8_t ident; /* last allocated ident */
uint8_t linktype;
uint8_t encryption;
-
+
TAILQ_HEAD(, ng_l2cap_cmd) cmd_list; /* pending L2CAP cmds */
struct mbuf *tx_pkt; /* xmitted L2CAP packet */
@@ -193,4 +193,3 @@ typedef struct ng_l2cap_cmd {
typedef ng_l2cap_cmd_t * ng_l2cap_cmd_p;
#endif /* ndef _NETGRAPH_L2CAP_VAR_H_ */
-
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index 1e2cde0f489c..5f6b98d03359 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -125,7 +125,7 @@ static struct mtx ng_btsocket_hci_raw_token_mtx;
static struct ng_btsocket_hci_raw_sec_filter *ng_btsocket_hci_raw_sec_filter;
static struct timeval ng_btsocket_hci_raw_lasttime;
static int ng_btsocket_hci_raw_curpps;
-
+
/* Sysctl tree */
SYSCTL_DECL(_net_bluetooth_hci_sockets);
static SYSCTL_NODE(_net_bluetooth_hci_sockets, OID_AUTO, raw,
@@ -365,7 +365,7 @@ ng_btsocket_hci_raw_node_rcvdata(hook_p hook, item_p item)
* submits ioctl() message then interrupts ioctl() and re-submits another
* ioctl() on the same socket *before* first ioctl() complete.
*/
-
+
static void
ng_btsocket_hci_raw_get_token(u_int32_t *token)
{
@@ -373,9 +373,9 @@ ng_btsocket_hci_raw_get_token(u_int32_t *token)
if (++ ng_btsocket_hci_raw_token == 0)
ng_btsocket_hci_raw_token = 1;
-
+
*token = ng_btsocket_hci_raw_token;
-
+
mtx_unlock(&ng_btsocket_hci_raw_token_mtx);
} /* ng_btsocket_hci_raw_get_token */
@@ -499,7 +499,6 @@ ng_btsocket_hci_raw_data_input(struct mbuf *nam)
mtx_lock(&ng_btsocket_hci_raw_sockets_mtx);
LIST_FOREACH(pcb, &ng_btsocket_hci_raw_sockets, next) {
-
mtx_lock(&pcb->pcb_mtx);
/*
@@ -1504,7 +1503,7 @@ ng_btsocket_hci_raw_ctloutput(struct socket *so, struct sockopt *sopt)
}
mtx_unlock(&pcb->pcb_mtx);
-
+
return (error);
} /* ng_btsocket_hci_raw_ctloutput */
@@ -1650,7 +1649,7 @@ drop:
NG_FREE_M(control); /* NG_FREE_M checks for != NULL */
NG_FREE_M(nam);
NG_FREE_M(m);
-
+
return (error);
} /* ng_btsocket_hci_raw_send */
@@ -1681,4 +1680,3 @@ ng_btsocket_hci_raw_sockaddr(struct socket *so, struct sockaddr **nam)
return ((*nam == NULL)? ENOMEM : 0);
} /* ng_btsocket_hci_raw_sockaddr */
-
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index 54323c0fce56..2bd15ac35895 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -223,8 +223,6 @@ static int ng_btsock_l2cap_addrtype_to_linktype(int addrtype);
#define ng_btsocket_l2cap_wakeup_route_task() \
taskqueue_enqueue(taskqueue_swi_giant, &ng_btsocket_l2cap_rt_task)
-
-
int ng_btsock_l2cap_addrtype_to_linktype(int addrtype)
{
switch(addrtype){
@@ -237,7 +235,6 @@ int ng_btsock_l2cap_addrtype_to_linktype(int addrtype)
}
}
-
/*****************************************************************************
*****************************************************************************
** Netgraph node interface
@@ -614,7 +611,7 @@ ng_btsocket_l2cap_process_l2ca_con_ind(struct ng_mesg *msg,
ip->psm, ip->lcid, ip->ident);
mtx_lock(&ng_btsocket_l2cap_sockets_mtx);
-
+
pcb = ng_btsocket_l2cap_pcb_by_addr(&rt->src, ip->psm);
if (pcb != NULL) {
struct socket *so1;
@@ -697,7 +694,6 @@ static int ng_btsocket_l2cap_process_l2ca_enc_change(struct ng_mesg *msg, ng_bts
ng_l2cap_l2ca_enc_chg_op *op = NULL;
ng_btsocket_l2cap_pcb_t *pcb = NULL;
-
if (msg->header.arglen != sizeof(*op))
return (EMSGSIZE);
@@ -714,7 +710,7 @@ static int ng_btsocket_l2cap_process_l2ca_enc_change(struct ng_mesg *msg, ng_bts
mtx_lock(&pcb->pcb_mtx);
pcb->encryption = op->result;
-
+
if(pcb->need_encrypt){
ng_btsocket_l2cap_untimeout(pcb);
if(pcb->state != NG_BTSOCKET_L2CAP_W4_ENC_CHANGE){
@@ -1191,7 +1187,7 @@ ng_btsocket_l2cap_process_l2ca_write_rsp(struct ng_mesg *msg,
return (ENOENT);
}
-
+
ng_btsocket_l2cap_untimeout(pcb);
/*
@@ -1428,7 +1424,7 @@ ng_btsocket_l2cap_data_input(struct mbuf *m, hook_p hook)
m = m_pullup(m, sizeof(uint16_t));
idtype = *mtod(m, uint16_t *);
m_adj(m, sizeof(uint16_t));
-
+
/* Make sure we can access header */
if (m->m_pkthdr.len < sizeof(*hdr)) {
NG_BTSOCKET_L2CAP_ERR(
@@ -1476,7 +1472,6 @@ ng_btsocket_l2cap_data_input(struct mbuf *m, hook_p hook)
(idtype == NG_L2CAP_L2CA_IDTYPE_ATT)||
(idtype == NG_L2CAP_L2CA_IDTYPE_SMP)
){
-
mtx_lock(&ng_btsocket_l2cap_sockets_mtx);
/* Normal packet: find connected socket */
@@ -1518,7 +1513,6 @@ ng_btsocket_l2cap_data_input(struct mbuf *m, hook_p hook)
/* Check if we have enough space in socket receive queue */
if (m->m_pkthdr.len > sbspace(&pcb->so->so_rcv)) {
-
/*
* This is really bad. Receive queue on socket does
* not have enough space for the packet. We do not
@@ -2086,7 +2080,7 @@ ng_btsocket_l2cap_attach(struct socket *so, int proto, struct thread *td)
mtx_lock(&ng_btsocket_l2cap_sockets_mtx);
else
mtx_assert(&ng_btsocket_l2cap_sockets_mtx, MA_OWNED);
-
+
/* Set PCB token. Use ng_btsocket_l2cap_sockets_mtx for protection */
if (++ token == 0)
token ++;
@@ -2347,7 +2341,6 @@ ng_btsocket_l2cap_ctloutput(struct socket *so, struct sockopt *sopt)
sizeof(pcb->need_encrypt));
break;
-
default:
error = ENOPROTOOPT;
break;
@@ -2651,7 +2644,7 @@ ng_btsocket_l2cap_send2(ng_btsocket_l2cap_pcb_p pcb)
struct mbuf *m = NULL;
ng_l2cap_l2ca_hdr_t *hdr = NULL;
int error = 0;
-
+
mtx_assert(&pcb->pcb_mtx, MA_OWNED);
if (sbavail(&pcb->so->so_snd) == 0)
@@ -2793,7 +2786,6 @@ ng_btsocket_l2cap_pcb_by_cid(bdaddr_p src, int cid, int idtype)
bcmp(src, &p->src, sizeof(p->src)) == 0&&
p->idtype == idtype)
break;
-
}
return (p);
} /* ng_btsocket_l2cap_pcb_by_cid */
@@ -2971,4 +2963,3 @@ ng_btsocket_l2cap_result2errno(int result)
return (ENOSYS);
} /* ng_btsocket_l2cap_result2errno */
-
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index fa1b05480fda..5508ff7526d2 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -283,7 +283,6 @@ ng_btsocket_l2cap_raw_node_rcvmsg(node_p node, item_p item, hook_p hook)
int error = 0;
if (msg != NULL && msg->header.typecookie == NGM_L2CAP_COOKIE) {
-
/*
* NGM_L2CAP_NODE_HOOK_INFO is special message initiated by
* L2CAP layer. Ignore all other messages if they are not
@@ -751,7 +750,7 @@ ng_btsocket_l2cap_raw_connect(struct socket *so, struct sockaddr *nam,
return (0);
}
-
+
/*
* Find the first hook that does not match specified destination address
*/
@@ -849,7 +848,7 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
(struct ng_btsocket_l2cap_raw_con_list *) data;
ng_l2cap_node_con_list_ep *p1 = NULL;
ng_l2cap_node_con_ep *p2 = NULL;
-
+
if (p->num_connections == 0 ||
p->num_connections > NG_L2CAP_MAX_CON_NUM ||
p->connections == NULL) {
@@ -913,14 +912,14 @@ ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
(struct ng_btsocket_l2cap_raw_chan_list *) data;
ng_l2cap_node_chan_list_ep *p1 = NULL;
ng_l2cap_node_chan_ep *p2 = NULL;
-
+
if (p->num_channels == 0 ||
p->num_channels > NG_L2CAP_MAX_CHAN_NUM ||
p->channels == NULL) {
mtx_unlock(&pcb->pcb_mtx);
return (EINVAL);
}
-
+
NG_MKMESSAGE(msg, NGM_L2CAP_COOKIE,
NGM_L2CAP_NODE_GET_CHAN_LIST, 0, M_NOWAIT);
if (msg == NULL) {
@@ -1287,9 +1286,9 @@ ng_btsocket_l2cap_raw_get_token(u_int32_t *token)
if (++ ng_btsocket_l2cap_raw_token == 0)
ng_btsocket_l2cap_raw_token = 1;
-
+
*token = ng_btsocket_l2cap_raw_token;
-
+
mtx_unlock(&ng_btsocket_l2cap_raw_token_mtx);
} /* ng_btsocket_l2cap_raw_get_token */
@@ -1359,4 +1358,3 @@ ng_btsocket_l2cap_raw_send_sync_ngmsg(ng_btsocket_l2cap_raw_pcb_p pcb,
return (0);
} /* ng_btsocket_l2cap_raw_send_sync_ngmsg */
-
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index 137580e52542..95b28e6cc5e7 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -740,7 +740,7 @@ ng_btsocket_rfcomm_detach(struct socket *so)
ng_btsocket_rfcomm_task_wakeup();
break;
}
-
+
while (pcb->state != NG_BTSOCKET_RFCOMM_DLC_CLOSED)
msleep(&pcb->state, &pcb->pcb_mtx, PZERO, "rf_det", 0);
@@ -977,7 +977,7 @@ ng_btsocket_rfcomm_send(struct socket *so, int flags, struct mbuf *m,
/* Put the packet on the socket's send queue and wakeup RFCOMM task */
sbappend(&pcb->so->so_snd, m, flags);
m = NULL;
-
+
if (!(pcb->flags & NG_BTSOCKET_RFCOMM_DLC_SENDING)) {
pcb->flags |= NG_BTSOCKET_RFCOMM_DLC_SENDING;
error = ng_btsocket_rfcomm_task_wakeup();
@@ -1595,7 +1595,7 @@ ng_btsocket_rfcomm_session_receive(ng_btsocket_rfcomm_session_p s)
return (error);
}
-
+
more = (m->m_nextpkt != NULL);
m->m_nextpkt = NULL;
@@ -1709,7 +1709,6 @@ ng_btsocket_rfcomm_session_process_pcb(ng_btsocket_rfcomm_session_p s)
pcb_next = LIST_NEXT(pcb, session_next);
switch (pcb->state) {
-
/*
* If DLC in W4_CONNECT state then we should check for both
* timeout and detach.
@@ -2359,13 +2358,12 @@ ng_btsocket_rfcomm_receive_uih(ng_btsocket_rfcomm_session_p s, int dlci,
error = EMSGSIZE;
} else if (m0->m_pkthdr.len > sbspace(&pcb->so->so_rcv)) {
-
/*
* This is really bad. Receive queue on socket does
* not have enough space for the packet. We do not
* have any other choice but drop the packet.
*/
-
+
NG_BTSOCKET_RFCOMM_ERR(
"%s: Not enough space in socket receive queue. Dropping UIH for dlci=%d, " \
"state=%d, flags=%#x, len=%d, space=%ld\n",
@@ -3558,4 +3556,3 @@ ng_btsocket_rfcomm_prepare_packet(struct sockbuf *sb, int length)
return (top);
} /* ng_btsocket_rfcomm_prepare_packet */
-
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
index 1fa4246c9d13..da8f22befc79 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
@@ -1323,7 +1323,6 @@ ng_btsocket_sco_bind(struct socket *so, struct sockaddr *nam,
mtx_unlock(&pcb->pcb_mtx);
}
-
}
pcb = so2sco_pcb(so);
@@ -1508,7 +1507,7 @@ ng_btsocket_sco_ctloutput(struct socket *so, struct sockopt *sopt)
}
mtx_unlock(&pcb->pcb_mtx);
-
+
return (error);
} /* ng_btsocket_sco_ctloutput */
@@ -1980,4 +1979,3 @@ ng_btsocket_sco_process_timeout(void *xpcb)
mtx_unlock(&pcb->pcb_mtx);
} /* ng_btsocket_sco_process_timeout */
-
diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c
index 34991784f74d..8e1bcddd6895 100644
--- a/sys/netgraph/netflow/netflow.c
+++ b/sys/netgraph/netflow/netflow.c
@@ -503,7 +503,6 @@ hash6_insert(priv_p priv, struct flow_hash_entry *hsh6, struct flow6_rec *r,
}
#endif
-
/*
* Non-static functions called from ng_netflow.c
*/
@@ -598,7 +597,7 @@ ng_netflow_fib_init(priv_p priv, int fib)
fib, fe, priv_to_fib(priv, fib));
priv->nfinfo_alloc_fibs++;
}
-
+
return (0);
}
@@ -864,7 +863,7 @@ ng_netflow_flow6_add(priv_p priv, fib_export_p fe, struct ip6_hdr *ip6,
r.r_ip_p = upper_proto;
r.r_i_ifx = src_if_index;
-
+
counter_u64_add(priv->nfinfo_packets6, 1);
counter_u64_add(priv->nfinfo_bytes6, plen);
@@ -1078,7 +1077,6 @@ export_send(priv_p priv, fib_export_p fe, item_p item, int flags)
return (error);
}
-
/* Add export record to dgram. */
static int
export_add(item_p item, struct flow_entry *fle)
diff --git a/sys/netgraph/netflow/netflow.h b/sys/netgraph/netflow/netflow.h
index d6e061a7ff14..894692bd4f90 100644
--- a/sys/netgraph/netflow/netflow.h
+++ b/sys/netgraph/netflow/netflow.h
@@ -145,7 +145,6 @@ struct netflow_v5_export_dgram {
struct netflow_v5_record r[NETFLOW_V5_MAX_RECORDS];
} __attribute__((__packed__));
-
/* RFC3954 field definitions */
#define NETFLOW_V9_FIELD_IN_BYTES 1 /* Input bytes count for a flow. Default 4, can be 8 */
#define NETFLOW_V9_FIELD_IN_PKTS 2 /* Incoming counter with number of packets associated with an IP Flow. Default 4 */
diff --git a/sys/netgraph/netflow/netflow_v9.c b/sys/netgraph/netflow/netflow_v9.c
index e4f9c5faa534..798bf6fecc42 100644
--- a/sys/netgraph/netflow/netflow_v9.c
+++ b/sys/netgraph/netflow/netflow_v9.c
@@ -236,8 +236,6 @@ export9_send(priv_p priv, fib_export_p fe, item_p item, struct netflow_v9_packet
return (error);
}
-
-
/* Add V9 record to dgram. */
int
export9_add(item_p item, struct netflow_v9_packet_opt *t, struct flow_entry *fle)
@@ -413,16 +411,15 @@ get_export9_dgram(priv_p priv, fib_export_p fe, struct netflow_v9_packet_opt **t
t->count = 0;
t->mtu = mtu;
t->flow_header = m->m_len;
-
+
/*
* Check if we need to insert templates into packet
*/
struct netflow_v9_flowset_header *fl;
-
+
if ((time_uptime >= priv->templ_time + fe->templ_last_ts) ||
(fe->sent_packets >= priv->templ_packets + fe->templ_last_pkt)) {
-
fe->templ_last_ts = time_uptime;
fe->templ_last_pkt = fe->sent_packets;
@@ -431,7 +428,6 @@ get_export9_dgram(priv_p priv, fib_export_p fe, struct netflow_v9_packet_opt **t
t->flow_header = m->m_len;
t->count += priv->flowset_records[0];
}
-
}
*tt = t;
@@ -492,4 +488,3 @@ ng_netflow_copyv9info(priv_p priv, struct ng_netflow_v9info *i)
i->templ_packets = priv->templ_packets;
i->mtu = priv->mtu;
}
-
diff --git a/sys/netgraph/netflow/ng_netflow.c b/sys/netgraph/netflow/ng_netflow.c
index ab09e3000d0e..6180fe573b60 100644
--- a/sys/netgraph/netflow/ng_netflow.c
+++ b/sys/netgraph/netflow/ng_netflow.c
@@ -220,7 +220,6 @@ static const struct ng_cmdlist ng_netflow_cmds[] = {
{ 0 }
};
-
/* Netgraph node type descriptor */
static struct ng_type ng_netflow_typestruct = {
.version = NG_ABI_VERSION,
@@ -340,7 +339,6 @@ ng_netflow_newhook(node_p node, hook_p hook, const char *name)
iface->out = hook;
} else if (strcmp(name, NG_NETFLOW_HOOK_EXPORT) == 0) {
-
if (priv->export != NULL)
return (EISCONN);
@@ -354,7 +352,6 @@ ng_netflow_newhook(node_p node, hook_p hook, const char *name)
callout_reset(&priv->exp_callout, (1*hz), &ng_netflow_expire,
(void *)priv);
} else if (strcmp(name, NG_NETFLOW_HOOK_EXPORT9) == 0) {
-
if (priv->export9 != NULL)
return (EISCONN);
@@ -500,7 +497,7 @@ ng_netflow_rcvmsg (node_p node, item_p item, hook_p lasthook)
ERROUT(EINVAL);
priv->ifaces[set->iface].info.conf = set->conf;
-
+
break;
}
case NGM_NETFLOW_SETTEMPLATE:
@@ -638,7 +635,7 @@ ng_netflow_rcvdata (hook_p hook, item_p item)
MTAG_NETFLOW_CALLED, mtag);
}
}
-
+
if (bypass) {
if (out == NULL)
ERROUT(ENOTCONN);
@@ -646,7 +643,7 @@ ng_netflow_rcvdata (hook_p hook, item_p item)
NG_FWD_ITEM_HOOK(error, item, out);
return (error);
}
-
+
if (iface->info.conf &
(NG_NETFLOW_CONF_ONCE | NG_NETFLOW_CONF_THISONCE)) {
mtag = m_tag_alloc(MTAG_NETFLOW, MTAG_NETFLOW_CALLED,
@@ -918,7 +915,7 @@ loopend:
src_if_index = m->m_pkthdr.rcvif->if_index;
} else
src_if_index = iface->info.ifinfo_index;
-
+
/* Check packet FIB */
fib = M_GETFIB(m);
if (fib >= priv->maxfibs) {
@@ -948,7 +945,7 @@ loopend:
#endif
else
goto bypass;
-
+
acct = 1;
bypass:
if (out != NULL) {
diff --git a/sys/netgraph/netflow/ng_netflow.h b/sys/netgraph/netflow/ng_netflow.h
index 836b13b14a06..5086cff1c401 100644
--- a/sys/netgraph/netflow/ng_netflow.h
+++ b/sys/netgraph/netflow/ng_netflow.h
@@ -111,7 +111,6 @@ struct ng_netflow_info {
{ NULL } \
}
-
/* This structure is returned by the NGM_NETFLOW_IFINFO message */
struct ng_netflow_ifinfo {
uint32_t ifinfo_packets; /* number of packets for this iface */
@@ -121,7 +120,6 @@ struct ng_netflow_ifinfo {
uint32_t conf;
};
-
/* This structure is passed to NGM_NETFLOW_SETDLT message */
struct ng_netflow_setdlt {
uint16_t iface; /* which iface dlt change */
@@ -248,7 +246,7 @@ struct flow6_rec {
#define r_ports ports.both
#define r_sport ports.dir.s_port
#define r_dport ports.dir.d_port
-
+
/* A flow entry which accumulates statistics */
struct flow_entry_data {
uint16_t version; /* Protocol version */
@@ -493,7 +491,6 @@ struct flow_hash_entry {
struct mtx mtx;
TAILQ_HEAD(fhead, flow_entry) head;
};
-
#define ERROUT(x) { error = (x); goto done; }
#define MTAG_NETFLOW 1221656444
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h
index c7b0e67902cf..7535472dc631 100644
--- a/sys/netgraph/netgraph.h
+++ b/sys/netgraph/netgraph.h
@@ -77,7 +77,6 @@
#define NG_ABI_VERSION _NG_ABI_VERSION
#endif /* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-
/*
* Forward references for the basic structures so we can
* define the typedefs and use them in the structures themselves.
@@ -303,7 +302,6 @@ _ng_hook_hi_stack(hook_p hook, char * file, int line)
_NG_HOOK_HI_STACK(hook);
}
-
#define NG_HOOK_REF(hook) _ng_hook_ref(hook, _NN_)
#define NG_HOOK_NAME(hook) _ng_hook_name(hook, _NN_)
#define NG_HOOK_UNREF(hook) _ng_hook_unref(hook, _NN_)
@@ -873,7 +871,7 @@ _ngi_hook(item_p item, char *file, int line)
#define NGI_QUEUED_READER(i) ((i)->el_flags & NGQF_QREADER)
#define NGI_QUEUED_WRITER(i) (((i)->el_flags & NGQF_QMODE) == NGQF_QWRITER)
-
+
/**********************************************************************
* Data macros. Send, manipulate and free.
**********************************************************************/
@@ -1033,7 +1031,6 @@ _ngi_hook(item_p item, char *file, int line)
(item) = NULL; \
} while (0)
-
/***********************************************************************
******** Structures Definitions and Macros for defining a node *******
***********************************************************************
@@ -1070,7 +1067,6 @@ struct ng_cmdlist {
* for other reasons (e.g. device output queuing).
*/
struct ng_type {
-
u_int32_t version; /* must equal NG_API_VERSION */
const char *name; /* Unique type name */
modeventhand_t mod_event; /* Module event handler (optional) */
diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index 8e8ab55d6490..9f899a841fd8 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -49,7 +49,6 @@
#include <sys/mbuf.h>
#include <sys/errno.h>
-
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
#include <netgraph/ng_UI.h>
@@ -242,4 +241,3 @@ ng_UI_disconnect(hook_p hook)
}
return (0);
}
-
diff --git a/sys/netgraph/ng_UI.h b/sys/netgraph/ng_UI.h
index 216570aaf1dc..82ff49540515 100644
--- a/sys/netgraph/ng_UI.h
+++ b/sys/netgraph/ng_UI.h
@@ -53,4 +53,3 @@
#define NG_UI_HOOK_UPSTREAM "upstream"
#endif /* _NETGRAPH_NG_UI_H_ */
-
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c
index 217590b73950..c89b71077a01 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -66,7 +66,6 @@ static MALLOC_DEFINE(M_NETGRAPH_ASYNC, "netgraph_async", "netgraph async node");
#define M_NETGRAPH_ASYNC M_NETGRAPH
#endif
-
/* Async decode state */
#define MODE_HUNT 0
#define MODE_NORMAL 1
@@ -259,7 +258,7 @@ nga_rcvmsg(node_p node, item_p item, hook_p lasthook)
struct ng_mesg *resp = NULL;
int error = 0;
struct ng_mesg *msg;
-
+
NGI_GET_MSG(item, msg);
switch (msg->header.typecookie) {
case NGM_ASYNC_COOKIE:
@@ -407,7 +406,6 @@ nga_rcv_sync(const sc_p sc, item_p item)
u_int32_t accm;
struct mbuf *m;
-
#define ADD_BYTE(x) nga_async_add(sc, &fcs, accm, &alen, (x))
/* Check for bypass mode */
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index 9cfa4403a2c3..c5b38dc1fdd6 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -1426,7 +1426,7 @@ ng_con_part2(node_p node, item_p item, hook_p hook)
LIST_INSERT_HEAD(&node->nd_hooks, hook, hk_hooks);
node->nd_numhooks++;
NG_HOOK_REF(hook); /* one for the node */
-
+
/*
* We now have a symmetrical situation, where both hooks have been
* linked to their nodes, the newhook methods have been called
@@ -1577,7 +1577,6 @@ ng_mkpeer(node_p node, const char *name, const char *name2, char *type)
if ((error == 0) && hook2->hk_node->nd_type->connect) {
error = (*hook2->hk_node->nd_type->connect) (hook2);
-
}
/*
@@ -1599,7 +1598,7 @@ ng_mkpeer(node_p node, const char *name, const char *name2, char *type)
/************************************************************************
Utility routines to send self messages
************************************************************************/
-
+
/* Shut this node down as soon as everyone is clear of it */
/* Should add arg "immediately" to jump the queue */
int
diff --git a/sys/netgraph/ng_bpf.c b/sys/netgraph/ng_bpf.c
index 49db81e60954..b9535c7c124d 100644
--- a/sys/netgraph/ng_bpf.c
+++ b/sys/netgraph/ng_bpf.c
@@ -479,7 +479,6 @@ ng_bpf_rcvdata(hook_p hook, item_p item)
ready:
/* See if we got a match and find destination hook */
if (len > 0) {
-
/* Update stats */
/* XXX atomically? */
hip->stats.recvMatchFrames++;
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index e2e533be2c1e..1521b1cee901 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -382,7 +382,6 @@ ng_bridge_reset_link(hook_p hook, void *arg __unused)
return (1);
}
-
static int
ng_bridge_rcvmsg(node_p node, item_p item, hook_p lasthook)
{
@@ -631,7 +630,6 @@ ng_bridge_send_ctx(hook_p dst, void *arg)
return (0); /* abort loop */
}
-
/* Update stats */
destLink->stats.xmitPackets++;
destLink->stats.xmitOctets += m2->m_pkthdr.len;
@@ -707,20 +705,17 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
/* Look up packet's source Ethernet address in hashtable */
if ((host = ng_bridge_get(priv, eh->ether_shost)) != NULL) {
-
/* Update time since last heard from this host */
host->staleness = 0;
/* Did host jump to a different link? */
if (host->link != ctx.incoming) {
-
/*
* If the host's old link was recently established
* on the old link and it's already jumped to a new
* link, declare a loopback condition.
*/
if (host->age < priv->conf.minStableAge) {
-
/* Log the problem */
if (priv->conf.debugLevel >= 2) {
struct ifnet *ifp = ctx.m->m_pkthdr.rcvif;
@@ -776,7 +771,6 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
* unless it is the same link as the packet came in on.
*/
if (!ctx.manycast) {
-
/* Determine packet destination link */
if ((host = ng_bridge_get(priv, eh->ether_dhost)) != NULL) {
link_p destLink = host->link;
@@ -808,7 +802,7 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
NG_FREE_M(ctx.m);
return (ctx.error);
}
-
+
/*
* If we've sent all the others, send the original
* on the first link we found.
@@ -995,7 +989,6 @@ ng_bridge_rehash(priv_p priv)
MISC FUNCTIONS
******************************************************************/
-
/*
* Remove all hosts associated with a specific link from the hashtable.
* If linkNum == -1, then remove all hosts in the table.
@@ -1105,4 +1098,3 @@ ng_bridge_nodename(node_p node)
snprintf(name, sizeof(name), "[%x]", ng_node2ID(node));
return name;
}
-
diff --git a/sys/netgraph/ng_bridge.h b/sys/netgraph/ng_bridge.h
index fa4736370e92..e4b74efbfc5e 100644
--- a/sys/netgraph/ng_bridge.h
+++ b/sys/netgraph/ng_bridge.h
@@ -201,4 +201,3 @@ enum {
};
#endif /* _NETGRAPH_NG_BRIDGE_H_ */
-
diff --git a/sys/netgraph/ng_car.c b/sys/netgraph/ng_car.c
index babbbb151820..1f74c4b193d0 100644
--- a/sys/netgraph/ng_car.c
+++ b/sys/netgraph/ng_car.c
@@ -305,7 +305,6 @@ ng_car_rcvdata(hook_p hook, item_p item )
hinfo->tc -= len;
NG_CAR_PERFORM_MATCH_ACTION(hinfo->conf.green_action);
} else {
-
/* Refill only if not green without it. */
ng_car_refillhook(hinfo);
@@ -673,7 +672,6 @@ ng_car_q_event(node_p node, hook_p hook, void *arg, int arg2)
/* If we have some tokens */
while (hinfo->tc >= 0) {
-
/* Send packet. */
m = hinfo->q[hinfo->q_first];
NG_SEND_DATA_ONLY(error, hinfo->dest, m);
diff --git a/sys/netgraph/ng_checksum.c b/sys/netgraph/ng_checksum.c
index c7fecb0ab78d..682375c805da 100644
--- a/sys/netgraph/ng_checksum.c
+++ b/sys/netgraph/ng_checksum.c
@@ -75,7 +75,6 @@ static ng_shutdown_t ng_checksum_shutdown;
static ng_newhook_t ng_checksum_newhook;
static ng_rcvdata_t ng_checksum_rcvdata;
static ng_disconnect_t ng_checksum_disconnect;
-
#define ERROUT(x) { error = (x); goto done; }
static const struct ng_parse_struct_field ng_checksum_config_type_fields[]
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index 61c3b7f05265..25b931545b44 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -572,7 +572,6 @@ drop:
return (error);
}
-
/*
* Send keepalive packets, every 10 seconds.
*/
diff --git a/sys/netgraph/ng_cisco.h b/sys/netgraph/ng_cisco.h
index ebded7a76982..8bf15e6e16b1 100644
--- a/sys/netgraph/ng_cisco.h
+++ b/sys/netgraph/ng_cisco.h
@@ -88,4 +88,3 @@ struct ng_cisco_stats {
}
#endif /* _NETGRAPH_NG_CISCO_H_ */
-
diff --git a/sys/netgraph/ng_deflate.c b/sys/netgraph/ng_deflate.c
index 1d62d60efd9a..db9cc588b765 100644
--- a/sys/netgraph/ng_deflate.c
+++ b/sys/netgraph/ng_deflate.c
@@ -716,4 +716,3 @@ ng_deflate_reset_req(node_p node)
inflateReset(&priv->cx);
}
}
-
diff --git a/sys/netgraph/ng_deflate.h b/sys/netgraph/ng_deflate.h
index 780dcc7676fd..47d93d8f866c 100644
--- a/sys/netgraph/ng_deflate.h
+++ b/sys/netgraph/ng_deflate.h
@@ -84,4 +84,3 @@ enum {
};
#endif /* _NETGRAPH_NG_DEFLATE_H_ */
-
diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c
index 248572b6fd49..ff62f7f44a35 100644
--- a/sys/netgraph/ng_device.c
+++ b/sys/netgraph/ng_device.c
@@ -447,7 +447,6 @@ ngdread(struct cdev *dev, struct uio *uio, int flag)
return (error);
}
-
/*
* This function is called when our device is written to.
* We read the data from userland into mbuf chain and pass it to the remote hook.
diff --git a/sys/netgraph/ng_echo.c b/sys/netgraph/ng_echo.c
index e9daf5eda958..2601c42aaeea 100644
--- a/sys/netgraph/ng_echo.c
+++ b/sys/netgraph/ng_echo.c
@@ -118,4 +118,3 @@ nge_disconnect(hook_p hook)
}
return (0);
}
-
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 6d69779c8562..5b12ecc70c11 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -60,7 +60,6 @@
#include <net/ethernet.h>
#include <net/if_arp.h>
-
static const struct ng_cmdlist ng_eiface_cmdlist[] = {
{
NGM_EIFACE_COOKIE,
@@ -143,7 +142,6 @@ ng_eiface_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
ng_eiface_print_ioctl(ifp, command, data);
#endif
switch (command) {
-
/* These two are mostly handled at a higher layer */
case SIOCSIFADDR:
error = ether_ioctl(ifp, command, data);
@@ -484,7 +482,6 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook)
switch (msg->header.typecookie) {
case NGM_EIFACE_COOKIE:
switch (msg->header.cmd) {
-
case NGM_EIFACE_SET:
{
if (msg->header.arglen != ETHER_ADDR_LEN) {
diff --git a/sys/netgraph/ng_etf.c b/sys/netgraph/ng_etf.c
index e4757b4001d7..26e8489878b8 100644
--- a/sys/netgraph/ng_etf.c
+++ b/sys/netgraph/ng_etf.c
@@ -159,7 +159,6 @@ ng_etf_findentry(etf_p etfp, u_int16_t ethertype)
{
struct filterhead *chain = etfp->hashtable + HASH(ethertype);
struct filter *fil;
-
LIST_FOREACH(fil, chain, next) {
if (fil->ethertype == ethertype) {
@@ -169,7 +168,6 @@ ng_etf_findentry(etf_p etfp, u_int16_t ethertype)
return (NULL);
}
-
/*
* Allocate the private data structure. The generic node has already
* been created. Link them together. We arrive with a reference to the node
@@ -485,4 +483,3 @@ ng_etf_disconnect(hook_p hook)
ng_rmnode_self(NG_HOOK_NODE(hook));
return (0);
}
-
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index b307b3d5ab88..c5ea9d102d5c 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -690,7 +690,6 @@ ng_ether_rcv_lower(hook_p hook, item_p item)
/* Drop in the MAC address if desired */
if (priv->autoSrcAddr) {
-
/* Make the mbuf writable if it's not already */
if (!M_WRITABLE(m)
&& (m = m_pullup(m, sizeof(struct ether_header))) == NULL)
diff --git a/sys/netgraph/ng_ether_echo.c b/sys/netgraph/ng_ether_echo.c
index 4064bc371864..75f44f7a0000 100644
--- a/sys/netgraph/ng_ether_echo.c
+++ b/sys/netgraph/ng_ether_echo.c
@@ -142,4 +142,3 @@ ngee_disconnect(hook_p hook)
}
return (0);
}
-
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index b931e897be88..20c8fb9791c3 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -252,7 +252,6 @@ ngfrm_newhook(node_p node, hook_p hook, const char *name)
*/
if (strncmp(name, NG_FRAMERELAY_HOOK_DLCI,
strlen(NG_FRAMERELAY_HOOK_DLCI)) != 0) {
-
/* It must be the downstream connection */
if (strcmp(name, NG_FRAMERELAY_HOOK_DOWNSTREAM) != 0)
return EINVAL;
diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c
index 69401a3344fb..d4cb8922d1d6 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -593,4 +593,3 @@ ng_gif_mod_event(module_t mod, int event, void *data)
}
return (error);
}
-
diff --git a/sys/netgraph/ng_hub.c b/sys/netgraph/ng_hub.c
index 8d7026e84e7a..f1f9f2265854 100644
--- a/sys/netgraph/ng_hub.c
+++ b/sys/netgraph/ng_hub.c
@@ -81,7 +81,6 @@ static struct ng_type ng_hub_typestruct = {
};
NETGRAPH_INIT(hub, &ng_hub_typestruct);
-
static int
ng_hub_constructor(node_p node)
{
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index a91c202ef832..1e586d687244 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -287,7 +287,6 @@ ng_iface_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
ng_iface_print_ioctl(ifp, command, data);
#endif
switch (command) {
-
/* These two are mostly handled at a higher layer */
case SIOCSIFADDR:
ifp->if_flags |= IFF_UP;
@@ -625,7 +624,6 @@ ng_iface_rcvmsg(node_p node, item_p item, hook_p lasthook)
case NGM_IFACE_POINT2POINT:
case NGM_IFACE_BROADCAST:
{
-
/* Deny request if interface is UP */
if ((ifp->if_flags & IFF_UP) != 0)
return (EBUSY);
diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c
index 599833731325..d97f131849de 100644
--- a/sys/netgraph/ng_ipfw.c
+++ b/sys/netgraph/ng_ipfw.c
@@ -225,7 +225,6 @@ ng_ipfw_findhook1(node_p node, u_int16_t rulenum)
return (NULL);
}
-
static int
ng_ipfw_rcvdata(hook_p hook, item_p item)
{
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c
index cbfded714eb9..ba9845410e42 100644
--- a/sys/netgraph/ng_ksocket.c
+++ b/sys/netgraph/ng_ksocket.c
@@ -583,7 +583,6 @@ ng_ksocket_newhook(node_p node, hook_p hook, const char *name0)
return (error);
/* XXX call soreserve() ? */
-
}
/* OK */
@@ -1016,7 +1015,6 @@ ng_ksocket_incoming(struct socket *so, void *arg, int waitflag)
return (SU_OK);
}
-
/*
* When incoming data is appended to the socket, we get notified here.
* This is also called whenever a significant event occurs for the socket.
@@ -1271,4 +1269,3 @@ ng_ksocket_parse(const struct ng_ksocket_alias *aliases,
return (-1);
return (val);
}
-
diff --git a/sys/netgraph/ng_l2tp.c b/sys/netgraph/ng_l2tp.c
index 91d998965d88..91f6004961ec 100644
--- a/sys/netgraph/ng_l2tp.c
+++ b/sys/netgraph/ng_l2tp.c
@@ -1065,9 +1065,9 @@ ng_l2tp_rcvdata_ctrl(hook_p hook, item_p item)
if (!callout_active(&seq->rack_timer))
ng_callout(&seq->rack_timer, node, NULL,
hz, ng_l2tp_seq_rack_timeout, NULL, 0);
-
+
ns = seq->ns++;
-
+
mtx_unlock(&seq->mtx);
/* Copy packet */
@@ -1349,7 +1349,6 @@ ng_l2tp_seq_recv_nr(priv_p priv, u_int16_t nr)
* ACK had arrived separately.
*/
if (seq->cwnd < seq->wmax) {
-
/* Handle slow start phase */
if (seq->cwnd < seq->ssth) {
seq->cwnd += nack;
@@ -1522,7 +1521,6 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
/* If no mbuf passed, send an empty packet (ZLB) */
if (m == NULL) {
-
/* Create a new mbuf for ZLB packet */
MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
@@ -1533,7 +1531,6 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
m->m_pkthdr.rcvif = NULL;
priv->stats.xmitZLBs++;
} else {
-
/* Strip off session ID */
if (m->m_len < 2 && (m = m_pullup(m, 2)) == NULL) {
priv->stats.memoryFailures++;
diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c
index a51c024617e1..024bc47eb725 100644
--- a/sys/netgraph/ng_lmi.c
+++ b/sys/netgraph/ng_lmi.c
@@ -1077,4 +1077,3 @@ nglmi_disconnect(hook_p hook)
ng_rmnode_self(NG_HOOK_NODE(hook));
return (0);
}
-
diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h
index da531f0e7863..6b28c375f674 100644
--- a/sys/netgraph/ng_message.h
+++ b/sys/netgraph/ng_message.h
@@ -358,7 +358,6 @@ struct flow_manager {
{ NULL } \
}
-
/*
* For netgraph nodes that are somehow associated with file descriptors
* (e.g., a device that has a /dev entry and is also a netgraph node),
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index 4e2c42ffe4b2..35873ee46518 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -734,7 +734,6 @@ ng_mppc_decompress(node_p node, struct mbuf **datap)
}
#endif
} else {
-
/* Are we expecting encryption? */
if ((d->cfg.bits & MPPE_BITS) != 0) {
log(LOG_ERR, "%s: rec'd unexpectedly %s packet",
@@ -820,7 +819,7 @@ failed:
if (ina)
free(inbuf, M_NETGRAPH_MPPC);
outlen -= destCnt;
-
+
m_copyback(m, 0, outlen, (caddr_t)outbuf);
if (m->m_pkthdr.len < outlen) {
m_freem(m);
@@ -904,4 +903,3 @@ ng_mppc_updatekey(u_int32_t bits,
rc4_init(rc4, key, keylen);
}
#endif
-
diff --git a/sys/netgraph/ng_mppc.h b/sys/netgraph/ng_mppc.h
index b826806c277e..83bbdb8f5add 100644
--- a/sys/netgraph/ng_mppc.h
+++ b/sys/netgraph/ng_mppc.h
@@ -82,4 +82,3 @@ enum {
};
#endif /* _NETGRAPH_NG_MPPC_H_ */
-
diff --git a/sys/netgraph/ng_nat.c b/sys/netgraph/ng_nat.c
index 4b6039d33654..a5c776ef6db6 100644
--- a/sys/netgraph/ng_nat.c
+++ b/sys/netgraph/ng_nat.c
@@ -884,7 +884,7 @@ ng_nat_rcvdata(hook_p hook, item_p item )
th->th_sum = in_pseudo(ip->ip_src.s_addr,
ip->ip_dst.s_addr, htons(IPPROTO_TCP +
ip_len - (ip->ip_hl << 2)));
-
+
if ((m->m_pkthdr.csum_flags & CSUM_TCP) == 0) {
m->m_pkthdr.csum_data = offsetof(struct tcphdr,
th_sum);
@@ -946,7 +946,7 @@ static unsigned int
ng_nat_translate_flags(unsigned int x)
{
unsigned int res = 0;
-
+
if (x & NG_NAT_LOG)
res |= PKT_ALIAS_LOG;
if (x & NG_NAT_DENY_INCOMING)
diff --git a/sys/netgraph/ng_one2many.h b/sys/netgraph/ng_one2many.h
index 753221d8c1c0..a9cc24dfcb5e 100644
--- a/sys/netgraph/ng_one2many.h
+++ b/sys/netgraph/ng_one2many.h
@@ -111,4 +111,3 @@ enum {
};
#endif /* _NETGRAPH_NG_ONE2MANY_H_ */
-
diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c
index b08cecd102e9..8050edbba562 100644
--- a/sys/netgraph/ng_parse.c
+++ b/sys/netgraph/ng_parse.c
@@ -175,7 +175,6 @@ ng_parse_getDefault(const struct ng_parse_type *type, u_char *buf, int *buflen)
return (*func)(type, buf, buf, buflen);
}
-
/************************************************************************
STRUCTURE TYPE
************************************************************************/
@@ -1899,4 +1898,3 @@ ng_get_getAlign_method(const struct ng_parse_type *t)
t = t->supertype;
return (t ? t->getAlign : NULL);
}
-
diff --git a/sys/netgraph/ng_parse.h b/sys/netgraph/ng_parse.h
index c17feaf458e7..e1b6c399e8d2 100644
--- a/sys/netgraph/ng_parse.h
+++ b/sys/netgraph/ng_parse.h
@@ -109,7 +109,6 @@
ASCII value
-----------
-
{ ip=1.2.3.4 label="abc\n" alen=3 ary=[ 5 2=10 ] }
Note that omitted fields and array elements get their default
@@ -537,4 +536,3 @@ extern char *ng_get_string_token(const char *s, int *startp,
extern char *ng_encode_string(const char *s, int slen);
#endif /* _NETGRAPH_NG_PARSE_H_ */
-
diff --git a/sys/netgraph/ng_patch.c b/sys/netgraph/ng_patch.c
index 4982fd0e8073..3626cece7dc8 100644
--- a/sys/netgraph/ng_patch.c
+++ b/sys/netgraph/ng_patch.c
@@ -65,7 +65,6 @@ static ng_shutdown_t ng_patch_shutdown;
static ng_newhook_t ng_patch_newhook;
static ng_rcvdata_t ng_patch_rcvdata;
static ng_disconnect_t ng_patch_disconnect;
-
#define ERROUT(x) { error = (x); goto done; }
static int
@@ -578,7 +577,6 @@ ng_patch_rcvdata(hook_p hook, item_p item)
if (priv->conf && hook == priv->in &&
m && (m->m_flags & M_PKTHDR)) {
-
m = m_unshare(m, M_NOWAIT);
if (m == NULL)
diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c
index ad4767865d77..0812957b0109 100644
--- a/sys/netgraph/ng_pipe.c
+++ b/sys/netgraph/ng_pipe.c
@@ -40,7 +40,6 @@
* both directions can be set separately, except for delay.
*/
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/systm.h>
@@ -128,7 +127,6 @@ typedef struct node_priv *priv_p;
} else \
TAILQ_INSERT_TAIL(&hinfo->fifo_head, ngp_f, fifo_le); \
-
static void parse_cfg(struct ng_pipe_hookcfg *, struct ng_pipe_hookcfg *,
struct hookinfo *, priv_p);
static void pipe_dequeue(struct hookinfo *, struct timeval *);
@@ -717,7 +715,6 @@ ngp_rcvdata(hook_p hook, item_p item)
return (0);
}
-
/*
* Dequeueing sequence - we basically do the following:
* 1) Try to extract the frame from the inbound (bandwidth) queue;
@@ -932,7 +929,6 @@ ngp_shutdown(node_p node)
return (0);
}
-
/*
* Hook disconnection
*/
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 086d5481f725..eb639aa3d900 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -1446,7 +1446,7 @@ ng_ppp_rcvdata(hook_p hook, item_p item)
mtx_unlock(&priv->rmtx);
return (ng_ppp_bypass(node, item, proto, linkNum));
}
-
+
/* Other packets are denied on a disabled link. */
if (!link->conf.enableLink)
ERROUT(ENXIO);
@@ -1650,7 +1650,7 @@ ng_ppp_bump_mseq(node_p node, int32_t new_mseq)
{
const priv_p priv = NG_NODE_PRIVATE(node);
int i;
-
+
if (MP_RECV_SEQ_DIFF(priv, priv->mseq, new_mseq) < 0) {
priv->mseq = new_mseq;
for (i = 0; i < priv->numActiveLinks; i++) {
@@ -1863,7 +1863,7 @@ ng_ppp_frag_process(node_p node, item_p oitem)
}
/* Delete dead fragments and try again */
} while (ng_ppp_frag_trim(node) || ng_ppp_frag_drop(node));
-
+
/* If we haven't reused original item - free it. */
if (oitem) NG_FREE_ITEM(oitem);
@@ -1897,7 +1897,6 @@ ng_ppp_frag_checkstale(node_p node)
now.tv_sec = 0; /* uninitialized state */
while (1) {
-
/* If queue is empty, we're done */
if (TAILQ_EMPTY(&priv->frags))
break;
@@ -2004,7 +2003,7 @@ ng_ppp_mp_xmit(node_p node, item_p item, uint16_t proto)
NG_FREE_ITEM(item);
return (ENETDOWN);
}
-
+
/* Save length for later stats. */
plen = NGI_M(item)->m_pkthdr.len;
@@ -2077,7 +2076,7 @@ deliver:
frags += (distrib[activeLinkNum] + link->conf.mru - hdr_len - 1) /
(link->conf.mru - hdr_len);
}
-
+
/* Get out initial sequence number */
seq = priv->xseq;
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c
index b15208217281..70f893498420 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -306,8 +306,6 @@ static int pppoe_send_event(sessp sp, enum cmd cmdid);
* Author: Michal Ostrowski <mostrows@styx.uwaterloo.ca> *
************************************************************************/
-
-
/*
* Return the location where the next tag can be put
*/
@@ -2184,7 +2182,7 @@ scan_tags(sessp sp, const struct pppoe_hdr* ph)
}
return NULL;
}
-
+
static int
pppoe_send_event(sessp sp, enum cmd cmdid)
{
diff --git a/sys/netgraph/ng_pppoe.h b/sys/netgraph/ng_pppoe.h
index 43ac36fc85c7..2718ae55629c 100644
--- a/sys/netgraph/ng_pppoe.h
+++ b/sys/netgraph/ng_pppoe.h
@@ -240,7 +240,6 @@ struct pppoe_hdr{
u_int16_t length;
}__packed;
-
struct pppoe_full_hdr {
struct ether_header eh;
struct pppoe_hdr ph;
@@ -285,4 +284,3 @@ struct maxptag {
/* for PADT */
#endif /* _NETGRAPH_NG_PPPOE_H_ */
-
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c
index 01620bd007dd..4c3ccebd560f 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -385,7 +385,7 @@ ng_pptpgre_newhook(node_p node, hook_p hook, const char *name)
hpriv = malloc(sizeof(*hpriv), M_NETGRAPH, M_NOWAIT | M_ZERO);
if (hpriv == NULL)
return (ENOMEM);
-
+
/* Initialize state */
mtx_init(&hpriv->mtx, "ng_pptp", NULL, MTX_DEF);
ng_callout_init(&hpriv->sackTimer);
@@ -600,7 +600,6 @@ ng_pptpgre_xmit(hpriv_p hpriv, item_p item)
}
/* Check if there's data */
if (m != NULL) {
-
/* Check if windowing is enabled */
if (hpriv->conf.enableWindowing) {
/* Is our transmit window full? */
diff --git a/sys/netgraph/ng_pred1.c b/sys/netgraph/ng_pred1.c
index 5598ae9d7c0f..80f75992dd79 100644
--- a/sys/netgraph/ng_pred1.c
+++ b/sys/netgraph/ng_pred1.c
@@ -714,4 +714,3 @@ static const uint16_t Crc16Table[256] = {
/* f0 */ 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
/* f8 */ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
};
-
diff --git a/sys/netgraph/ng_pred1.h b/sys/netgraph/ng_pred1.h
index 3d1f8fb243d3..19687673851a 100644
--- a/sys/netgraph/ng_pred1.h
+++ b/sys/netgraph/ng_pred1.h
@@ -82,4 +82,3 @@ enum {
};
#endif /* _NETGRAPH_NG_PRED1_H_ */
-
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index 061faa29fdef..32603593b496 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -486,4 +486,3 @@ ng_rfc1490_disconnect(hook_p hook)
panic("%s", __func__);
return (0);
}
-
diff --git a/sys/netgraph/ng_sample.c b/sys/netgraph/ng_sample.c
index 8fa66229fb4d..ae239c5286df 100644
--- a/sys/netgraph/ng_sample.c
+++ b/sys/netgraph/ng_sample.c
@@ -393,7 +393,7 @@ devintr()
/* get packet from device and send on */
m = MGET(blah blah)
-
+
NG_SEND_DATA_ONLY(error, xxxp->upstream_hook.hook, m);
/* see note above in xxx_rcvdata() */
/* and ng_xxx_connect() */
@@ -493,4 +493,3 @@ ng_xxx_disconnect(hook_p hook)
ng_rmnode_self(NG_HOOK_NODE(hook));
return (0);
}
-
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index 533b3aafcefa..421f11bc1fdc 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -988,7 +988,7 @@ ngs_rcvmsg(node_p node, item_p item, hook_p lasthook)
return (ENOBUFS);
}
sorwakeup_locked(so);
-
+
return (error);
}
@@ -1214,4 +1214,3 @@ SYSCTL_INT(_net_graph_data, OID_AUTO, proto, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, NG
static SYSCTL_NODE(_net_graph, OID_AUTO, control, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"CONTROL");
SYSCTL_INT(_net_graph_control, OID_AUTO, proto, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, NG_CONTROL, "");
-
diff --git a/sys/netgraph/ng_socket.h b/sys/netgraph/ng_socket.h
index b7e831018abb..52886664af14 100644
--- a/sys/netgraph/ng_socket.h
+++ b/sys/netgraph/ng_socket.h
@@ -66,4 +66,3 @@ struct sockaddr_ng {
};
#endif /* _NETGRAPH_NG_SOCKET_H_ */
-
diff --git a/sys/netgraph/ng_split.c b/sys/netgraph/ng_split.c
index a2260ecfcf95..9583ec71465e 100644
--- a/sys/netgraph/ng_split.c
+++ b/sys/netgraph/ng_split.c
@@ -166,7 +166,7 @@ static int
ng_split_disconnect(hook_p hook)
{
hook_p *localhook = NG_HOOK_PRIVATE(hook);
-
+
KASSERT(localhook != NULL, ("%s: null info", __func__));
*localhook = NULL;
if ((NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0)
diff --git a/sys/netgraph/ng_split.h b/sys/netgraph/ng_split.h
index a88fc20f5132..d0d05e7c4eee 100644
--- a/sys/netgraph/ng_split.h
+++ b/sys/netgraph/ng_split.h
@@ -30,7 +30,6 @@
*
*/
-
#ifndef _NETGRAPH_NG_SPLIT_H_
#define _NETGRAPH_NG_SPLIT_H_
diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c
index 95e9a60f56f9..78e205e0d715 100644
--- a/sys/netgraph/ng_sppp.c
+++ b/sys/netgraph/ng_sppp.c
@@ -196,7 +196,7 @@ ng_sppp_start (struct ifnet *ifp)
struct mbuf *m;
int len, error = 0;
priv_p priv = ifp->if_softc;
-
+
/* Check interface flags */
/*
* This has side effects. It is not good idea to stop sending if we
@@ -207,7 +207,7 @@ ng_sppp_start (struct ifnet *ifp)
/* (ifp->if_drv_flags & IFF_DRV_RUNNING))) { */
/* return;*/
/* }*/
-
+
if (ifp->if_drv_flags & IFF_DRV_OACTIVE)
return;
@@ -295,13 +295,13 @@ ng_sppp_newhook (node_p node, hook_p hook, const char *name)
if (strcmp (name, NG_SPPP_HOOK_DOWNSTREAM) != 0)
return (EINVAL);
-
+
if (priv->hook)
return (EISCONN);
priv->hook = hook;
NG_HOOK_SET_PRIVATE (hook, priv);
-
+
return (0);
}
diff --git a/sys/netgraph/ng_tag.c b/sys/netgraph/ng_tag.c
index 9222d3bd3b20..364a0bd83dc0 100644
--- a/sys/netgraph/ng_tag.c
+++ b/sys/netgraph/ng_tag.c
@@ -545,7 +545,7 @@ ng_tag_rcvdata(hook_p hook, item_p item)
tag = m_tag_locate(m, cookie, type, tag);
}
}
-
+
/* See if we got a match and find destination hook. */
if (found) {
#ifdef NG_TAG_DEBUG
@@ -569,11 +569,11 @@ ng_tag_rcvdata(hook_p hook, item_p item)
dhip->stats.xmitOctets += totlen;
dhip->stats.xmitFrames++;
#endif
-
+
cookie = dhip->out_tag_cookie;
type = dhip->out_tag_id;
tag_len = dhip->out_tag_len;
-
+
if ((cookie != 0) || (type != 0)) {
tag = m_tag_alloc(cookie, type, tag_len, M_NOWAIT);
/* XXX may be free the mbuf if tag allocation failed? */
@@ -586,7 +586,7 @@ ng_tag_rcvdata(hook_p hook, item_p item)
m_tag_prepend(m, tag);
}
}
-
+
NG_FWD_ITEM_HOOK(error, item, dest);
return (error);
}
@@ -717,4 +717,3 @@ ng_tag_setdata_out(hook_p hook, const struct ng_tag_hookout *hp0)
hip->out_tag_data = (void*)(hip->out->tag_data);
return (0);
}
-
diff --git a/sys/netgraph/ng_tcpmss.c b/sys/netgraph/ng_tcpmss.c
index 5378332f3313..a79253309c39 100644
--- a/sys/netgraph/ng_tcpmss.c
+++ b/sys/netgraph/ng_tcpmss.c
@@ -142,7 +142,6 @@ static struct ng_type ng_tcpmss_typestruct = {
};
NETGRAPH_INIT(tcpmss, &ng_tcpmss_typestruct);
-
#define ERROUT(x) { error = (x); goto done; }
/*
@@ -329,7 +328,7 @@ ng_tcpmss_rcvdata(hook_p hook, item_p item)
/* Check SYN packet and has options. */
if (!(tcp->th_flags & TH_SYN) || tcphlen == sizeof(struct tcphdr))
goto send;
-
+
/* Update SYN stats. */
priv->stats.SYNPkts++;
diff --git a/sys/netgraph/ng_tcpmss.h b/sys/netgraph/ng_tcpmss.h
index c4c61c7d4e48..f73e269d2040 100644
--- a/sys/netgraph/ng_tcpmss.h
+++ b/sys/netgraph/ng_tcpmss.h
@@ -57,7 +57,6 @@ struct ng_tcpmss_hookstat {
{ NULL } \
}
-
/* Structure for NGM_TCPMSS_CONFIG. */
struct ng_tcpmss_config {
char inHook[NG_HOOKSIZ];
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 6dcd262a47e2..fb1e06ff0f2b 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -507,4 +507,3 @@ ngt_rint_poll(struct tty *tp)
/* We can always accept input */
return (1);
}
-
diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c
index 1d8d3a942b8b..11bd328fc8b2 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -611,4 +611,3 @@ ng_vjc_pulluphdrs(struct mbuf *m, int knownTCP)
m = m_pullup(m, ihlen + thlen);
return (m);
}
-
diff --git a/sys/netgraph/ng_vlan.c b/sys/netgraph/ng_vlan.c
index 456f531b1224..ce70d4ec1e46 100644
--- a/sys/netgraph/ng_vlan.c
+++ b/sys/netgraph/ng_vlan.c
@@ -194,7 +194,6 @@ static struct ng_type ng_vlan_typestruct = {
};
NETGRAPH_INIT(vlan, &ng_vlan_typestruct);
-
/*
* Helper functions.
*/
@@ -214,7 +213,6 @@ m_chk(struct mbuf **mp, int len)
return (0);
}
-
/*
* Netgraph node functions.
*/
@@ -524,7 +522,6 @@ ng_vlan_rcvdata(hook_p hook, item_p item)
struct mbuf *m;
hook_p dst_hook;
-
NGI_GET_M(item, m);
/* Make sure we have an entire header. */
diff --git a/sys/netgraph/ng_vlan.h b/sys/netgraph/ng_vlan.h
index 5cc580ad5778..fd7442e680c6 100644
--- a/sys/netgraph/ng_vlan.h
+++ b/sys/netgraph/ng_vlan.h
@@ -93,7 +93,6 @@ struct ng_vlan_filter {
}
#endif
-
/* Structure returned by NGM_VLAN_GET_TABLE. */
struct ng_vlan_table {
u_int32_t n;