selinux: Remove security_ops extern

[linux.git] / drivers / net / ethernet / intel / i40e / i40e_ethtool.c

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index b16c25111552ebb1a9cac9a8c20f80a4f0ca2e65..4a488ffcd6b0b1221e31755116acf7830f49d20c 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -145,6 +145,9 @@ static struct i40e_stats i40e_gstrings_stats[] = {
        I40E_PF_STAT("rx_jabber", stats.rx_jabber),
        I40E_PF_STAT("VF_admin_queue_requests", vf_aq_requests),
        I40E_PF_STAT("rx_hwtstamp_cleared", rx_hwtstamp_cleared),
+       I40E_PF_STAT("fdir_atr_match", stats.fd_atr_match),
+       I40E_PF_STAT("fdir_sb_match", stats.fd_sb_match),
+
        /* LPI stats */
        I40E_PF_STAT("tx_lpi_status", stats.tx_lpi_status),
        I40E_PF_STAT("rx_lpi_status", stats.rx_lpi_status),
@@ -1249,11 +1252,18 @@ static int i40e_get_ethtool_fdir_entry(struct i40e_pf *pf,
                fsp->m_u.usr_ip4_spec.proto = 0;
        }
 
-       fsp->h_u.tcp_ip4_spec.psrc = rule->src_port;
-       fsp->h_u.tcp_ip4_spec.pdst = rule->dst_port;
-       fsp->h_u.tcp_ip4_spec.ip4src = rule->src_ip[0];
-       fsp->h_u.tcp_ip4_spec.ip4dst = rule->dst_ip[0];
-       fsp->ring_cookie = rule->q_index;
+       /* Reverse the src and dest notion, since the HW views them from
+        * Tx perspective where as the user expects it from Rx filter view.
+        */
+       fsp->h_u.tcp_ip4_spec.psrc = rule->dst_port;
+       fsp->h_u.tcp_ip4_spec.pdst = rule->src_port;
+       fsp->h_u.tcp_ip4_spec.ip4src = rule->dst_ip[0];
+       fsp->h_u.tcp_ip4_spec.ip4dst = rule->src_ip[0];
+
+       if (rule->dest_ctl == I40E_FILTER_PROGRAM_DESC_DEST_DROP_PACKET)
+               fsp->ring_cookie = RX_CLS_FLOW_DISC;
+       else
+               fsp->ring_cookie = rule->q_index;
 
        return 0;
 }
@@ -1557,7 +1567,8 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
                return -EINVAL;
        }
 
-       if (fsp->ring_cookie >= vsi->num_queue_pairs)
+       if ((fsp->ring_cookie != RX_CLS_FLOW_DISC) &&
+           (fsp->ring_cookie >= vsi->num_queue_pairs))
                return -EINVAL;
 
        input = kzalloc(sizeof(*input), GFP_KERNEL);
@@ -1578,13 +1589,17 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
        input->pctype = 0;
        input->dest_vsi = vsi->id;
        input->fd_status = I40E_FILTER_PROGRAM_DESC_FD_STATUS_FD_ID;
-       input->cnt_index = 0;
+       input->cnt_index  = pf->fd_sb_cnt_idx;
        input->flow_type = fsp->flow_type;
        input->ip4_proto = fsp->h_u.usr_ip4_spec.proto;
-       input->src_port = fsp->h_u.tcp_ip4_spec.psrc;
-       input->dst_port = fsp->h_u.tcp_ip4_spec.pdst;
-       input->src_ip[0] = fsp->h_u.tcp_ip4_spec.ip4src;
-       input->dst_ip[0] = fsp->h_u.tcp_ip4_spec.ip4dst;
+
+       /* Reverse the src and dest notion, since the HW expects them to be from
+        * Tx perspective where as the input from user is from Rx filter view.
+        */
+       input->dst_port = fsp->h_u.tcp_ip4_spec.psrc;
+       input->src_port = fsp->h_u.tcp_ip4_spec.pdst;
+       input->dst_ip[0] = fsp->h_u.tcp_ip4_spec.ip4src;
+       input->src_ip[0] = fsp->h_u.tcp_ip4_spec.ip4dst;
 
        ret = i40e_add_del_fdir(vsi, input, true);
        if (ret)