diff options
| author | David S. Miller <davem@davemloft.net> | 2013-07-10 17:10:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-10 17:10:40 -0700 |
| commit | 0e00fd479465d00bf0a97cb371c63787e1887a2e (patch) | |
| tree | f4701c62374a44db9f3be2d46f9420a328cd49ee /include/linux | |
| parent | bfffbea1aaeeb1eb6500c83ff9653416daa5b490 (diff) | |
| parent | 64b0dc517ea1b35d02565a779e6cb77ae9045685 (diff) | |
Merge "net: finish renaming lls to busy poll"
Eliezer Tamir says:
====================
Here are three patches that complete the rename of lls to busy-poll
1. rename include/net/ll_poll.h to include/net/busy_poll.h
2. 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
3. Rename LL_SO to BUSY_POLL_SO
Rename sysctl_net_ll_{read,poll} to sysctl_busy_{read,poll}
Fix up users of these variables.
Fix documentation for sysctl.
v2 fixed forgetting the ndo changes in v1
v3 is a resend with -M
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index bb82871b8494..0741a1e919a5 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -974,7 +974,7 @@ struct net_device_ops { void (*ndo_netpoll_cleanup)(struct net_device *dev); #endif #ifdef CONFIG_NET_LL_RX_POLL - int (*ndo_ll_poll)(struct napi_struct *dev); + int (*ndo_busy_poll)(struct napi_struct *dev); #endif int (*ndo_set_vf_mac)(struct net_device *dev, int queue, u8 *mac); |