aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/rose.h
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-08-24 14:43:55 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-26 12:02:50 -0400
commitbcb949b8847655516ba499ca75cd8529f167e360 (patch)
tree7e5457a45e5ddf1381bffc9cfe793504afe10696 /include/linux/rose.h
parentd4b172d2ecb99edfb6afce6af8a65447af347543 (diff)
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 e8289cdbcc2..1fcfe95893b 100644
--- a/include/linux/rose.h
+++ b/include/linux/rose.h
@@ -7,6 +7,7 @@
7#ifndef ROSE_KERNEL_H 7#ifndef ROSE_KERNEL_H
8#define ROSE_KERNEL_H 8#define ROSE_KERNEL_H
9 9
10#include <linux/socket.h>
10#include <linux/ax25.h> 11#include <linux/ax25.h>
11 12
12#define ROSE_MTU 251 13#define ROSE_MTU 251
@@ -46,7 +47,7 @@ typedef struct {
46} rose_address; 47} rose_address;
47 48
48struct sockaddr_rose { 49struct sockaddr_rose {
49 sa_family_t srose_family; 50 __kernel_sa_family_t srose_family;
50 rose_address srose_addr; 51 rose_address srose_addr;
51 ax25_address srose_call; 52 ax25_address srose_call;
52 int srose_ndigis; 53 int srose_ndigis;
@@ -54,7 +55,7 @@ struct sockaddr_rose {
54}; 55};
55 56
56struct full_sockaddr_rose { 57struct full_sockaddr_rose {
57 sa_family_t srose_family; 58 __kernel_sa_family_t srose_family;
58 rose_address srose_addr; 59 rose_address srose_addr;
59 ax25_address srose_call; 60 ax25_address srose_call;
60 unsigned int srose_ndigis; 61 unsigned int srose_ndigis;