update copyright date to 2013

[dpdk.git] / lib / librte_ether / rte_ethdev.c

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index bf6bd62..019ca2b 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -993,6 +993,118 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
        return (0);
 }
 
+int
+rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int on)
+{
+       struct rte_eth_dev *dev;
+
+       if (port_id >= nb_ports) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return (-ENODEV);
+       }
+
+       dev = &rte_eth_devices[port_id];
+       if (rx_queue_id >= dev->data->nb_rx_queues) {
+               PMD_DEBUG_TRACE("Invalid rx_queue_id=%d\n", port_id);
+               return (-EINVAL);
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_strip_queue_set, -ENOTSUP);
+       (*dev->dev_ops->vlan_strip_queue_set)(dev, rx_queue_id, on);
+
+       return (0);
+}
+
+int
+rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid)
+{
+       struct rte_eth_dev *dev;
+
+       if (port_id >= nb_ports) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return (-ENODEV);
+       }
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP);
+       (*dev->dev_ops->vlan_tpid_set)(dev, tpid);
+
+       return (0);
+}
+
+int
+rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
+{
+       struct rte_eth_dev *dev;
+       int ret = 0;
+       int mask = 0;
+       int cur, org = 0;
+       
+       if (port_id >= nb_ports) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return (-ENODEV);
+       }
+
+       dev = &rte_eth_devices[port_id];
+
+       /*check which option changed by application*/
+       cur = !!(offload_mask & ETH_VLAN_STRIP_OFFLOAD);
+       org = !!(dev->data->dev_conf.rxmode.hw_vlan_strip);
+       if (cur != org){
+               dev->data->dev_conf.rxmode.hw_vlan_strip = (uint8_t)cur;
+               mask |= ETH_VLAN_STRIP_MASK;
+       }
+       
+       cur = !!(offload_mask & ETH_VLAN_FILTER_OFFLOAD);
+       org = !!(dev->data->dev_conf.rxmode.hw_vlan_filter);
+       if (cur != org){
+               dev->data->dev_conf.rxmode.hw_vlan_filter = (uint8_t)cur;
+               mask |= ETH_VLAN_FILTER_MASK;
+       }
+
+       cur = !!(offload_mask & ETH_VLAN_EXTEND_OFFLOAD);
+       org = !!(dev->data->dev_conf.rxmode.hw_vlan_extend);
+       if (cur != org){
+               dev->data->dev_conf.rxmode.hw_vlan_extend = (uint8_t)cur;
+               mask |= ETH_VLAN_EXTEND_MASK;
+       }
+
+       /*no change*/
+       if(mask == 0)
+               return ret;
+       
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_offload_set, -ENOTSUP);
+       (*dev->dev_ops->vlan_offload_set)(dev, mask);
+
+       return ret;
+}
+
+int
+rte_eth_dev_get_vlan_offload(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+       int ret = 0;
+
+       if (port_id >= nb_ports) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return (-ENODEV);
+       }
+
+       dev = &rte_eth_devices[port_id];
+
+       if (dev->data->dev_conf.rxmode.hw_vlan_strip)
+               ret |= ETH_VLAN_STRIP_OFFLOAD ;
+
+       if (dev->data->dev_conf.rxmode.hw_vlan_filter)
+               ret |= ETH_VLAN_FILTER_OFFLOAD ;
+
+       if (dev->data->dev_conf.rxmode.hw_vlan_extend)
+               ret |= ETH_VLAN_EXTEND_OFFLOAD ;
+
+       return ret;
+}
+
+
 int
 rte_eth_dev_fdir_add_signature_filter(uint8_t port_id,
                                      struct rte_fdir_filter *fdir_filter,
@@ -1249,10 +1361,6 @@ rte_eth_dev_fdir_set_masks(uint8_t port_id, struct rte_fdir_masks *fdir_mask)
                return (-ENOSYS);
        }
 
-       /* IPv6 mask are not supported */
-       if (fdir_mask->src_ipv6_mask)
-               return (-ENOTSUP);
-
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_set_masks, -ENOTSUP);
        return (*dev->dev_ops->fdir_set_masks)(dev, fdir_mask);
 }
@@ -1273,13 +1381,30 @@ rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
        }
 
        dev = &rte_eth_devices[port_id];
-
-       /* High water, low water validation are device specific */
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_set, -ENOTSUP);
-       if  (*dev->dev_ops->flow_ctrl_set)
-               return (*dev->dev_ops->flow_ctrl_set)(dev, fc_conf);
+       return (*dev->dev_ops->flow_ctrl_set)(dev, fc_conf);
+}
+
+int
+rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc_conf)
+{
+       struct rte_eth_dev *dev;
+
+       if (port_id >= nb_ports) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return (-ENODEV);
+       }
 
-       return -ENOTSUP;
+       if (pfc_conf->priority > (ETH_DCB_NUM_USER_PRIORITIES - 1)) {
+               PMD_DEBUG_TRACE("Invalid priority, only 0-7 allowed\n");
+               return (-EINVAL);
+       }
+
+       dev = &rte_eth_devices[port_id];
+       /* High water, low water validation are device specific */
+       if  (*dev->dev_ops->priority_flow_ctrl_set)
+               return (*dev->dev_ops->priority_flow_ctrl_set)(dev, pfc_conf);
+       return (-ENOTSUP);
 }
 
 int