4 files changed, 18 insertions, 5 deletions

diff --git a/net/ipv4/ipvs/ip_vs_wrr.c b/net/ipv4/ipvs/ip_vs_wrr.c
index 749fa044eca5..85c680add6df 100644
--- a/net/ipv4/ipvs/ip_vs_wrr.c
+++ b/net/ipv4/ipvs/ip_vs_wrr.c
@@ -22,6 +22,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/net.h>
 
 #include <net/ip_vs.h>
 
@@ -169,7 +170,7 @@ ip_vs_wrr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
                                  */
                                 if (mark->cw == 0) {
                                         mark->cl = &svc->destinations;
-                                        IP_VS_INFO("ip_vs_wrr_schedule(): "
+                                        IP_VS_ERR_RL("ip_vs_wrr_schedule(): "
                                                    "no available servers\n");
                                         dest = NULL;
                                         goto out;
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index e77592d050ce..45c7c0c3875e 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,6 +1,5 @@
 config MAC80211
         tristate "Generic IEEE 802.11 Networking Stack (mac80211)"
-        depends on EXPERIMENTAL
         select CRYPTO
         select CRYPTO_ECB
         select CRYPTO_ARC4
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 8d7698621f0a..971b867e0484 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -19,6 +19,7 @@
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
+#include <linux/if_vlan.h>
 
 #include <net/pkt_cls.h>
 #include <net/ip.h>
@@ -270,6 +271,15 @@ static u32 flow_get_skgid(const struct sk_buff *skb)
         return 0;
 }
 
+static u32 flow_get_vlan_tag(const struct sk_buff *skb)
+{
+        u16 uninitialized_var(tag);
+
+        if (vlan_get_tag(skb, &tag) < 0)
+                return 0;
+        return tag & VLAN_VID_MASK;
+}
+
 static u32 flow_key_get(const struct sk_buff *skb, int key)
 {
         switch (key) {
@@ -305,6 +315,8 @@ static u32 flow_key_get(const struct sk_buff *skb, int key)
                 return flow_get_skuid(skb);
         case FLOW_KEY_SKGID:
                 return flow_get_skgid(skb);
+        case FLOW_KEY_VLAN_TAG:
+                return flow_get_vlan_tag(skb);
         default:
                 WARN_ON(1);
                 return 0;
@@ -402,12 +414,13 @@ static int flow_change(struct tcf_proto *tp, unsigned long base,
 
         if (tb[TCA_FLOW_KEYS]) {
                 keymask = nla_get_u32(tb[TCA_FLOW_KEYS]);
-                if (fls(keymask) - 1 > FLOW_KEY_MAX)
-                        return -EOPNOTSUPP;
 
                 nkeys = hweight32(keymask);
                 if (nkeys == 0)
                         return -EINVAL;
+
+                if (fls(keymask) - 1 > FLOW_KEY_MAX)
+                        return -EOPNOTSUPP;
         }
 
         err = tcf_exts_validate(tp, tb, tca[TCA_RATE], &e, &flow_ext_map);
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 9c2ec1992a2a..2a7e648fbcf4 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -176,7 +176,7 @@ META_COLLECTOR(var_dev)
 
 META_COLLECTOR(int_vlan_tag)
 {
-        unsigned short tag;
+        unsigned short uninitialized_var(tag);
         if (vlan_get_tag(skb, &tag) < 0)
                 *err = -1;
         else