mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 08:03:01 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of simnple overlapping additions. With a build fix from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -54,7 +54,7 @@ struct mctp_sock {
|
||||
struct sock sk;
|
||||
|
||||
/* bind() params */
|
||||
int bind_net;
|
||||
unsigned int bind_net;
|
||||
mctp_eid_t bind_addr;
|
||||
__u8 bind_type;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user