kernel: don't hide the 'Warning: unable to open an initial console' message

[oweals/openwrt.git] / target / linux / generic / patches-3.6 / 642-bridge_port_isolate.patch

diff --git a/target/linux/generic/patches-3.6/642-bridge_port_isolate.patch b/target/linux/generic/patches-3.6/642-bridge_port_isolate.patch
index 68434bfc291cbd09cf957f4fbe4983d1bbf825a8..9920a5e51081a8a12da238de7199e9f66c2880d8 100644 (file)
--- a/target/linux/generic/patches-3.6/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-3.6/642-bridge_port_isolate.patch
@@ -33,7 +33,7 @@
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
  {
-@@ -181,6 +197,7 @@ static struct brport_attribute *brport_a
+@@ -181,6 +197,7 @@ static const struct brport_attribute *br
        &brport_attr_hold_timer,
        &brport_attr_flush,
        &brport_attr_hairpin_mode,
@@ -55,7 +55,7 @@
                skb = NULL;
 --- a/net/bridge/br_forward.c
 +++ b/net/bridge/br_forward.c
-@@ -109,7 +109,7 @@ void br_deliver(const struct net_bridge_
+@@ -110,7 +110,7 @@ void br_deliver(const struct net_bridge_
  /* called with rcu_read_lock */
  void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
  {
@@ -64,7 +64,7 @@
                if (skb0)
                        deliver_clone(to, skb, __br_forward);
                else
-@@ -164,7 +164,8 @@ out:
+@@ -165,7 +165,8 @@ out:
  static void br_flood(struct net_bridge *br, struct sk_buff *skb,
                     struct sk_buff *skb0,
                     void (*__packet_hook)(const struct net_bridge_port *p,
@@ -74,7 +74,7 @@
  {
        struct net_bridge_port *p;
        struct net_bridge_port *prev;
-@@ -172,6 +173,9 @@ static void br_flood(struct net_bridge *
+@@ -173,6 +174,9 @@ static void br_flood(struct net_bridge *
        prev = NULL;
  
        list_for_each_entry_rcu(p, &br->port_list, list) {
@@ -84,7 +84,7 @@
                prev = maybe_deliver(prev, p, skb, __packet_hook);
                if (IS_ERR(prev))
                        goto out;
-@@ -195,14 +199,14 @@ out:
+@@ -196,14 +200,14 @@ out:
  /* called with rcu_read_lock */
  void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
  {