Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6] / net / irda / irlap_frame.c

diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index 1b7e2490e2e18c17fad9e9871ca1f260448f7c62..25a3444a9234f1faba7ba2e2e88b18e452d1f44f 100644 (file)
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -94,12 +94,20 @@ void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb)
        /* Some common init stuff */
        skb->dev = self->netdev;
        skb_reset_mac_header(skb);
-       skb->h.raw = skb->nh.raw = skb->data;
+       skb_reset_network_header(skb);
+       skb_reset_transport_header(skb);
        skb->protocol = htons(ETH_P_IRDA);
        skb->priority = TC_PRIO_BESTEFFORT;
 
        irlap_insert_info(self, skb);
 
+       if (unlikely(self->mode & IRDA_MODE_MONITOR)) {
+               IRDA_DEBUG(3, "%s(): %s is in monitor mode\n", __FUNCTION__,
+                          self->netdev->name);
+               dev_kfree_skb(skb);
+               return;
+       }
+
        dev_queue_xmit(skb);
 }
 
@@ -412,7 +420,7 @@ static void irlap_recv_discovery_xid_rsp(struct irlap_cb *self,
        IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
 
        if (!pskb_may_pull(skb, sizeof(struct xid_frame))) {
-               IRDA_ERROR("%s: frame to short!\n", __FUNCTION__);
+               IRDA_ERROR("%s: frame too short!\n", __FUNCTION__);
                return;
        }
 
@@ -483,7 +491,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self,
        char *text;
 
        if (!pskb_may_pull(skb, sizeof(struct xid_frame))) {
-               IRDA_ERROR("%s: frame to short!\n", __FUNCTION__);
+               IRDA_ERROR("%s: frame too short!\n", __FUNCTION__);
                return;
        }
 
@@ -527,7 +535,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self,
                /* Check if things are sane at this point... */
                if((discovery_info == NULL) ||
                   !pskb_may_pull(skb, 3)) {
-                       IRDA_ERROR("%s: discovery frame to short!\n",
+                       IRDA_ERROR("%s: discovery frame too short!\n",
                                   __FUNCTION__);
                        return;
                }
@@ -797,16 +805,19 @@ void irlap_send_data_primary_poll(struct irlap_cb *self, struct sk_buff *skb)
                self->vs = (self->vs + 1) % 8;
                self->ack_required = FALSE;
 
+               irlap_next_state(self, LAP_NRM_P);
                irlap_send_i_frame(self, tx_skb, CMD_FRAME);
        } else {
                IRDA_DEBUG(4, "%s(), sending unreliable frame\n", __FUNCTION__);
 
                if (self->ack_required) {
                        irlap_send_ui_frame(self, skb_get(skb), self->caddr, CMD_FRAME);
+                       irlap_next_state(self, LAP_NRM_P);
                        irlap_send_rr_frame(self, CMD_FRAME);
                        self->ack_required = FALSE;
                } else {
                        skb->data[1] |= PF_BIT;
+                       irlap_next_state(self, LAP_NRM_P);
                        irlap_send_ui_frame(self, skb_get(skb), self->caddr, CMD_FRAME);
                }
        }
@@ -1172,7 +1183,7 @@ static void irlap_recv_frmr_frame(struct irlap_cb *self, struct sk_buff *skb,
        IRDA_ASSERT(info != NULL, return;);
 
        if (!pskb_may_pull(skb, 4)) {
-               IRDA_ERROR("%s: frame to short!\n", __FUNCTION__);
+               IRDA_ERROR("%s: frame too short!\n", __FUNCTION__);
                return;
        }
 
@@ -1261,7 +1272,7 @@ static void irlap_recv_test_frame(struct irlap_cb *self, struct sk_buff *skb,
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
 
        if (!pskb_may_pull(skb, sizeof(*frame))) {
-               IRDA_ERROR("%s: frame to short!\n", __FUNCTION__);
+               IRDA_ERROR("%s: frame too short!\n", __FUNCTION__);
                return;
        }
        frame = (struct test_frame *) skb->data;
@@ -1269,7 +1280,7 @@ static void irlap_recv_test_frame(struct irlap_cb *self, struct sk_buff *skb,
        /* Broadcast frames must carry saddr and daddr fields */
        if (info->caddr == CBROADCAST) {
                if (skb->len < sizeof(struct test_frame)) {
-                       IRDA_DEBUG(0, "%s() test frame to short!\n",
+                       IRDA_DEBUG(0, "%s() test frame too short!\n",
                                   __FUNCTION__);
                        return;
                }
@@ -1335,7 +1346,7 @@ int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
 
        /* Check if frame is large enough for parsing */
        if (!pskb_may_pull(skb, 2)) {
-               IRDA_ERROR("%s: frame to short!\n", __FUNCTION__);
+               IRDA_ERROR("%s: frame too short!\n", __FUNCTION__);
                dev_kfree_skb(skb);
                return -1;
        }