2010/1/5 Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>:
> See upstream kernel.org commit ebd2c8f6d2ec4012c267ecb95e72a57b8355a705
> where things are relocated into uart_state
Thanks, Paul.
I've updated agrsm048 code to reflect this change and also the further
moving of delta_msr_wait.
Marv, the attached patch compiles up to 2.6.32.2, but I don't have the
modem in that machine, so it's untested.
--
Joshua Crawford ... http://geocities.com/mortarn
http://www.rewardscentral.com.au/Join/Default.aspx?refer=mortarn
Be rewarded! Join RewardsCentral today!
diff -upPr agrsm048pci-2.1.60-orig/serial26.c agrsm048pci-2.1.60/serial26.c
--- agrsm048pci-2.1.60-orig/serial26.c 2009-04-19 10:43:47.000000000 +1000
+++ agrsm048pci-2.1.60/serial26.c 2010-01-07 01:05:13.000000000 +1100
@@ -1004,7 +1004,11 @@ static void serial8250_enable_ms(struct
static _INLINE_ void
receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 31)
struct tty_struct *tty = up->port.info->port.tty;
+#else
+ struct tty_struct *tty = up->port.state->port.tty;
+#endif
unsigned char ch, lsr = *status;
int max_count = 256;
char flag;
@@ -1072,7 +1076,11 @@ receive_chars(struct uart_8250_port *up,
static _INLINE_ void transmit_chars(struct uart_8250_port *up)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 31)
struct circ_buf *xmit = &up->port.info->xmit;
+#else
+ struct circ_buf *xmit = &up->port.state->xmit;
+#endif
int count;
if (up->port.x_char) {
@@ -1122,7 +1130,11 @@ static _INLINE_ void check_modem_status(
if (status & UART_MSR_DCTS)
uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 31)
wake_up_interruptible(&up->port.info->delta_msr_wait);
+#else
+ wake_up_interruptible(&up->port.state->port.delta_msr_wait);
+#endif
}
/*
