summaryrefslogtreecommitdiff
path: root/include/linux/rose.h
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-08-24 22:43:55 +0400
committerDavid S. Miller <davem@davemloft.net>2011-08-26 20:02:50 +0400
commitbcb949b8847655516ba499ca75cd8529f167e360 (patch)
tree7e5457a45e5ddf1381bffc9cfe793504afe10696 /include/linux/rose.h
parentd4b172d2ecb99edfb6afce6af8a65447af347543 (diff)
downloadlinux-bcb949b8847655516ba499ca75cd8529f167e360.tar.xz
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
Complete the work started with commit 6602a4baf4d1a73cc4685a39ef859e1c5ddf654c ('net: Make userland include of netlink.h more sane'). Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/rose.h')
-rw-r--r--include/linux/rose.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/rose.h b/include/linux/rose.h
index e8289cdbcc20..1fcfe95893b8 100644
--- a/include/linux/rose.h
+++ b/include/linux/rose.h
@@ -7,6 +7,7 @@
#ifndef ROSE_KERNEL_H
#define ROSE_KERNEL_H
+#include <linux/socket.h>
#include <linux/ax25.h>
#define ROSE_MTU 251
@@ -46,7 +47,7 @@ typedef struct {
} rose_address;
struct sockaddr_rose {
- sa_family_t srose_family;
+ __kernel_sa_family_t srose_family;
rose_address srose_addr;
ax25_address srose_call;
int srose_ndigis;
@@ -54,7 +55,7 @@ struct sockaddr_rose {
};
struct full_sockaddr_rose {
- sa_family_t srose_family;
+ __kernel_sa_family_t srose_family;
rose_address srose_addr;
ax25_address srose_call;
unsigned int srose_ndigis;