2009-05-15 13:36:04 +03:00
|
|
|
--- a/net/core/dev.c
|
|
|
|
|
+++ b/net/core/dev.c
|
2008-05-19 16:44:11 +03:00
|
|
|
@@ -1289,6 +1289,19 @@ int netif_rx(struct sk_buff *skb)
|
2005-07-08 20:56:54 +03:00
|
|
|
local_irq_save(flags);
|
|
|
|
|
|
|
|
|
|
netdev_rx_stat[this_cpu].total++;
|
|
|
|
|
+
|
|
|
|
|
+#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) {
|
|
|
|
|
if (queue->throttle)
|
