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:
commit
bdfa75ad70
364 changed files with 3812 additions and 2436 deletions
|
|
@ -10,6 +10,7 @@
|
|||
#define __UAPI_MCTP_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/socket.h>
|
||||
|
||||
typedef __u8 mctp_eid_t;
|
||||
|
||||
|
|
@ -18,11 +19,13 @@ struct mctp_addr {
|
|||
};
|
||||
|
||||
struct sockaddr_mctp {
|
||||
unsigned short int smctp_family;
|
||||
int smctp_network;
|
||||
__kernel_sa_family_t smctp_family;
|
||||
__u16 __smctp_pad0;
|
||||
unsigned int smctp_network;
|
||||
struct mctp_addr smctp_addr;
|
||||
__u8 smctp_type;
|
||||
__u8 smctp_tag;
|
||||
__u8 __smctp_pad1;
|
||||
};
|
||||
|
||||
#define MCTP_NET_ANY 0x0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue