projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
n_gsm.c
diff --git
a/drivers/tty/n_gsm.c
b/drivers/tty/n_gsm.c
index 77623b936538bca5d6af049dc649f3ee9e74a863..a4c42a75a3bfea0f0143e8dd70454fde5dddf524 100644
(file)
--- a/
drivers/tty/n_gsm.c
+++ b/
drivers/tty/n_gsm.c
@@
-526,19
+526,6
@@
static int gsm_stuff_frame(const u8 *input, u8 *output, int len)
return olen;
}
return olen;
}
-static void hex_packet(const unsigned char *p, int len)
-{
- int i;
- for (i = 0; i < len; i++) {
- if (i && (i % 16) == 0) {
- pr_cont("\n");
- pr_debug("");
- }
- pr_cont("%02X ", *p++);
- }
- pr_cont("\n");
-}
-
/**
* gsm_send - send a control frame
* @gsm: our GSM mux
/**
* gsm_send - send a control frame
* @gsm: our GSM mux
@@
-685,10
+672,10
@@
static void gsm_data_kick(struct gsm_mux *gsm)
len = msg->len + 2;
}
len = msg->len + 2;
}
- if (debug & 4)
{
- pr
_debug("gsm_data_kick:\n");
- hex_packet(gsm->txframe, len);
- }
+ if (debug & 4)
+ pr
int_hex_dump_bytes("gsm_data_kick: ",
+ DUMP_PREFIX_OFFSET,
+ gsm->txframe, len);
if (gsm->output(gsm, gsm->txframe + skip_sof,
len - skip_sof) < 0)
if (gsm->output(gsm, gsm->txframe + skip_sof,
len - skip_sof) < 0)
@@
-2095,10
+2082,9
@@
static int gsmld_output(struct gsm_mux *gsm, u8 *data, int len)
set_bit(TTY_DO_WRITE_WAKEUP, &gsm->tty->flags);
return -ENOSPC;
}
set_bit(TTY_DO_WRITE_WAKEUP, &gsm->tty->flags);
return -ENOSPC;
}
- if (debug & 4) {
- pr_debug("-->%d bytes out\n", len);
- hex_packet(data, len);
- }
+ if (debug & 4)
+ print_hex_dump_bytes("gsmld_output: ", DUMP_PREFIX_OFFSET,
+ data, len);
gsm->tty->ops->write(gsm->tty, data, len);
return len;
}
gsm->tty->ops->write(gsm->tty, data, len);
return len;
}
@@
-2142,8
+2128,8
@@
static void gsmld_detach_gsm(struct tty_struct *tty, struct gsm_mux *gsm)
gsm->tty = NULL;
}
gsm->tty = NULL;
}
-static
void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp
,
-
char *fp, int count)
+static
unsigned int gsmld_receive_buf(struct tty_struct *tty
,
+
const unsigned char *cp,
char *fp, int count)
{
struct gsm_mux *gsm = tty->disc_data;
const unsigned char *dp;
{
struct gsm_mux *gsm = tty->disc_data;
const unsigned char *dp;
@@
-2152,10
+2138,9
@@
static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
char buf[64];
char flags;
char buf[64];
char flags;
- if (debug & 4) {
- pr_debug("Inbytes %dd\n", count);
- hex_packet(cp, count);
- }
+ if (debug & 4)
+ print_hex_dump_bytes("gsmld_receive: ", DUMP_PREFIX_OFFSET,
+ cp, count);
for (i = count, dp = cp, f = fp; i; i--, dp++) {
flags = *f++;
for (i = count, dp = cp, f = fp; i; i--, dp++) {
flags = *f++;
@@
-2177,6
+2162,8
@@
static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
}
/* FASYNC if needed ? */
/* If clogged call tty_throttle(tty); */
}
/* FASYNC if needed ? */
/* If clogged call tty_throttle(tty); */
+
+ return count;
}
/**
}
/**