diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 03:13:04 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 03:13:04 -0400 |
| commit | fa251f89903d73989e2f63e13d0eaed1e07ce0da (patch) | |
| tree | 3f7fe779941e3b6d67754dd7c44a32f48ea47c74 /include/linux/netlink.h | |
| parent | dd3932eddf428571762596e17b65f5dc92ca361b (diff) | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include/linux/netlink.h')
| -rw-r--r-- | include/linux/netlink.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 59d066936ab9..123566912d73 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
| @@ -27,8 +27,6 @@ | |||
| 27 | 27 | ||
| 28 | #define MAX_LINKS 32 | 28 | #define MAX_LINKS 32 |
| 29 | 29 | ||
| 30 | struct net; | ||
| 31 | |||
| 32 | struct sockaddr_nl { | 30 | struct sockaddr_nl { |
| 33 | sa_family_t nl_family; /* AF_NETLINK */ | 31 | sa_family_t nl_family; /* AF_NETLINK */ |
| 34 | unsigned short nl_pad; /* zero */ | 32 | unsigned short nl_pad; /* zero */ |
| @@ -151,6 +149,8 @@ struct nlattr { | |||
| 151 | #include <linux/capability.h> | 149 | #include <linux/capability.h> |
| 152 | #include <linux/skbuff.h> | 150 | #include <linux/skbuff.h> |
| 153 | 151 | ||
| 152 | struct net; | ||
| 153 | |||
| 154 | static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb) | 154 | static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb) |
| 155 | { | 155 | { |
| 156 | return (struct nlmsghdr *)skb->data; | 156 | return (struct nlmsghdr *)skb->data; |