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 /net/ipv4 | |
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 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 | ||||
-rw-r--r-- | net/ipv4/udp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 3a261b41a00c..b299da5ff499 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1994,7 +1994,7 @@ process: | |||
1994 | if (sk_filter(sk, skb)) | 1994 | if (sk_filter(sk, skb)) |
1995 | goto discard_and_relse; | 1995 | goto discard_and_relse; |
1996 | 1996 | ||
1997 | sk_mark_ll(sk, skb); | 1997 | sk_mark_napi_id(sk, skb); |
1998 | skb->dev = NULL; | 1998 | skb->dev = NULL; |
1999 | 1999 | ||
2000 | bh_lock_sock_nested(sk); | 2000 | bh_lock_sock_nested(sk); |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index bcc0ff2c16da..a0d7151ffbd9 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -1713,7 +1713,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, | |||
1713 | if (sk != NULL) { | 1713 | if (sk != NULL) { |
1714 | int ret; | 1714 | int ret; |
1715 | 1715 | ||
1716 | sk_mark_ll(sk, skb); | 1716 | sk_mark_napi_id(sk, skb); |
1717 | ret = udp_queue_rcv_skb(sk, skb); | 1717 | ret = udp_queue_rcv_skb(sk, skb); |
1718 | sock_put(sk); | 1718 | sock_put(sk); |
1719 | 1719 | ||