Merge branch 'tty-splice' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds...

[sfrench/cifs-2.6.git] / drivers / tty / n_gsm.c

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index fea1eeac5b907fc9856f84d6d32a3f2ef100f83c..51dafc06f5414d9e59f2b68400715b5b8afdbc88 100644 (file)
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -74,7 +74,7 @@ module_param(debug, int, 0600);
 #define MAX_MTU 1500
 #define        GSM_NET_TX_TIMEOUT (HZ*10)
 
-/**
+/*
  *     struct gsm_mux_net      -       network interface
  *
  *     Created when net interface is initialized.
@@ -651,6 +651,7 @@ static struct gsm_msg *gsm_data_alloc(struct gsm_mux *gsm, u8 addr, int len,
 /**
  *     gsm_data_kick           -       poke the queue
  *     @gsm: GSM Mux
+ *     @dlci: DLCI sending the data
  *
  *     The tty device has called us to indicate that room has appeared in
  *     the transmit queue. Ram more data into the pipe if we have any
@@ -1005,6 +1006,7 @@ static void gsm_control_reply(struct gsm_mux *gsm, int cmd, const u8 *data,
  *     @tty: virtual tty bound to the DLCI
  *     @dlci: DLCI to affect
  *     @modem: modem bits (full EA)
+ *     @clen: command length
  *
  *     Used when a modem control message or line state inline in adaption
  *     layer 2 is processed. Sort out the local modem state and throttles