diff options
-rw-r--r-- | include/linux/skbuff.h | 2 | ||||
-rw-r--r-- | include/net/sock.h | 1 | ||||
-rw-r--r-- | net/core/dev.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index a45bba9b8cbd..16eef03ce0eb 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -215,6 +215,8 @@ enum { | |||
215 | * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c | 215 | * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c |
216 | * @tc_index: Traffic control index | 216 | * @tc_index: Traffic control index |
217 | * @tc_verd: traffic control verdict | 217 | * @tc_verd: traffic control verdict |
218 | * @dma_cookie: a cookie to one of several possible DMA operations | ||
219 | * done by skb DMA functions | ||
218 | * @secmark: security marking | 220 | * @secmark: security marking |
219 | */ | 221 | */ |
220 | 222 | ||
diff --git a/include/net/sock.h b/include/net/sock.h index a897f05de3b5..2d8d6adf1616 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1269,6 +1269,7 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb) | |||
1269 | * sk_eat_skb - Release a skb if it is no longer needed | 1269 | * sk_eat_skb - Release a skb if it is no longer needed |
1270 | * @sk: socket to eat this skb from | 1270 | * @sk: socket to eat this skb from |
1271 | * @skb: socket buffer to eat | 1271 | * @skb: socket buffer to eat |
1272 | * @copied_early: flag indicating whether DMA operations copied this data early | ||
1272 | * | 1273 | * |
1273 | * This routine must be called with interrupts disabled or with the socket | 1274 | * This routine must be called with interrupts disabled or with the socket |
1274 | * locked so that the sk_buff queue operation is ok. | 1275 | * locked so that the sk_buff queue operation is ok. |
diff --git a/net/core/dev.c b/net/core/dev.c index d293e0f90a0c..9b8f0f22c81d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -3418,8 +3418,8 @@ static void net_dma_rebalance(void) | |||
3418 | /** | 3418 | /** |
3419 | * netdev_dma_event - event callback for the net_dma_client | 3419 | * netdev_dma_event - event callback for the net_dma_client |
3420 | * @client: should always be net_dma_client | 3420 | * @client: should always be net_dma_client |
3421 | * @chan: | 3421 | * @chan: DMA channel for the event |
3422 | * @event: | 3422 | * @event: event type |
3423 | */ | 3423 | */ |
3424 | static void netdev_dma_event(struct dma_client *client, struct dma_chan *chan, | 3424 | static void netdev_dma_event(struct dma_client *client, struct dma_chan *chan, |
3425 | enum dma_event event) | 3425 | enum dma_event event) |