flow_dissector: change port array into src, dst tuple

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.c b/drivers/net/ethernet/cisco/enic/enic_clsf.c
index d3d25c7..6739ebc 100644 (file)
--- a/drivers/net/ethernet/cisco/enic/enic_clsf.c
+++ b/drivers/net/ethernet/cisco/enic/enic_clsf.c
@@ -35,8 +35,8 @@ int enic_addfltr_5t(struct enic *enic, struct flow_keys *keys, u16 rq)
        data.type = FILTER_IPV4_5TUPLE;
        data.u.ipv4.src_addr = ntohl(keys->addrs.src);
        data.u.ipv4.dst_addr = ntohl(keys->addrs.dst);
-       data.u.ipv4.src_port = ntohs(keys->ports.port16[0]);
-       data.u.ipv4.dst_port = ntohs(keys->ports.port16[1]);
+       data.u.ipv4.src_port = ntohs(keys->ports.src);
+       data.u.ipv4.dst_port = ntohs(keys->ports.dst);
        data.u.ipv4.flags = FILTER_FIELDS_IPV4_5TUPLE;
 
        spin_lock_bh(&enic->devcmd_lock);

diff --git a/drivers/net/ethernet/cisco/enic/enic_ethtool.c b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
index 7588f8d..117c096 100644 (file)
--- a/drivers/net/ethernet/cisco/enic/enic_ethtool.c
+++ b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
@@ -352,10 +352,10 @@ static int enic_grxclsrule(struct enic *enic, struct ethtool_rxnfc *cmd)
        fsp->h_u.tcp_ip4_spec.ip4dst = n->keys.addrs.dst;
        fsp->m_u.tcp_ip4_spec.ip4dst = (__u32)~0;
 
-       fsp->h_u.tcp_ip4_spec.psrc = n->keys.ports.port16[0];
+       fsp->h_u.tcp_ip4_spec.psrc = n->keys.ports.src;
        fsp->m_u.tcp_ip4_spec.psrc = (__u16)~0;
 
-       fsp->h_u.tcp_ip4_spec.pdst = n->keys.ports.port16[1];
+       fsp->h_u.tcp_ip4_spec.pdst = n->keys.ports.dst;
        fsp->m_u.tcp_ip4_spec.pdst = (__u16)~0;
 
        fsp->ring_cookie = n->rq_id;

diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index 5eac987..bac9c14 100644 (file)
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
@@ -34,13 +34,16 @@ struct flow_dissector_key_addrs {
 /**
  * flow_dissector_key_tp_ports:
  *     @ports: port numbers of Transport header
- *             port16[0]: src port number
- *             port16[1]: dst port number
+ *             src: source port number
+ *             dst: destination port number
  */
 struct flow_dissector_key_ports {
        union {
                __be32 ports;
-               __be16 port16[2];
+               struct {
+                       __be16 src;
+                       __be16 dst;
+               };
        };
 };
 

diff --cc include/net/ip.h
Simple merge

diff --cc include/net/ipv6.h
Simple merge

diff --cc net/core/flow_dissector.c
Simple merge

diff --cc net/sched/cls_flow.c
Simple merge