diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ee4035571c21..8c9518e946fa 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2718,9 +2718,11 @@ int __dev_addr_add(struct dev_addr_list **list, int *count, | |||
2718 | /** | 2718 | /** |
2719 | * dev_unicast_delete - Release secondary unicast address. | 2719 | * dev_unicast_delete - Release secondary unicast address. |
2720 | * @dev: device | 2720 | * @dev: device |
2721 | * @addr: address to delete | ||
2722 | * @alen: length of @addr | ||
2721 | * | 2723 | * |
2722 | * Release reference to a secondary unicast address and remove it | 2724 | * Release reference to a secondary unicast address and remove it |
2723 | * from the device if the reference count drop to zero. | 2725 | * from the device if the reference count drops to zero. |
2724 | * | 2726 | * |
2725 | * The caller must hold the rtnl_mutex. | 2727 | * The caller must hold the rtnl_mutex. |
2726 | */ | 2728 | */ |
@@ -2742,6 +2744,8 @@ EXPORT_SYMBOL(dev_unicast_delete); | |||
2742 | /** | 2744 | /** |
2743 | * dev_unicast_add - add a secondary unicast address | 2745 | * dev_unicast_add - add a secondary unicast address |
2744 | * @dev: device | 2746 | * @dev: device |
2747 | * @addr: address to delete | ||
2748 | * @alen: length of @addr | ||
2745 | * | 2749 | * |
2746 | * Add a secondary unicast address to the device or increase | 2750 | * Add a secondary unicast address to the device or increase |
2747 | * the reference count if it already exists. | 2751 | * the reference count if it already exists. |
@@ -3830,9 +3834,11 @@ static int dev_cpu_callback(struct notifier_block *nfb, | |||
3830 | 3834 | ||
3831 | #ifdef CONFIG_NET_DMA | 3835 | #ifdef CONFIG_NET_DMA |
3832 | /** | 3836 | /** |
3833 | * net_dma_rebalance - | 3837 | * net_dma_rebalance - try to maintain one DMA channel per CPU |
3834 | * This is called when the number of channels allocated to the net_dma_client | 3838 | * @net_dma: DMA client and associated data (lock, channels, channel_mask) |
3835 | * changes. The net_dma_client tries to have one DMA channel per CPU. | 3839 | * |
3840 | * This is called when the number of channels allocated to the net_dma client | ||
3841 | * changes. The net_dma client tries to have one DMA channel per CPU. | ||
3836 | */ | 3842 | */ |
3837 | 3843 | ||
3838 | static void net_dma_rebalance(struct net_dma *net_dma) | 3844 | static void net_dma_rebalance(struct net_dma *net_dma) |
@@ -3869,7 +3875,7 @@ static void net_dma_rebalance(struct net_dma *net_dma) | |||
3869 | * netdev_dma_event - event callback for the net_dma_client | 3875 | * netdev_dma_event - event callback for the net_dma_client |
3870 | * @client: should always be net_dma_client | 3876 | * @client: should always be net_dma_client |
3871 | * @chan: DMA channel for the event | 3877 | * @chan: DMA channel for the event |
3872 | * @event: event type | 3878 | * @state: DMA state to be handled |
3873 | */ | 3879 | */ |
3874 | static enum dma_state_client | 3880 | static enum dma_state_client |
3875 | netdev_dma_event(struct dma_client *client, struct dma_chan *chan, | 3881 | netdev_dma_event(struct dma_client *client, struct dma_chan *chan, |