Changeset 11383

Timestamp:

01/11/09 18:10:15 (4 years ago)

Author:

BrainSlayer

Message:

alignment fix

Location:

src/linux/rt2880/linux-2.6.23/net

Files:

• core/dev.c (modified) (1 diff)
• ipv4/tcp_output.c (modified) (1 diff)

src/linux/rt2880/linux-2.6.23/net/core/dev.c

@@ -1795 +1795 @@
 #endif          
 
+#ifdef CONFIG_BRIDGE
+        /* Optimisation for framebursting (allow interleaving of pkts by
+         * immediately processing the rx pkt instead of Qing the pkt and deferring
+         * the processing). Only optimise for bridging and guard against non
+         * TASKLET based netif_rx calls.
+         */
+        if (!in_irq() && (skb->dev->br_port != NULL) && br_handle_frame_hook != NULL) {
+                local_irq_restore(flags);
+                return netif_receive_skb(skb);
+        }
+#endif          
         if (queue->input_pkt_queue.qlen <= netdev_max_backlog) {
                 if (queue->input_pkt_queue.qlen) {

src/linux/rt2880/linux-2.6.23/net/ipv4/tcp_output.c

@@ -247 +247 @@
                  * Relax Will Robinson.
                  */
-                new_win = cur_win;
+                new_win = ALIGN(cur_win, 1 << tp->rx_opt.rcv_wscale);
         }
         tp->rcv_wnd = new_win;