Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/ethernet/mellanox/mlxsw/spectrum.h
	drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

The bond_main.c and mellanox switch conflicts were cases of
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 2 deletions

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 57692947ebbe..95b021243233 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -252,23 +252,28 @@ static int fl_set_key(struct net *net, struct nlattr **tb,
         fl_set_key_val(tb, key->eth.src, TCA_FLOWER_KEY_ETH_SRC,
                        mask->eth.src, TCA_FLOWER_KEY_ETH_SRC_MASK,
                        sizeof(key->eth.src));
+
         fl_set_key_val(tb, &key->basic.n_proto, TCA_FLOWER_KEY_ETH_TYPE,
                        &mask->basic.n_proto, TCA_FLOWER_UNSPEC,
                        sizeof(key->basic.n_proto));
+
         if (key->basic.n_proto == htons(ETH_P_IP) ||
             key->basic.n_proto == htons(ETH_P_IPV6)) {
                 fl_set_key_val(tb, &key->basic.ip_proto, TCA_FLOWER_KEY_IP_PROTO,
                                &mask->basic.ip_proto, TCA_FLOWER_UNSPEC,
                                sizeof(key->basic.ip_proto));
         }
-        if (key->control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {
+
+        if (tb[TCA_FLOWER_KEY_IPV4_SRC] || tb[TCA_FLOWER_KEY_IPV4_DST]) {
+                key->control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;
                 fl_set_key_val(tb, &key->ipv4.src, TCA_FLOWER_KEY_IPV4_SRC,
                                &mask->ipv4.src, TCA_FLOWER_KEY_IPV4_SRC_MASK,
                                sizeof(key->ipv4.src));
                 fl_set_key_val(tb, &key->ipv4.dst, TCA_FLOWER_KEY_IPV4_DST,
                                &mask->ipv4.dst, TCA_FLOWER_KEY_IPV4_DST_MASK,
                                sizeof(key->ipv4.dst));
-        } else if (key->control.addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {
+        } else if (tb[TCA_FLOWER_KEY_IPV6_SRC] || tb[TCA_FLOWER_KEY_IPV6_DST]) {
+                key->control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;
                 fl_set_key_val(tb, &key->ipv6.src, TCA_FLOWER_KEY_IPV6_SRC,
                                &mask->ipv6.src, TCA_FLOWER_KEY_IPV6_SRC_MASK,
                                sizeof(key->ipv6.src));
@@ -276,6 +281,7 @@ static int fl_set_key(struct net *net, struct nlattr **tb,
                                &mask->ipv6.dst, TCA_FLOWER_KEY_IPV6_DST_MASK,
                                sizeof(key->ipv6.dst));
         }
+
         if (key->basic.ip_proto == IPPROTO_TCP) {
                 fl_set_key_val(tb, &key->tp.src, TCA_FLOWER_KEY_TCP_SRC,
                                &mask->tp.src, TCA_FLOWER_UNSPEC,