igc: Change byte order in struct igc_nfc_filter

Every time we access the 'etype' and 'vlan_tci' fields from struct
igc_nfc_filter to enable or disable filters in hardware we have to
convert them from big endian to host order so it makes more sense to
simply have these fields in host order.

The byte order conversion should take place in igc_ethtool_get_nfc_
rule() and igc_ethtool_add_nfc_rule(), which are called by .get_rxnfc
and .set_rxnfc ethtool ops, since ethtool subsystem is the one who deals
with them in big endian order.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
index 7124ba254b89b506356f04b8e3f14b91e55e9e20..fcc6261d7f6796f91a3fba6701ce63a6d43b37fc 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc.h
+++ b/drivers/net/ethernet/intel/igc/igc.h
@@ -452,16 +452,10 @@ enum igc_filter_match_flags {
        IGC_FILTER_FLAG_DST_MAC_ADDR =  0x8,
 };
 
-/* RX network flow classification data structure */
 struct igc_nfc_filter {
-       /* Byte layout in order, all values with MSB first:
-        * match_flags - 1 byte
-        * etype - 2 bytes
-        * vlan_tci - 2 bytes
-        */
        u8 match_flags;
-       __be16 etype;
-       __be16 vlan_tci;
+       u16 etype;
+       u16 vlan_tci;
        u8 src_addr[ETH_ALEN];
        u8 dst_addr[ETH_ALEN];
 };

diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
index 408f4a9a199fc84831dc26371243dd45a9541468..66e0760a8f9e37078dc765e9f533abec75cf2386 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
@@ -954,13 +954,13 @@ static int igc_ethtool_get_nfc_rule(struct igc_adapter *adapter,
        fsp->ring_cookie = rule->action;
 
        if (rule->filter.match_flags & IGC_FILTER_FLAG_ETHER_TYPE) {
-               fsp->h_u.ether_spec.h_proto = rule->filter.etype;
+               fsp->h_u.ether_spec.h_proto = htons(rule->filter.etype);
                fsp->m_u.ether_spec.h_proto = ETHER_TYPE_FULL_MASK;
        }
 
        if (rule->filter.match_flags & IGC_FILTER_FLAG_VLAN_TCI) {
                fsp->flow_type |= FLOW_EXT;
-               fsp->h_ext.vlan_tci = rule->filter.vlan_tci;
+               fsp->h_ext.vlan_tci = htons(rule->filter.vlan_tci);
                fsp->m_ext.vlan_tci = htons(VLAN_PRIO_MASK);
        }
 
@@ -1183,9 +1183,8 @@ int igc_enable_nfc_rule(struct igc_adapter *adapter,
        int err = -EINVAL;
 
        if (rule->filter.match_flags & IGC_FILTER_FLAG_ETHER_TYPE) {
-               u16 etype = ntohs(rule->filter.etype);
-
-               err = igc_add_etype_filter(adapter, etype, rule->action);
+               err = igc_add_etype_filter(adapter, rule->filter.etype,
+                                          rule->action);
                if (err)
                        return err;
        }
@@ -1205,8 +1204,9 @@ int igc_enable_nfc_rule(struct igc_adapter *adapter,
        }
 
        if (rule->filter.match_flags & IGC_FILTER_FLAG_VLAN_TCI) {
-               int prio = (ntohs(rule->filter.vlan_tci) & VLAN_PRIO_MASK) >>
+               int prio = (rule->filter.vlan_tci & VLAN_PRIO_MASK) >>
                           VLAN_PRIO_SHIFT;
+
                err = igc_add_vlan_prio_filter(adapter, prio, rule->action);
                if (err)
                        return err;
@@ -1218,14 +1218,11 @@ int igc_enable_nfc_rule(struct igc_adapter *adapter,
 int igc_disable_nfc_rule(struct igc_adapter *adapter,
                         const struct igc_nfc_rule *rule)
 {
-       if (rule->filter.match_flags & IGC_FILTER_FLAG_ETHER_TYPE) {
-               u16 etype = ntohs(rule->filter.etype);
-
-               igc_del_etype_filter(adapter, etype);
-       }
+       if (rule->filter.match_flags & IGC_FILTER_FLAG_ETHER_TYPE)
+               igc_del_etype_filter(adapter, rule->filter.etype);
 
        if (rule->filter.match_flags & IGC_FILTER_FLAG_VLAN_TCI) {
-               int prio = (ntohs(rule->filter.vlan_tci) & VLAN_PRIO_MASK) >>
+               int prio = (rule->filter.vlan_tci & VLAN_PRIO_MASK) >>
                           VLAN_PRIO_SHIFT;
                igc_del_vlan_prio_filter(adapter, prio);
        }
@@ -1325,7 +1322,7 @@ static int igc_ethtool_add_nfc_rule(struct igc_adapter *adapter,
                return -ENOMEM;
 
        if (fsp->m_u.ether_spec.h_proto == ETHER_TYPE_FULL_MASK) {
-               rule->filter.etype = fsp->h_u.ether_spec.h_proto;
+               rule->filter.etype = ntohs(fsp->h_u.ether_spec.h_proto);
                rule->filter.match_flags = IGC_FILTER_FLAG_ETHER_TYPE;
        }
 
@@ -1357,7 +1354,7 @@ static int igc_ethtool_add_nfc_rule(struct igc_adapter *adapter,
                        err = -EOPNOTSUPP;
                        goto err_out;
                }
-               rule->filter.vlan_tci = fsp->h_ext.vlan_tci;
+               rule->filter.vlan_tci = ntohs(fsp->h_ext.vlan_tci);
                rule->filter.match_flags |= IGC_FILTER_FLAG_VLAN_TCI;
        }