diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-02 22:05:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-02 22:05:58 -0400 |
| commit | 3715544750e4a250f881254900cccebc57509fde (patch) | |
| tree | 478205aefd34a74a0ed2f236c19291973d519fa4 /include/uapi | |
| parent | 629161f649ca259cfc1473a98347b941dd7a52bc (diff) | |
| parent | 6c3c1eb3c35e8856d6dcb01b412316a676f58bbe (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/virtio_ring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index a3318f31e8e7..915980ac68df 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -155,7 +155,7 @@ static inline unsigned vring_size(unsigned int num, unsigned long align) } /* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */ -/* Assuming a given event_idx value from the other size, if +/* Assuming a given event_idx value from the other side, if * we have just incremented index from old to new_idx, * should we trigger an event? */ static inline int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old) |