From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Jul 2008 00:43:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db6d8c7a4027b48d797b369a53f8470aaeed7063;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (1232 commits)
  iucv: Fix bad merging.
  net_sched: Add size table for qdiscs
  net_sched: Add accessor function for packet length for qdiscs
  net_sched: Add qdisc_enqueue wrapper
  highmem: Export totalhigh_pages.
  ipv6 mcast: Omit redundant address family checks in ip6_mc_source().
  net: Use standard structures for generic socket address structures.
  ipv6 netns: Make several "global" sysctl variables namespace aware.
  netns: Use net_eq() to compare net-namespaces for optimization.
  ipv6: remove unused macros from net/ipv6.h
  ipv6: remove unused parameter from ip6_ra_control
  tcp: fix kernel panic with listening_get_next
  tcp: Remove redundant checks when setting eff_sacks
  tcp: options clean up
  tcp: Fix MD5 signatures for non-linear skbs
  sctp: Update sctp global memory limit allocations.
  sctp: remove unnecessary byteshifting, calculate directly in big-endian
  sctp: Allow only 1 listening socket with SO_REUSEADDR
  sctp: Do not leak memory on multiple listen() calls
  sctp: Support ipv6only AF_INET6 sockets.
  ...
---

db6d8c7a4027b48d797b369a53f8470aaeed7063
diff --cc net/bluetooth/rfcomm/tty.c
index 0a387f2eb7,5d163571d3..d3340dd52b
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@@ -617,9 -643,40 +643,33 @@@ static void rfcomm_tty_wakeup(unsigned 
  		return;
  
  	BT_DBG("dev %p tty %p", dev, tty);
 -
 -	if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && tty->ldisc.write_wakeup)
 -		(tty->ldisc.write_wakeup)(tty);
 -
 -	wake_up_interruptible(&tty->write_wait);
 -#ifdef SERIAL_HAVE_POLL_WAIT
 -	wake_up_interruptible(&tty->poll_wait);
 -#endif
 +	tty_wakeup(tty);
  }
  
+ static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev)
+ {
+ 	struct tty_struct *tty = dev->tty;
+ 	struct sk_buff *skb;
+ 	int inserted = 0;
+ 
+ 	if (!tty)
+ 		return;
+ 
+ 	BT_DBG("dev %p tty %p", dev, tty);
+ 
+ 	rfcomm_dlc_lock(dev->dlc);
+ 
+ 	while ((skb = skb_dequeue(&dev->pending))) {
+ 		inserted += tty_insert_flip_string(tty, skb->data, skb->len);
+ 		kfree_skb(skb);
+ 	}
+ 
+ 	rfcomm_dlc_unlock(dev->dlc);
+ 
+ 	if (inserted > 0)
+ 		tty_flip_buffer_push(tty);
+ }
+ 
  static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
  {
  	DECLARE_WAITQUEUE(wait, current);