diff options
author | Eliezer Tamir <eliezer.tamir@linux.intel.com> | 2013-07-10 10:13:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-07-10 20:08:27 -0400 |
commit | 8b80cda536ea9bceec0364e897868a30ee13b992 (patch) | |
tree | 75edd97f04e379e6afedd67beef81eb80ba0adaf /drivers/net/ethernet/mellanox | |
parent | 076bb0c82a44fbe46fe2c8527a5b5b64b69f679d (diff) |
net: rename ll methods to busy-poll
Rename ndo_ll_poll to ndo_busy_poll.
Rename sk_mark_ll to sk_mark_napi_id.
Rename skb_mark_ll to skb_mark_napi_id.
Correct all useres of these functions.
Update comments and defines in include/net/busy_poll.h
Signed-off-by: Eliezer Tamir <eliezer.tamir@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 0fb2438dc2c7..5eac871399d8 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | |||
@@ -2141,7 +2141,7 @@ static const struct net_device_ops mlx4_netdev_ops = { | |||
2141 | .ndo_rx_flow_steer = mlx4_en_filter_rfs, | 2141 | .ndo_rx_flow_steer = mlx4_en_filter_rfs, |
2142 | #endif | 2142 | #endif |
2143 | #ifdef CONFIG_NET_LL_RX_POLL | 2143 | #ifdef CONFIG_NET_LL_RX_POLL |
2144 | .ndo_ll_poll = mlx4_en_low_latency_recv, | 2144 | .ndo_busy_poll = mlx4_en_low_latency_recv, |
2145 | #endif | 2145 | #endif |
2146 | }; | 2146 | }; |
2147 | 2147 | ||
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 90746d37ac9b..dec455c8f627 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c | |||
@@ -767,7 +767,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud | |||
767 | timestamp); | 767 | timestamp); |
768 | } | 768 | } |
769 | 769 | ||
770 | skb_mark_ll(skb, &cq->napi); | 770 | skb_mark_napi_id(skb, &cq->napi); |
771 | 771 | ||
772 | /* Push it up the stack */ | 772 | /* Push it up the stack */ |
773 | netif_receive_skb(skb); | 773 | netif_receive_skb(skb); |