diff options
-rw-r--r-- | net/ceph/pagelist.c | 14 | ||||
-rw-r--r-- | net/dcb/dcbnl.c | 3 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 3 | ||||
-rw-r--r-- | net/tipc/socket.c | 5 |
4 files changed, 8 insertions, 17 deletions
diff --git a/net/ceph/pagelist.c b/net/ceph/pagelist.c index 13cb409a7bba..665cd23020ff 100644 --- a/net/ceph/pagelist.c +++ b/net/ceph/pagelist.c | |||
@@ -72,8 +72,7 @@ int ceph_pagelist_append(struct ceph_pagelist *pl, const void *buf, size_t len) | |||
72 | } | 72 | } |
73 | EXPORT_SYMBOL(ceph_pagelist_append); | 73 | EXPORT_SYMBOL(ceph_pagelist_append); |
74 | 74 | ||
75 | /** | 75 | /* Allocate enough pages for a pagelist to append the given amount |
76 | * Allocate enough pages for a pagelist to append the given amount | ||
77 | * of data without without allocating. | 76 | * of data without without allocating. |
78 | * Returns: 0 on success, -ENOMEM on error. | 77 | * Returns: 0 on success, -ENOMEM on error. |
79 | */ | 78 | */ |
@@ -95,9 +94,7 @@ int ceph_pagelist_reserve(struct ceph_pagelist *pl, size_t space) | |||
95 | } | 94 | } |
96 | EXPORT_SYMBOL(ceph_pagelist_reserve); | 95 | EXPORT_SYMBOL(ceph_pagelist_reserve); |
97 | 96 | ||
98 | /** | 97 | /* Free any pages that have been preallocated. */ |
99 | * Free any pages that have been preallocated. | ||
100 | */ | ||
101 | int ceph_pagelist_free_reserve(struct ceph_pagelist *pl) | 98 | int ceph_pagelist_free_reserve(struct ceph_pagelist *pl) |
102 | { | 99 | { |
103 | while (!list_empty(&pl->free_list)) { | 100 | while (!list_empty(&pl->free_list)) { |
@@ -112,9 +109,7 @@ int ceph_pagelist_free_reserve(struct ceph_pagelist *pl) | |||
112 | } | 109 | } |
113 | EXPORT_SYMBOL(ceph_pagelist_free_reserve); | 110 | EXPORT_SYMBOL(ceph_pagelist_free_reserve); |
114 | 111 | ||
115 | /** | 112 | /* Create a truncation point. */ |
116 | * Create a truncation point. | ||
117 | */ | ||
118 | void ceph_pagelist_set_cursor(struct ceph_pagelist *pl, | 113 | void ceph_pagelist_set_cursor(struct ceph_pagelist *pl, |
119 | struct ceph_pagelist_cursor *c) | 114 | struct ceph_pagelist_cursor *c) |
120 | { | 115 | { |
@@ -124,8 +119,7 @@ void ceph_pagelist_set_cursor(struct ceph_pagelist *pl, | |||
124 | } | 119 | } |
125 | EXPORT_SYMBOL(ceph_pagelist_set_cursor); | 120 | EXPORT_SYMBOL(ceph_pagelist_set_cursor); |
126 | 121 | ||
127 | /** | 122 | /* Truncate a pagelist to the given point. Move extra pages to reserve. |
128 | * Truncate a pagelist to the given point. Move extra pages to reserve. | ||
129 | * This won't sleep. | 123 | * This won't sleep. |
130 | * Returns: 0 on success, | 124 | * Returns: 0 on success, |
131 | * -EINVAL if the pagelist doesn't match the trunc point pagelist | 125 | * -EINVAL if the pagelist doesn't match the trunc point pagelist |
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index 013da86575e8..81f2bb62dea3 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c | |||
@@ -28,8 +28,7 @@ | |||
28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
29 | #include <net/sock.h> | 29 | #include <net/sock.h> |
30 | 30 | ||
31 | /** | 31 | /* Data Center Bridging (DCB) is a collection of Ethernet enhancements |
32 | * Data Center Bridging (DCB) is a collection of Ethernet enhancements | ||
33 | * intended to allow network traffic with differing requirements | 32 | * intended to allow network traffic with differing requirements |
34 | * (highly reliable, no drops vs. best effort vs. low latency) to operate | 33 | * (highly reliable, no drops vs. best effort vs. low latency) to operate |
35 | * and co-exist on Ethernet. Current DCB features are: | 34 | * and co-exist on Ethernet. Current DCB features are: |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 29aa0c800cd0..d902da96d154 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -3310,8 +3310,7 @@ EXPORT_SYMBOL(tcp_md5_hash_key); | |||
3310 | 3310 | ||
3311 | #endif | 3311 | #endif |
3312 | 3312 | ||
3313 | /** | 3313 | /* Each Responder maintains up to two secret values concurrently for |
3314 | * Each Responder maintains up to two secret values concurrently for | ||
3315 | * efficient secret rollover. Each secret value has 4 states: | 3314 | * efficient secret rollover. Each secret value has 4 states: |
3316 | * | 3315 | * |
3317 | * Generating. (tcp_secret_generating != tcp_secret_primary) | 3316 | * Generating. (tcp_secret_generating != tcp_secret_primary) |
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 11a863d81421..1ebb49f3ddbe 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -1699,9 +1699,8 @@ static int getsockopt(struct socket *sock, | |||
1699 | return put_user(sizeof(value), ol); | 1699 | return put_user(sizeof(value), ol); |
1700 | } | 1700 | } |
1701 | 1701 | ||
1702 | /** | 1702 | /* Protocol switches for the various types of TIPC sockets */ |
1703 | * Protocol switches for the various types of TIPC sockets | 1703 | |
1704 | */ | ||
1705 | static const struct proto_ops msg_ops = { | 1704 | static const struct proto_ops msg_ops = { |
1706 | .owner = THIS_MODULE, | 1705 | .owner = THIS_MODULE, |
1707 | .family = AF_TIPC, | 1706 | .family = AF_TIPC, |