diff options
author | 2014-06-03 23:32:12 -0700 | |
---|---|---|
committer | 2014-06-03 23:32:12 -0700 | |
commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
tree | d23898dc30ed25c1dae9bb6325041027d412397a /include/linux/netlink.h | |
parent | net: remove some unless free on failure in alloc_netdev_mqs() (diff) | |
parent | sh_eth: fix SH7619/771x support (diff) | |
download | linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.gz linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.bz2 linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netlink.h')
-rw-r--r-- | include/linux/netlink.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 7a28115dd396..9e572daa15d5 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -16,9 +16,10 @@ static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb) } enum netlink_skb_flags { - NETLINK_SKB_MMAPED = 0x1, /* Packet data is mmaped */ - NETLINK_SKB_TX = 0x2, /* Packet was sent by userspace */ - NETLINK_SKB_DELIVERED = 0x4, /* Packet was delivered */ + NETLINK_SKB_MMAPED = 0x1, /* Packet data is mmaped */ + NETLINK_SKB_TX = 0x2, /* Packet was sent by userspace */ + NETLINK_SKB_DELIVERED = 0x4, /* Packet was delivered */ + NETLINK_SKB_DST = 0x8, /* Dst set in sendto or sendmsg */ }; struct netlink_skb_parms { |