Commit 8e8bcf16 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

strip: Fix up strip for the new order 



- Use the tty baud functions
- Call driver termios methods directly holding the right locking
- Check for a write method

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f34d7a5b

drivers/net/wireless/strip.c

+24 −42
Original line number Diff line number Diff line
@@ -767,42 +767,18 @@ static __u8 *UnStuffData(__u8 * src, __u8 * end, __u8 * dst, 
/************************************************************************/

/* General routines for STRIP						*/



/*

 * get_baud returns the current baud rate, as one of the constants defined in

 * termbits.h

 * If the user has issued a baud rate override using the 'setserial' command

 * and the logical current rate is set to 38.4, then the true baud rate

 * currently in effect (57.6 or 115.2) is returned.

 */

static unsigned int get_baud(struct tty_struct *tty)

{

	if (!tty || !tty->termios)

		return (0);

	if ((tty->termios->c_cflag & CBAUD) == B38400 && tty->driver_data) {

		struct async_struct *info =

		    (struct async_struct *) tty->driver_data;

		if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)

			return (B57600);

		if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)

			return (B115200);

	}

	return (tty->termios->c_cflag & CBAUD);

}



/*

 * set_baud sets the baud rate to the rate defined by baudcode

 * Note: The rate B38400 should be avoided, because the user may have

 * issued a 'setserial' speed override to map that to a different speed.

 * We could achieve a true rate of 38400 if we needed to by cancelling

 * any user speed override that is in place, but that might annoy the

 * user, so it is simplest to just avoid using 38400.

 */

static void set_baud(struct tty_struct *tty, unsigned int baudcode)

static void set_baud(struct tty_struct *tty, speed_t baudrate)

{

	struct ktermios old_termios = *(tty->termios);

	tty->termios->c_cflag &= ~CBAUD;	/* Clear the old baud setting */

	tty->termios->c_cflag |= baudcode;	/* Set the new baud setting */

	tty->driver->set_termios(tty, &old_termios);

	struct ktermios old_termios;



	mutex_lock(&tty->termios_mutex);

	old_termios =*(tty->termios);

	tty_encode_baud_rate(tty, baudrate, baudrate);

	tty->ops->set_termios(tty, &old_termios);

	mutex_unlock(&tty->termios_mutex);

}



/*
@@ -1217,7 +1193,7 @@ static void ResetRadio(struct strip *strip_info) 
	strip_info->watchdog_doreset = jiffies + 1 * HZ;



	/* If the user has selected a baud rate above 38.4 see what magic we have to do */

	if (strip_info->user_baud > B38400) {

	if (strip_info->user_baud > 38400) {

		/*

		 * Subtle stuff: Pay attention :-)

		 * If the serial port is currently at the user's selected (>38.4) rate,
@@ -1227,17 +1203,17 @@ static void ResetRadio(struct strip *strip_info) 
		 * issued the ATS304 command last time through, so this time we restore

		 * the user's selected rate and issue the normal starmode reset string.

		 */

		if (strip_info->user_baud == get_baud(tty)) {

		if (strip_info->user_baud == tty_get_baud_rate(tty)) {

			static const char b0[] = "ate0q1s304=57600\r";

			static const char b1[] = "ate0q1s304=115200\r";

			static const StringDescriptor baudstring[2] =

			    { {b0, sizeof(b0) - 1}

			, {b1, sizeof(b1) - 1}

			};

			set_baud(tty, B19200);

			if (strip_info->user_baud == B57600)

			set_baud(tty, 19200);

			if (strip_info->user_baud == 57600)

				s = baudstring[0];

			else if (strip_info->user_baud == B115200)

			else if (strip_info->user_baud == 115200)

				s = baudstring[1];

			else

				s = baudstring[1];	/* For now */
@@ -1245,7 +1221,7 @@ static void ResetRadio(struct strip *strip_info) 
			set_baud(tty, strip_info->user_baud);

	}



	tty->driver->write(tty, s.string, s.length);

	tty->ops->write(tty, s.string, s.length);

#ifdef EXT_COUNTERS

	strip_info->tx_ebytes += s.length;

#endif
@@ -1267,7 +1243,7 @@ static void strip_write_some_more(struct tty_struct *tty) 


	if (strip_info->tx_left > 0) {

		int num_written =

		    tty->driver->write(tty, strip_info->tx_head,

		    tty->ops->write(tty, strip_info->tx_head,

				      strip_info->tx_left);

		strip_info->tx_left -= num_written;

		strip_info->tx_head += num_written;
@@ -2457,7 +2433,7 @@ static int strip_open_low(struct net_device *dev) 
	strip_info->working = FALSE;

	strip_info->firmware_level = NoStructure;

	strip_info->next_command = CompatibilityCommand;

	strip_info->user_baud = get_baud(strip_info->tty);

	strip_info->user_baud = tty_get_baud_rate(strip_info->tty);



	printk(KERN_INFO "%s: Initializing Radio.\n",

	       strip_info->dev->name);
@@ -2631,6 +2607,13 @@ static int strip_open(struct tty_struct *tty) 
	if (strip_info && strip_info->magic == STRIP_MAGIC)

		return -EEXIST;



	/*

	 * We need a write method.

	 */



	if (tty->ops->write == NULL)

		return -EOPNOTSUPP;



	/*

	 * OK.  Find a free STRIP channel to use.

	 */
@@ -2652,8 +2635,7 @@ static int strip_open(struct tty_struct *tty) 
	tty->disc_data = strip_info;

	tty->receive_room = 65536;



	if (tty->driver->flush_buffer)

		tty->driver->flush_buffer(tty);

	tty_driver_flush_buffer(tty);



	/*

	 * Restore default settings

CRA Git | Maintained and supported by SUSTech CRA and CCSE