Pull osi into release branch

[linux-2.6-omap-h63xx.git] / net / irda / ircomm / ircomm_param.c

diff --git a/net/irda/ircomm/ircomm_param.c b/net/irda/ircomm/ircomm_param.c
index fbac13e95b28826223f7470a823c50cd8b3f7668..e5e4792a0314d8e1d21652abf61d29d977c336fb 100644 (file)
--- a/net/irda/ircomm/ircomm_param.c
+++ b/net/irda/ircomm/ircomm_param.c
@@ -28,7 +28,6 @@
  *
  ********************************************************************/
 
-#include <linux/sched.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 
@@ -134,8 +133,8 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
         * Inserting is a little bit tricky since we don't know how much
         * room we will need. But this should hopefully work OK
         */
-       count = irda_param_insert(self, pi, skb->tail, skb_tailroom(skb),
-                                 &ircomm_param_info);
+       count = irda_param_insert(self, pi, skb_tail_pointer(skb),
+                                 skb_tailroom(skb), &ircomm_param_info);
        if (count < 0) {
                IRDA_WARNING("%s(), no room for parameter!\n", __FUNCTION__);
                spin_unlock_irqrestore(&self->spinlock, flags);