flow_dissect: use programable dissector in skb_flow_dissect and friends

[karo-tx-linux.git] / drivers / net / ethernet / cisco / enic / enic_ethtool.c

diff --git a/drivers/net/ethernet/cisco/enic/enic_ethtool.c b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
index 28d9ca675a274f9876473bcce7e6995a14e1289e..7588f8dcc890e2c76e476333ca22dbff5d5b6e04 100644 (file)
--- a/drivers/net/ethernet/cisco/enic/enic_ethtool.c
+++ b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
@@ -334,7 +334,7 @@ static int enic_grxclsrule(struct enic *enic, struct ethtool_rxnfc *cmd)
        n = htbl_fltr_search(enic, (u16)fsp->location);
        if (!n)
                return -EINVAL;
-       switch (n->keys.ip_proto) {
+       switch (n->keys.basic.ip_proto) {
        case IPPROTO_TCP:
                fsp->flow_type = TCP_V4_FLOW;
                break;
@@ -346,16 +346,16 @@ static int enic_grxclsrule(struct enic *enic, struct ethtool_rxnfc *cmd)
                break;
        }
 
-       fsp->h_u.tcp_ip4_spec.ip4src = n->keys.src;
+       fsp->h_u.tcp_ip4_spec.ip4src = n->keys.addrs.src;
        fsp->m_u.tcp_ip4_spec.ip4src = (__u32)~0;
 
-       fsp->h_u.tcp_ip4_spec.ip4dst = n->keys.dst;
+       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.port16[0];
+       fsp->h_u.tcp_ip4_spec.psrc = n->keys.ports.port16[0];
        fsp->m_u.tcp_ip4_spec.psrc = (__u16)~0;
 
-       fsp->h_u.tcp_ip4_spec.pdst = n->keys.port16[1];
+       fsp->h_u.tcp_ip4_spec.pdst = n->keys.ports.port16[1];
        fsp->m_u.tcp_ip4_spec.pdst = (__u16)~0;
 
        fsp->ring_cookie = n->rq_id;