aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorEliezer Tamir <eliezer.tamir@linux.intel.com>2013-07-10 10:13:26 -0400
committerDavid S. Miller <davem@davemloft.net>2013-07-10 20:08:27 -0400
commit8b80cda536ea9bceec0364e897868a30ee13b992 (patch)
tree75edd97f04e379e6afedd67beef81eb80ba0adaf /net/ipv6
parent076bb0c82a44fbe46fe2c8527a5b5b64b69f679d (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 'net/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c2
-rw-r--r--net/ipv6/udp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 345bd92d4ddb..6e1649d58533 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1499,7 +1499,7 @@ process:
1499 if (sk_filter(sk, skb)) 1499 if (sk_filter(sk, skb))
1500 goto discard_and_relse; 1500 goto discard_and_relse;
1501 1501
1502 sk_mark_ll(sk, skb); 1502 sk_mark_napi_id(sk, skb);
1503 skb->dev = NULL; 1503 skb->dev = NULL;
1504 1504
1505 bh_lock_sock_nested(sk); 1505 bh_lock_sock_nested(sk);
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 40e72034da07..f4058150262b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -844,7 +844,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
844 if (sk != NULL) { 844 if (sk != NULL) {
845 int ret; 845 int ret;
846 846
847 sk_mark_ll(sk, skb); 847 sk_mark_napi_id(sk, skb);
848 ret = udpv6_queue_rcv_skb(sk, skb); 848 ret = udpv6_queue_rcv_skb(sk, skb);
849 sock_put(sk); 849 sock_put(sk);
850 850