Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/gentoo-headers/2.6.28: 07_all_pull-libc-headers-linux.patch
Date: Mon, 29 Dec 2008 12:38:31
Message-Id: E1LHHO9-0005J2-0m@stork.gentoo.org
1 vapier 08/12/29 12:38:29
2
3 Modified: 07_all_pull-libc-headers-linux.patch
4 Log:
5 use __kernel_XXX rather than kernel_XXX
6
7 Revision Changes Path
8 1.2 src/patchsets/gentoo-headers/2.6.28/07_all_pull-libc-headers-linux.patch
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/07_all_pull-libc-headers-linux.patch?rev=1.2&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/07_all_pull-libc-headers-linux.patch?rev=1.2&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/07_all_pull-libc-headers-linux.patch?r1=1.1&r2=1.2
13
14 Index: 07_all_pull-libc-headers-linux.patch
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/src/patchsets/gentoo-headers/2.6.28/07_all_pull-libc-headers-linux.patch,v
17 retrieving revision 1.1
18 retrieving revision 1.2
19 diff -u -r1.1 -r1.2
20 --- 07_all_pull-libc-headers-linux.patch 27 Dec 2008 07:07:33 -0000 1.1
21 +++ 07_all_pull-libc-headers-linux.patch 29 Dec 2008 12:38:28 -0000 1.2
22 @@ -74,7 +74,7 @@
23 */
24
25 -struct ifmap
26 -+struct kernel_ifmap
27 ++struct __kernel_ifmap
28 {
29 unsigned long mem_start;
30 unsigned long mem_end;
31 @@ -83,7 +83,7 @@
32 */
33
34 -struct ifreq
35 -+struct kernel_ifreq
36 ++struct __kernel_ifreq
37 {
38 #define IFHWADDRLEN 6
39 union
40 @@ -92,7 +92,7 @@
41 */
42
43 -struct ifconf
44 -+struct kernel_ifconf
45 ++struct __kernel_ifconf
46 {
47 int ifc_len; /* size of buffer */
48 union
49 @@ -111,7 +111,7 @@
50 #define IPV4_BEET_PHMAXLEN 8
51
52 -struct iphdr {
53 -+struct kernel_iphdr {
54 ++struct __kernel_iphdr {
55 #if defined(__LITTLE_ENDIAN_BITFIELD)
56 __u8 ihl:4,
57 version:4;
58 @@ -143,7 +143,7 @@
59 */
60
61 -struct in6_addr
62 -+struct kernel_in6_addr
63 ++struct __kernel_in6_addr
64 {
65 union
66 {
67 @@ -162,7 +162,7 @@
68 #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
69
70 -struct sockaddr_in6 {
71 -+struct kernel_sockaddr_in6 {
72 ++struct __kernel_sockaddr_in6 {
73 unsigned short int sin6_family; /* AF_INET6 */
74 __be16 sin6_port; /* Transport layer port # */
75 __be32 sin6_flowinfo; /* IPv6 flow information */
76 @@ -171,7 +171,7 @@
77 };
78
79 -struct ipv6_mreq {
80 -+struct kernel_ipv6_mreq {
81 ++struct __kernel_ipv6_mreq {
82 /* IPv6 multicast address of group */
83 struct in6_addr ipv6mr_multiaddr;
84
85 @@ -263,7 +263,7 @@
86
87 /* Internet address. */
88 -struct in_addr {
89 -+struct kernel_in_addr {
90 ++struct __kernel_in_addr {
91 __be32 s_addr;
92 };
93
94 @@ -272,14 +272,14 @@
95 /* Request struct for multicast socket ops */
96
97 -struct ip_mreq
98 -+struct kernel_ip_mreq
99 ++struct __kernel_ip_mreq
100 {
101 struct in_addr imr_multiaddr; /* IP multicast address of group */
102 struct in_addr imr_interface; /* local IP address of interface */
103 };
104
105 -struct ip_mreqn
106 -+struct kernel_ip_mreqn
107 ++struct __kernel_ip_mreqn
108 {
109 struct in_addr imr_multiaddr; /* IP multicast address of group */
110 struct in_addr imr_address; /* local IP address of interface */
111 @@ -287,14 +287,14 @@
112 };
113
114 -struct ip_mreq_source {
115 -+struct kernel_ip_mreq_source {
116 ++struct __kernel_ip_mreq_source {
117 __be32 imr_multiaddr;
118 __be32 imr_interface;
119 __be32 imr_sourceaddr;
120 };
121
122 -struct ip_msfilter {
123 -+struct kernel_ip_msfilter {
124 ++struct __kernel_ip_msfilter {
125 __be32 imsf_multiaddr;
126 __be32 imsf_interface;
127 __u32 imsf_fmode;
128 @@ -303,14 +303,14 @@
129 + (numsrc) * sizeof(__u32))
130
131 -struct group_req
132 -+struct kernel_group_req
133 ++struct __kernel_group_req
134 {
135 __u32 gr_interface; /* interface index */
136 struct __kernel_sockaddr_storage gr_group; /* group address */
137 };
138
139 -struct group_source_req
140 -+struct kernel_group_source_req
141 ++struct __kernel_group_source_req
142 {
143 __u32 gsr_interface; /* interface index */
144 struct __kernel_sockaddr_storage gsr_group; /* group address */
145 @@ -318,7 +318,7 @@
146 };
147
148 -struct group_filter
149 -+struct kernel_group_filter
150 ++struct __kernel_group_filter
151 {
152 __u32 gf_interface; /* interface index */
153 struct __kernel_sockaddr_storage gf_group; /* multicast address */
154 @@ -327,7 +327,7 @@
155 + (numsrc) * sizeof(struct __kernel_sockaddr_storage))
156
157 -struct in_pktinfo
158 -+struct kernel_in_pktinfo
159 ++struct __kernel_in_pktinfo
160 {
161 int ipi_ifindex;
162 struct in_addr ipi_spec_dst;
163 @@ -336,7 +336,7 @@
164 /* Structure describing an Internet (IP) socket address. */
165 #define __SOCK_SIZE__ 16 /* sizeof(struct sockaddr) */
166 -struct sockaddr_in {
167 -+struct kernel_sockaddr_in {
168 ++struct __kernel_sockaddr_in {
169 sa_family_t sin_family; /* Address family */
170 __be16 sin_port; /* Port number */
171 struct in_addr sin_addr; /* Internet address */