[PATCH net-next 2/4] rxrpc: Don't specify protocol to when creating transport socket [ver #2]

2016-09-14 Thread David Howells
Pass 0 as the protocol argument when creating the transport socket rather
than IPPROTO_UDP.

Signed-off-by: David Howells 
---

 net/rxrpc/local_object.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index 782b9adf67cb..8720be2a6250 100644
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
@@ -103,8 +103,8 @@ static int rxrpc_open_socket(struct rxrpc_local *local)
_enter("%p{%d}", local, local->srx.transport_type);
 
/* create a socket to represent the local endpoint */
-   ret = sock_create_kern(_net, PF_INET, local->srx.transport_type,
-  IPPROTO_UDP, >socket);
+   ret = sock_create_kern(_net, local->srx.transport.family,
+  local->srx.transport_type, 0, >socket);
if (ret < 0) {
_leave(" = %d [socket]", ret);
return ret;



[PATCH net-next 2/4] rxrpc: Don't specify protocol to when creating transport socket

2016-09-13 Thread David Howells
Pass 0 as the protocol argument when creating the transport socket rather
than IPPROTO_UDP.

Signed-off-by: David Howells 
---

 net/rxrpc/local_object.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index 782b9adf67cb..8720be2a6250 100644
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
@@ -103,8 +103,8 @@ static int rxrpc_open_socket(struct rxrpc_local *local)
_enter("%p{%d}", local, local->srx.transport_type);
 
/* create a socket to represent the local endpoint */
-   ret = sock_create_kern(_net, PF_INET, local->srx.transport_type,
-  IPPROTO_UDP, >socket);
+   ret = sock_create_kern(_net, local->srx.transport.family,
+  local->srx.transport_type, 0, >socket);
if (ret < 0) {
_leave(" = %d [socket]", ret);
return ret;