2 files changed, 2 insertions, 12 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 90999867a32c..102c1f0b90da 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -456,11 +456,6 @@ out:
 
 /* ----------------------------------------------------------------------- */
 
-static int sixpack_receive_room(struct tty_struct *tty)
-{
-        return 65536;  /* We can handle an infinite amount of data. :-) */
-}
-
 /*
  * Handle the 'receiver data ready' interrupt.
  * This function is called by the 'tty_io' module in the kernel when
@@ -671,6 +666,7 @@ static int sixpack_open(struct tty_struct *tty)
 
         /* Done.  We have linked the TTY line to a channel. */
         tty->disc_data = sp;
+        tty->receive_room = 65536;
 
         /* Now we're ready to register. */
         if (register_netdev(dev))
@@ -802,7 +798,6 @@ static struct tty_ldisc sp_ldisc = {
         .close          = sixpack_close,
         .ioctl          = sixpack_ioctl,
         .receive_buf    = sixpack_receive_buf,
-        .receive_room   = sixpack_receive_room,
         .write_wakeup   = sixpack_write_wakeup,
 };
 
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index f4424cf886c5..dc5e9d59deed 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -753,6 +753,7 @@ static int mkiss_open(struct tty_struct *tty)
 
         ax->tty = tty;
         tty->disc_data = ax;
+        tty->receive_room = 65535;
 
         if (tty->driver->flush_buffer)
                 tty->driver->flush_buffer(tty);
@@ -940,11 +941,6 @@ static void mkiss_receive_buf(struct tty_struct *tty, const unsigned char *cp,
                 tty->driver->unthrottle(tty);
 }
 
-static int mkiss_receive_room(struct tty_struct *tty)
-{
-        return 65536;  /* We can handle an infinite amount of data. :-) */
-}
-
 /*
  * Called by the driver when there's room for more data.  If we have
  * more packets to send, we send them here.
@@ -983,7 +979,6 @@ static struct tty_ldisc ax_ldisc = {
         .close          = mkiss_close,
         .ioctl          = mkiss_ioctl,
         .receive_buf    = mkiss_receive_buf,
-        .receive_room   = mkiss_receive_room,
         .write_wakeup   = mkiss_write_wakeup
 };