[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The stub function is not needed, and we can #ifdef the whole file.

Signed-off-by: Tommi Rantala <tommi.t.rantala@xxxxxxxxx>
---
 net/proto-rds.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/net/proto-rds.c b/net/proto-rds.c
index fd7746f8..7033ae65 100644
--- a/net/proto-rds.c
+++ b/net/proto-rds.c
@@ -1,10 +1,7 @@
-#include <stdlib.h>
-#include "net.h"
-
 #ifdef USE_RDS
 #include <linux/rds.h>
-#endif
-
+#include <stdlib.h>
+#include "net.h"
 #include "compat.h"
 #include "random.h"
 #include "utils.h"	// RAND_ARRAY
@@ -23,7 +20,6 @@ static void rds_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
 	*addrlen = sizeof(struct sockaddr_in);
 }
 
-#ifdef USE_RDS
 static const unsigned int rds_opts[] = {
 	RDS_CANCEL_SENT_TO, RDS_GET_MR, RDS_FREE_MR,
 	4, /* deprecated RDS_BARRIER 4 */
@@ -49,9 +45,4 @@ const struct netproto proto_rds = {
 	.valid_triplets = rds_triplet,
 	.nr_triplets = ARRAY_SIZE(rds_triplet),
 };
-#else
-/* stub if we are built on something without RDS headers */
-void rds_setsockopt(struct sockopt *so)
-{
-}
 #endif	/* USE_RDS */
-- 
2.13.5

--
To unsubscribe from this list: send the line "unsubscribe trinity" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux SCSI]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux