linux-stable.git/net/vmw_vsock, branch v3.12

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-08-16T22:37:26+00:00

net/vmw_vsock/af_vsock.c: drop unneeded semicolon

2013-08-05T18:07:44+00:00

Drop the semicolon at the end of the list_for_each_entry loop header.

Signed-off-by: Julia Lawall 
Signed-off-by: David S. Miller

VSOCK: Move af_vsock.h and vsock_addr.h to include/net

2013-07-28T05:14:06+00:00

This is useful for other VSOCK transport implemented outside the
net/vmw_vsock/ directory to use these headers.

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Fix VSOCK_HASH and VSOCK_CONN_HASH

2013-06-24T06:51:48+00:00

If we mod with VSOCK_HASH_SIZE -1, we get 0, 1, .... 249.  Actually, we
have vsock_bind_table[0 ... 250] and vsock_connected_table[0 .. 250].
In this case the last entry will never be used.

We should mod with VSOCK_HASH_SIZE instead.

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Remove unnecessary label

2013-06-24T06:51:48+00:00

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Return VMCI_ERROR_NO_MEM when fails to allocate skb

2013-06-24T06:51:48+00:00

vmci_transport_recv_dgram_cb always return VMCI_SUCESS even if we fail
to allocate skb, return VMCI_ERROR_NO_MEM instead.

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Introduce vsock_auto_bind helper

2013-06-24T06:51:48+00:00

This peace of code is called three times, let's have a helper for it.

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-04-30T07:55:20+00:00

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller

VSOCK: Drop bogus __init annotation from vsock_init_tables()

2013-04-25T08:21:51+00:00

If gcc (e.g. 4.1.2) decides not to inline vsock_init_tables(), this will
cause a section mismatch:

WARNING: net/vmw_vsock/vsock.o(.text+0x1bc): Section mismatch in reference from the function __vsock_core_init() to the function .init.text:vsock_init_tables()
The function __vsock_core_init() references
the function __init vsock_init_tables().
This is often because __vsock_core_init lacks a __init
annotation or the annotation of vsock_init_tables is wrong.

This may cause crashes if VSOCKETS=y and VMWARE_VMCI_VSOCKETS=m.

Signed-off-by: Geert Uytterhoeven 
Signed-off-by: David S. Miller

VSOCK: Fix misc device registration

2013-04-25T08:21:22+00:00

When we call vsock_core_init to init VSOCK the second time,
vsock_device.minor still points to the old dynamically allocated minor
number. misc_register will allocate it for us successfully as if we were
asking for a static one. However, when other user call misc_register to
allocate a dynamic minor number, it will give the one used by
vsock_core_init(), causing this:

  [  405.470687] WARNING: at fs/sysfs/dir.c:536 sysfs_add_one+0xcc/0xf0()
  [  405.470689] Hardware name: OptiPlex 790
  [  405.470690] sysfs: cannot create duplicate filename '/dev/char/10:54'

Always set vsock_device.minor to MISC_DYNAMIC_MINOR before we
register.

Cc: "David S. Miller" 
Cc: Andy King 
Cc: Dmitry Torokhov 
Cc: Reilly Grant 
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Asias He 
Acked-by: Dmitry Torokhov 
Signed-off-by: David S. Miller