[meego-commits] 14806: Changes to devel:kernel/kernel-adaptation-connext

[Qi Wang]

Hi,
I have made the following changes to kernel-adaptation-connext in project devel:kernel. Please review and accept ASAP.

Thank You,
Qi Wang

[This message was auto-generated]

---

Request #14806:

  submit:   home:qi:branches:devel:kernel/kernel-adaptation-connext(r2)(cleanup) -> devel:kernel/kernel-adaptation-connext


Message:
    test

State:   new          2011-03-14T23:25:06 qi
Comment: None



changes files:
--------------
--- kernel-adaptation-connext.changes
+++ kernel-adaptation-connext.changes
@@ -0,0 +1,3 @@
+* Tue Mar 15 2011 Qi Wang <qi.wang at intel.com> - 2.6.37.2
+- BMC #13496. Add CONFIG_BRIDGE.
+

spec files:
-----------

other changes:
--------------

++++++ config-generic
--- config-generic
+++ config-generic
@@ -561,6 +561,7 @@
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
 
 #
 # Core Netfilter Configuration
@@ -620,6 +621,7 @@
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -695,14 +697,18 @@
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_RAW=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_STP=y
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
+CONFIG_LLC=y
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set