Commit 7410191a authored by Satanand Burla's avatar Satanand Burla Committed by David S. Miller

liquidio: use fallback for selecting txq

Remove assignment to ndo_select_queue so that fallback is used for
selecting txq.  Also remove the now-useless function that used to be
assigned to ndo_select_queue.
Signed-off-by: default avatarSatanand Burla <satananda.burla@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDerek Chickles <derek.chickles@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98fc3c6f
...@@ -2223,25 +2223,6 @@ static void if_cfg_callback(struct octeon_device *oct, ...@@ -2223,25 +2223,6 @@ static void if_cfg_callback(struct octeon_device *oct,
wake_up_interruptible(&ctx->wc); wake_up_interruptible(&ctx->wc);
} }
/**
* \brief Select queue based on hash
* @param dev Net device
* @param skb sk_buff structure
* @returns selected queue number
*/
static u16 select_q(struct net_device *dev, struct sk_buff *skb,
void *accel_priv __attribute__((unused)),
select_queue_fallback_t fallback __attribute__((unused)))
{
u32 qindex = 0;
struct lio *lio;
lio = GET_LIO(dev);
qindex = skb_tx_hash(dev, skb);
return (u16)(qindex % (lio->linfo.num_txpciq));
}
/** Routine to push packets arriving on Octeon interface upto network layer. /** Routine to push packets arriving on Octeon interface upto network layer.
* @param oct_id - octeon device id. * @param oct_id - octeon device id.
* @param skbuff - skbuff struct to be passed to network layer. * @param skbuff - skbuff struct to be passed to network layer.
...@@ -3755,7 +3736,6 @@ static const struct net_device_ops lionetdevops = { ...@@ -3755,7 +3736,6 @@ static const struct net_device_ops lionetdevops = {
.ndo_set_vf_vlan = liquidio_set_vf_vlan, .ndo_set_vf_vlan = liquidio_set_vf_vlan,
.ndo_get_vf_config = liquidio_get_vf_config, .ndo_get_vf_config = liquidio_get_vf_config,
.ndo_set_vf_link_state = liquidio_set_vf_link_state, .ndo_set_vf_link_state = liquidio_set_vf_link_state,
.ndo_select_queue = select_q
}; };
/** \brief Entry point for the liquidio module /** \brief Entry point for the liquidio module
......
...@@ -1455,26 +1455,6 @@ static void if_cfg_callback(struct octeon_device *oct, ...@@ -1455,26 +1455,6 @@ static void if_cfg_callback(struct octeon_device *oct,
wake_up_interruptible(&ctx->wc); wake_up_interruptible(&ctx->wc);
} }
/**
* \brief Select queue based on hash
* @param dev Net device
* @param skb sk_buff structure
* @returns selected queue number
*/
static u16 select_q(struct net_device *dev, struct sk_buff *skb,
void *accel_priv __attribute__((unused)),
select_queue_fallback_t fallback __attribute__((unused)))
{
struct lio *lio;
u32 qindex;
lio = GET_LIO(dev);
qindex = skb_tx_hash(dev, skb);
return (u16)(qindex % (lio->linfo.num_txpciq));
}
/** Routine to push packets arriving on Octeon interface upto network layer. /** Routine to push packets arriving on Octeon interface upto network layer.
* @param oct_id - octeon device id. * @param oct_id - octeon device id.
* @param skbuff - skbuff struct to be passed to network layer. * @param skbuff - skbuff struct to be passed to network layer.
...@@ -2717,7 +2697,6 @@ static const struct net_device_ops lionetdevops = { ...@@ -2717,7 +2697,6 @@ static const struct net_device_ops lionetdevops = {
.ndo_set_features = liquidio_set_features, .ndo_set_features = liquidio_set_features,
.ndo_udp_tunnel_add = liquidio_add_vxlan_port, .ndo_udp_tunnel_add = liquidio_add_vxlan_port,
.ndo_udp_tunnel_del = liquidio_del_vxlan_port, .ndo_udp_tunnel_del = liquidio_del_vxlan_port,
.ndo_select_queue = select_q,
}; };
static int lio_nic_info(struct octeon_recv_info *recv_info, void *buf) static int lio_nic_info(struct octeon_recv_info *recv_info, void *buf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment