- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / irda / via-ircc.c

diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index a5ca71c..fddb4ef 100644 (file)
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -1185,8 +1185,8 @@ F01_E */
                 * if frame size,data ptr,or skb ptr are wrong ,the get next
                 * entry.
                 */
-               if ((skb == NULL) || (skb->data == NULL)
-                   || (self->rx_buff.data == NULL) || (len < 6)) {
+               if ((skb == NULL) || (skb->data == NULL) ||
+                   (self->rx_buff.data == NULL) || (len < 6)) {
                        self->netdev->stats.rx_dropped++;
                        return TRUE;
                }
@@ -1284,8 +1284,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
                self->RetryCount++;
 
        if ((self->RetryCount >= 1) ||
-           ((st_fifo->pending_bytes + 2048) > self->rx_buff.truesize)
-           || (st_fifo->len >= (MAX_RX_WINDOW))) {
+           ((st_fifo->pending_bytes + 2048) > self->rx_buff.truesize) ||
+           (st_fifo->len >= (MAX_RX_WINDOW))) {
                while (st_fifo->len > 0) {      //upload frame
                        // Put this entry back in fifo 
                        if (st_fifo->head > MAX_RX_WINDOW)
@@ -1300,8 +1300,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
                         * if frame size, data ptr, or skb ptr are wrong,
                         * then get next entry.
                         */
-                       if ((skb == NULL) || (skb->data == NULL)
-                           || (self->rx_buff.data == NULL) || (len < 6)) {
+                       if ((skb == NULL) || (skb->data == NULL) ||
+                           (self->rx_buff.data == NULL) || (len < 6)) {
                                self->netdev->stats.rx_dropped++;
                                continue;
                        }
@@ -1332,8 +1332,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
                 * if frame is receive complete at this routine ,then upload
                 * frame.
                 */
-               if ((GetRXStatus(iobase) & 0x10)
-                   && (RxCurCount(iobase, self) != self->RxLastCount)) {
+               if ((GetRXStatus(iobase) & 0x10) &&
+                   (RxCurCount(iobase, self) != self->RxLastCount)) {
                        upload_rxdata(self, iobase);
                        if (irda_device_txqueue_empty(self->netdev))
                                via_ircc_dma_receive(self);