diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-03 01:31:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-03 01:31:54 -0400 |
| commit | d66248326410ed0d3e813ebe974b3e6638df0717 (patch) | |
| tree | a1dbe86f5540596a70c6f3b9aab051d37f37daf5 /net/vmw_vsock/vsock_addr.c | |
| parent | 8facd5fb73c6e960555e5913743dfbb6c3d984a5 (diff) | |
| parent | da241efcd9c3da2af6ba20055c7e158ec725005c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull net into net-next to get the synchronize_net() bug fix in
bonding.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock/vsock_addr.c')
| -rw-r--r-- | net/vmw_vsock/vsock_addr.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/vmw_vsock/vsock_addr.c b/net/vmw_vsock/vsock_addr.c index b7df1aea7c59..ec2611b4ea0e 100644 --- a/net/vmw_vsock/vsock_addr.c +++ b/net/vmw_vsock/vsock_addr.c @@ -64,16 +64,6 @@ bool vsock_addr_equals_addr(const struct sockaddr_vm *addr, } EXPORT_SYMBOL_GPL(vsock_addr_equals_addr); -bool vsock_addr_equals_addr_any(const struct sockaddr_vm *addr, - const struct sockaddr_vm *other) -{ - return (addr->svm_cid == VMADDR_CID_ANY || - other->svm_cid == VMADDR_CID_ANY || - addr->svm_cid == other->svm_cid) && - addr->svm_port == other->svm_port; -} -EXPORT_SYMBOL_GPL(vsock_addr_equals_addr_any); - int vsock_addr_cast(const struct sockaddr *addr, size_t len, struct sockaddr_vm **out_addr) { |