diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2002-04-09 15:14:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 13:37:11 -0500 |
commit | 43cb76d91ee85f579a69d42bc8efc08bac560278 (patch) | |
tree | f5c4766a6639fee3685dbbfc9110bb334af9e6dd /net/bridge | |
parent | 2943ecf2ed32632473c06f1975db47a7aa98c10f (diff) |
Network: convert network devices to use struct device instead of class_device
This lets the network core have the ability to handle suspend/resume
issues, if it wants to.
Thanks to Frederik Deweerdt <frederik.deweerdt@gmail.com> for the arm
driver fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_if.c | 2 | ||||
-rw-r--r-- | net/bridge/br_sysfs_br.c | 234 | ||||
-rw-r--r-- | net/bridge/br_sysfs_if.c | 2 |
3 files changed, 129 insertions, 109 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 55bb2634c088..2b7c2c7dad48 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
@@ -286,7 +286,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, | |||
286 | kobject_init(&p->kobj); | 286 | kobject_init(&p->kobj); |
287 | kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR); | 287 | kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR); |
288 | p->kobj.ktype = &brport_ktype; | 288 | p->kobj.ktype = &brport_ktype; |
289 | p->kobj.parent = &(dev->class_dev.kobj); | 289 | p->kobj.parent = &(dev->dev.kobj); |
290 | p->kobj.kset = NULL; | 290 | p->kobj.kset = NULL; |
291 | 291 | ||
292 | return p; | 292 | return p; |
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index de9d1a9473f2..ce10464716a7 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c | |||
@@ -21,18 +21,17 @@ | |||
21 | 21 | ||
22 | #include "br_private.h" | 22 | #include "br_private.h" |
23 | 23 | ||
24 | #define to_class_dev(obj) container_of(obj,struct class_device,kobj) | 24 | #define to_dev(obj) container_of(obj, struct device, kobj) |
25 | #define to_net_dev(class) container_of(class, struct net_device, class_dev) | ||
26 | #define to_bridge(cd) ((struct net_bridge *)(to_net_dev(cd)->priv)) | 25 | #define to_bridge(cd) ((struct net_bridge *)(to_net_dev(cd)->priv)) |
27 | 26 | ||
28 | /* | 27 | /* |
29 | * Common code for storing bridge parameters. | 28 | * Common code for storing bridge parameters. |
30 | */ | 29 | */ |
31 | static ssize_t store_bridge_parm(struct class_device *cd, | 30 | static ssize_t store_bridge_parm(struct device *d, |
32 | const char *buf, size_t len, | 31 | const char *buf, size_t len, |
33 | void (*set)(struct net_bridge *, unsigned long)) | 32 | void (*set)(struct net_bridge *, unsigned long)) |
34 | { | 33 | { |
35 | struct net_bridge *br = to_bridge(cd); | 34 | struct net_bridge *br = to_bridge(d); |
36 | char *endp; | 35 | char *endp; |
37 | unsigned long val; | 36 | unsigned long val; |
38 | 37 | ||
@@ -50,9 +49,10 @@ static ssize_t store_bridge_parm(struct class_device *cd, | |||
50 | } | 49 | } |
51 | 50 | ||
52 | 51 | ||
53 | static ssize_t show_forward_delay(struct class_device *cd, char *buf) | 52 | static ssize_t show_forward_delay(struct device *d, |
53 | struct device_attribute *attr, char *buf) | ||
54 | { | 54 | { |
55 | struct net_bridge *br = to_bridge(cd); | 55 | struct net_bridge *br = to_bridge(d); |
56 | return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->forward_delay)); | 56 | return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->forward_delay)); |
57 | } | 57 | } |
58 | 58 | ||
@@ -64,18 +64,20 @@ static void set_forward_delay(struct net_bridge *br, unsigned long val) | |||
64 | br->bridge_forward_delay = delay; | 64 | br->bridge_forward_delay = delay; |
65 | } | 65 | } |
66 | 66 | ||
67 | static ssize_t store_forward_delay(struct class_device *cd, const char *buf, | 67 | static ssize_t store_forward_delay(struct device *d, |
68 | size_t len) | 68 | struct device_attribute *attr, |
69 | const char *buf, size_t len) | ||
69 | { | 70 | { |
70 | return store_bridge_parm(cd, buf, len, set_forward_delay); | 71 | return store_bridge_parm(d, buf, len, set_forward_delay); |
71 | } | 72 | } |
72 | static CLASS_DEVICE_ATTR(forward_delay, S_IRUGO | S_IWUSR, | 73 | static DEVICE_ATTR(forward_delay, S_IRUGO | S_IWUSR, |
73 | show_forward_delay, store_forward_delay); | 74 | show_forward_delay, store_forward_delay); |
74 | 75 | ||
75 | static ssize_t show_hello_time(struct class_device *cd, char *buf) | 76 | static ssize_t show_hello_time(struct device *d, struct device_attribute *attr, |
77 | char *buf) | ||
76 | { | 78 | { |
77 | return sprintf(buf, "%lu\n", | 79 | return sprintf(buf, "%lu\n", |
78 | jiffies_to_clock_t(to_bridge(cd)->hello_time)); | 80 | jiffies_to_clock_t(to_bridge(d)->hello_time)); |
79 | } | 81 | } |
80 | 82 | ||
81 | static void set_hello_time(struct net_bridge *br, unsigned long val) | 83 | static void set_hello_time(struct net_bridge *br, unsigned long val) |
@@ -86,19 +88,20 @@ static void set_hello_time(struct net_bridge *br, unsigned long val) | |||
86 | br->bridge_hello_time = t; | 88 | br->bridge_hello_time = t; |
87 | } | 89 | } |
88 | 90 | ||
89 | static ssize_t store_hello_time(struct class_device *cd, const char *buf, | 91 | static ssize_t store_hello_time(struct device *d, |
92 | struct device_attribute *attr, const char *buf, | ||
90 | size_t len) | 93 | size_t len) |
91 | { | 94 | { |
92 | return store_bridge_parm(cd, buf, len, set_hello_time); | 95 | return store_bridge_parm(d, buf, len, set_hello_time); |
93 | } | 96 | } |
97 | static DEVICE_ATTR(hello_time, S_IRUGO | S_IWUSR, show_hello_time, | ||
98 | store_hello_time); | ||
94 | 99 | ||
95 | static CLASS_DEVICE_ATTR(hello_time, S_IRUGO | S_IWUSR, show_hello_time, | 100 | static ssize_t show_max_age(struct device *d, struct device_attribute *attr, |
96 | store_hello_time); | 101 | char *buf) |
97 | |||
98 | static ssize_t show_max_age(struct class_device *cd, char *buf) | ||
99 | { | 102 | { |
100 | return sprintf(buf, "%lu\n", | 103 | return sprintf(buf, "%lu\n", |
101 | jiffies_to_clock_t(to_bridge(cd)->max_age)); | 104 | jiffies_to_clock_t(to_bridge(d)->max_age)); |
102 | } | 105 | } |
103 | 106 | ||
104 | static void set_max_age(struct net_bridge *br, unsigned long val) | 107 | static void set_max_age(struct net_bridge *br, unsigned long val) |
@@ -109,18 +112,17 @@ static void set_max_age(struct net_bridge *br, unsigned long val) | |||
109 | br->bridge_max_age = t; | 112 | br->bridge_max_age = t; |
110 | } | 113 | } |
111 | 114 | ||
112 | static ssize_t store_max_age(struct class_device *cd, const char *buf, | 115 | static ssize_t store_max_age(struct device *d, struct device_attribute *attr, |
113 | size_t len) | 116 | const char *buf, size_t len) |
114 | { | 117 | { |
115 | return store_bridge_parm(cd, buf, len, set_max_age); | 118 | return store_bridge_parm(d, buf, len, set_max_age); |
116 | } | 119 | } |
120 | static DEVICE_ATTR(max_age, S_IRUGO | S_IWUSR, show_max_age, store_max_age); | ||
117 | 121 | ||
118 | static CLASS_DEVICE_ATTR(max_age, S_IRUGO | S_IWUSR, show_max_age, | 122 | static ssize_t show_ageing_time(struct device *d, |
119 | store_max_age); | 123 | struct device_attribute *attr, char *buf) |
120 | |||
121 | static ssize_t show_ageing_time(struct class_device *cd, char *buf) | ||
122 | { | 124 | { |
123 | struct net_bridge *br = to_bridge(cd); | 125 | struct net_bridge *br = to_bridge(d); |
124 | return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->ageing_time)); | 126 | return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->ageing_time)); |
125 | } | 127 | } |
126 | 128 | ||
@@ -129,17 +131,19 @@ static void set_ageing_time(struct net_bridge *br, unsigned long val) | |||
129 | br->ageing_time = clock_t_to_jiffies(val); | 131 | br->ageing_time = clock_t_to_jiffies(val); |
130 | } | 132 | } |
131 | 133 | ||
132 | static ssize_t store_ageing_time(struct class_device *cd, const char *buf, | 134 | static ssize_t store_ageing_time(struct device *d, |
133 | size_t len) | 135 | struct device_attribute *attr, |
136 | const char *buf, size_t len) | ||
134 | { | 137 | { |
135 | return store_bridge_parm(cd, buf, len, set_ageing_time); | 138 | return store_bridge_parm(d, buf, len, set_ageing_time); |
136 | } | 139 | } |
140 | static DEVICE_ATTR(ageing_time, S_IRUGO | S_IWUSR, show_ageing_time, | ||
141 | store_ageing_time); | ||
137 | 142 | ||
138 | static CLASS_DEVICE_ATTR(ageing_time, S_IRUGO | S_IWUSR, show_ageing_time, | 143 | static ssize_t show_stp_state(struct device *d, |
139 | store_ageing_time); | 144 | struct device_attribute *attr, char *buf) |
140 | static ssize_t show_stp_state(struct class_device *cd, char *buf) | ||
141 | { | 145 | { |
142 | struct net_bridge *br = to_bridge(cd); | 146 | struct net_bridge *br = to_bridge(d); |
143 | return sprintf(buf, "%d\n", br->stp_enabled); | 147 | return sprintf(buf, "%d\n", br->stp_enabled); |
144 | } | 148 | } |
145 | 149 | ||
@@ -148,18 +152,19 @@ static void set_stp_state(struct net_bridge *br, unsigned long val) | |||
148 | br->stp_enabled = val; | 152 | br->stp_enabled = val; |
149 | } | 153 | } |
150 | 154 | ||
151 | static ssize_t store_stp_state(struct class_device *cd, | 155 | static ssize_t store_stp_state(struct device *d, |
152 | const char *buf, size_t len) | 156 | struct device_attribute *attr, const char *buf, |
157 | size_t len) | ||
153 | { | 158 | { |
154 | return store_bridge_parm(cd, buf, len, set_stp_state); | 159 | return store_bridge_parm(d, buf, len, set_stp_state); |
155 | } | 160 | } |
161 | static DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state, | ||
162 | store_stp_state); | ||
156 | 163 | ||
157 | static CLASS_DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state, | 164 | static ssize_t show_priority(struct device *d, struct device_attribute *attr, |
158 | store_stp_state); | 165 | char *buf) |
159 | |||
160 | static ssize_t show_priority(struct class_device *cd, char *buf) | ||
161 | { | 166 | { |
162 | struct net_bridge *br = to_bridge(cd); | 167 | struct net_bridge *br = to_bridge(d); |
163 | return sprintf(buf, "%d\n", | 168 | return sprintf(buf, "%d\n", |
164 | (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1]); | 169 | (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1]); |
165 | } | 170 | } |
@@ -169,92 +174,107 @@ static void set_priority(struct net_bridge *br, unsigned long val) | |||
169 | br_stp_set_bridge_priority(br, (u16) val); | 174 | br_stp_set_bridge_priority(br, (u16) val); |
170 | } | 175 | } |
171 | 176 | ||
172 | static ssize_t store_priority(struct class_device *cd, | 177 | static ssize_t store_priority(struct device *d, struct device_attribute *attr, |
173 | const char *buf, size_t len) | 178 | const char *buf, size_t len) |
174 | { | 179 | { |
175 | return store_bridge_parm(cd, buf, len, set_priority); | 180 | return store_bridge_parm(d, buf, len, set_priority); |
176 | } | 181 | } |
177 | static CLASS_DEVICE_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, | 182 | static DEVICE_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, store_priority); |
178 | store_priority); | ||
179 | 183 | ||
180 | static ssize_t show_root_id(struct class_device *cd, char *buf) | 184 | static ssize_t show_root_id(struct device *d, struct device_attribute *attr, |
185 | char *buf) | ||
181 | { | 186 | { |
182 | return br_show_bridge_id(buf, &to_bridge(cd)->designated_root); | 187 | return br_show_bridge_id(buf, &to_bridge(d)->designated_root); |
183 | } | 188 | } |
184 | static CLASS_DEVICE_ATTR(root_id, S_IRUGO, show_root_id, NULL); | 189 | static DEVICE_ATTR(root_id, S_IRUGO, show_root_id, NULL); |
185 | 190 | ||
186 | static ssize_t show_bridge_id(struct class_device *cd, char *buf) | 191 | static ssize_t show_bridge_id(struct device *d, struct device_attribute *attr, |
192 | char *buf) | ||
187 | { | 193 | { |
188 | return br_show_bridge_id(buf, &to_bridge(cd)->bridge_id); | 194 | return br_show_bridge_id(buf, &to_bridge(d)->bridge_id); |
189 | } | 195 | } |
190 | static CLASS_DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL); | 196 | static DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL); |
191 | 197 | ||
192 | static ssize_t show_root_port(struct class_device *cd, char *buf) | 198 | static ssize_t show_root_port(struct device *d, struct device_attribute *attr, |
199 | char *buf) | ||
193 | { | 200 | { |
194 | return sprintf(buf, "%d\n", to_bridge(cd)->root_port); | 201 | return sprintf(buf, "%d\n", to_bridge(d)->root_port); |
195 | } | 202 | } |
196 | static CLASS_DEVICE_ATTR(root_port, S_IRUGO, show_root_port, NULL); | 203 | static DEVICE_ATTR(root_port, S_IRUGO, show_root_port, NULL); |
197 | 204 | ||
198 | static ssize_t show_root_path_cost(struct class_device *cd, char *buf) | 205 | static ssize_t show_root_path_cost(struct device *d, |
206 | struct device_attribute *attr, char *buf) | ||
199 | { | 207 | { |
200 | return sprintf(buf, "%d\n", to_bridge(cd)->root_path_cost); | 208 | return sprintf(buf, "%d\n", to_bridge(d)->root_path_cost); |
201 | } | 209 | } |
202 | static CLASS_DEVICE_ATTR(root_path_cost, S_IRUGO, show_root_path_cost, NULL); | 210 | static DEVICE_ATTR(root_path_cost, S_IRUGO, show_root_path_cost, NULL); |
203 | 211 | ||
204 | static ssize_t show_topology_change(struct class_device *cd, char *buf) | 212 | static ssize_t show_topology_change(struct device *d, |
213 | struct device_attribute *attr, char *buf) | ||
205 | { | 214 | { |
206 | return sprintf(buf, "%d\n", to_bridge(cd)->topology_change); | 215 | return sprintf(buf, "%d\n", to_bridge(d)->topology_change); |
207 | } | 216 | } |
208 | static CLASS_DEVICE_ATTR(topology_change, S_IRUGO, show_topology_change, NULL); | 217 | static DEVICE_ATTR(topology_change, S_IRUGO, show_topology_change, NULL); |
209 | 218 | ||
210 | static ssize_t show_topology_change_detected(struct class_device *cd, char *buf) | 219 | static ssize_t show_topology_change_detected(struct device *d, |
220 | struct device_attribute *attr, | ||
221 | char *buf) | ||
211 | { | 222 | { |
212 | struct net_bridge *br = to_bridge(cd); | 223 | struct net_bridge *br = to_bridge(d); |
213 | return sprintf(buf, "%d\n", br->topology_change_detected); | 224 | return sprintf(buf, "%d\n", br->topology_change_detected); |
214 | } | 225 | } |
215 | static CLASS_DEVICE_ATTR(topology_change_detected, S_IRUGO, show_topology_change_detected, NULL); | 226 | static DEVICE_ATTR(topology_change_detected, S_IRUGO, |
227 | show_topology_change_detected, NULL); | ||
216 | 228 | ||
217 | static ssize_t show_hello_timer(struct class_device *cd, char *buf) | 229 | static ssize_t show_hello_timer(struct device *d, |
230 | struct device_attribute *attr, char *buf) | ||
218 | { | 231 | { |
219 | struct net_bridge *br = to_bridge(cd); | 232 | struct net_bridge *br = to_bridge(d); |
220 | return sprintf(buf, "%ld\n", br_timer_value(&br->hello_timer)); | 233 | return sprintf(buf, "%ld\n", br_timer_value(&br->hello_timer)); |
221 | } | 234 | } |
222 | static CLASS_DEVICE_ATTR(hello_timer, S_IRUGO, show_hello_timer, NULL); | 235 | static DEVICE_ATTR(hello_timer, S_IRUGO, show_hello_timer, NULL); |
223 | 236 | ||
224 | static ssize_t show_tcn_timer(struct class_device *cd, char *buf) | 237 | static ssize_t show_tcn_timer(struct device *d, struct device_attribute *attr, |
238 | char *buf) | ||
225 | { | 239 | { |
226 | struct net_bridge *br = to_bridge(cd); | 240 | struct net_bridge *br = to_bridge(d); |
227 | return sprintf(buf, "%ld\n", br_timer_value(&br->tcn_timer)); | 241 | return sprintf(buf, "%ld\n", br_timer_value(&br->tcn_timer)); |
228 | } | 242 | } |
229 | static CLASS_DEVICE_ATTR(tcn_timer, S_IRUGO, show_tcn_timer, NULL); | 243 | static DEVICE_ATTR(tcn_timer, S_IRUGO, show_tcn_timer, NULL); |
230 | 244 | ||
231 | static ssize_t show_topology_change_timer(struct class_device *cd, char *buf) | 245 | static ssize_t show_topology_change_timer(struct device *d, |
246 | struct device_attribute *attr, | ||
247 | char *buf) | ||
232 | { | 248 | { |
233 | struct net_bridge *br = to_bridge(cd); | 249 | struct net_bridge *br = to_bridge(d); |
234 | return sprintf(buf, "%ld\n", br_timer_value(&br->topology_change_timer)); | 250 | return sprintf(buf, "%ld\n", br_timer_value(&br->topology_change_timer)); |
235 | } | 251 | } |
236 | static CLASS_DEVICE_ATTR(topology_change_timer, S_IRUGO, show_topology_change_timer, NULL); | 252 | static DEVICE_ATTR(topology_change_timer, S_IRUGO, show_topology_change_timer, |
253 | NULL); | ||
237 | 254 | ||
238 | static ssize_t show_gc_timer(struct class_device *cd, char *buf) | 255 | static ssize_t show_gc_timer(struct device *d, struct device_attribute *attr, |
256 | char *buf) | ||
239 | { | 257 | { |
240 | struct net_bridge *br = to_bridge(cd); | 258 | struct net_bridge *br = to_bridge(d); |
241 | return sprintf(buf, "%ld\n", br_timer_value(&br->gc_timer)); | 259 | return sprintf(buf, "%ld\n", br_timer_value(&br->gc_timer)); |
242 | } | 260 | } |
243 | static CLASS_DEVICE_ATTR(gc_timer, S_IRUGO, show_gc_timer, NULL); | 261 | static DEVICE_ATTR(gc_timer, S_IRUGO, show_gc_timer, NULL); |
244 | 262 | ||
245 | static ssize_t show_group_addr(struct class_device *cd, char *buf) | 263 | static ssize_t show_group_addr(struct device *d, |
264 | struct device_attribute *attr, char *buf) | ||
246 | { | 265 | { |
247 | struct net_bridge *br = to_bridge(cd); | 266 | struct net_bridge *br = to_bridge(d); |
248 | return sprintf(buf, "%x:%x:%x:%x:%x:%x\n", | 267 | return sprintf(buf, "%x:%x:%x:%x:%x:%x\n", |
249 | br->group_addr[0], br->group_addr[1], | 268 | br->group_addr[0], br->group_addr[1], |
250 | br->group_addr[2], br->group_addr[3], | 269 | br->group_addr[2], br->group_addr[3], |
251 | br->group_addr[4], br->group_addr[5]); | 270 | br->group_addr[4], br->group_addr[5]); |
252 | } | 271 | } |
253 | 272 | ||
254 | static ssize_t store_group_addr(struct class_device *cd, const char *buf, | 273 | static ssize_t store_group_addr(struct device *d, |
255 | size_t len) | 274 | struct device_attribute *attr, |
275 | const char *buf, size_t len) | ||
256 | { | 276 | { |
257 | struct net_bridge *br = to_bridge(cd); | 277 | struct net_bridge *br = to_bridge(d); |
258 | unsigned new_addr[6]; | 278 | unsigned new_addr[6]; |
259 | int i; | 279 | int i; |
260 | 280 | ||
@@ -286,28 +306,28 @@ static ssize_t store_group_addr(struct class_device *cd, const char *buf, | |||
286 | return len; | 306 | return len; |
287 | } | 307 | } |
288 | 308 | ||
289 | static CLASS_DEVICE_ATTR(group_addr, S_IRUGO | S_IWUSR, | 309 | static DEVICE_ATTR(group_addr, S_IRUGO | S_IWUSR, |
290 | show_group_addr, store_group_addr); | 310 | show_group_addr, store_group_addr); |
291 | 311 | ||
292 | 312 | ||
293 | static struct attribute *bridge_attrs[] = { | 313 | static struct attribute *bridge_attrs[] = { |
294 | &class_device_attr_forward_delay.attr, | 314 | &dev_attr_forward_delay.attr, |
295 | &class_device_attr_hello_time.attr, | 315 | &dev_attr_hello_time.attr, |
296 | &class_device_attr_max_age.attr, | 316 | &dev_attr_max_age.attr, |
297 | &class_device_attr_ageing_time.attr, | 317 | &dev_attr_ageing_time.attr, |
298 | &class_device_attr_stp_state.attr, | 318 | &dev_attr_stp_state.attr, |
299 | &class_device_attr_priority.attr, | 319 | &dev_attr_priority.attr, |
300 | &class_device_attr_bridge_id.attr, | 320 | &dev_attr_bridge_id.attr, |
301 | &class_device_attr_root_id.attr, | 321 | &dev_attr_root_id.attr, |
302 | &class_device_attr_root_path_cost.attr, | 322 | &dev_attr_root_path_cost.attr, |
303 | &class_device_attr_root_port.attr, | 323 | &dev_attr_root_port.attr, |
304 | &class_device_attr_topology_change.attr, | 324 | &dev_attr_topology_change.attr, |
305 | &class_device_attr_topology_change_detected.attr, | 325 | &dev_attr_topology_change_detected.attr, |
306 | &class_device_attr_hello_timer.attr, | 326 | &dev_attr_hello_timer.attr, |
307 | &class_device_attr_tcn_timer.attr, | 327 | &dev_attr_tcn_timer.attr, |
308 | &class_device_attr_topology_change_timer.attr, | 328 | &dev_attr_topology_change_timer.attr, |
309 | &class_device_attr_gc_timer.attr, | 329 | &dev_attr_gc_timer.attr, |
310 | &class_device_attr_group_addr.attr, | 330 | &dev_attr_group_addr.attr, |
311 | NULL | 331 | NULL |
312 | }; | 332 | }; |
313 | 333 | ||
@@ -325,8 +345,8 @@ static struct attribute_group bridge_group = { | |||
325 | static ssize_t brforward_read(struct kobject *kobj, char *buf, | 345 | static ssize_t brforward_read(struct kobject *kobj, char *buf, |
326 | loff_t off, size_t count) | 346 | loff_t off, size_t count) |
327 | { | 347 | { |
328 | struct class_device *cdev = to_class_dev(kobj); | 348 | struct device *dev = to_dev(kobj); |
329 | struct net_bridge *br = to_bridge(cdev); | 349 | struct net_bridge *br = to_bridge(dev); |
330 | int n; | 350 | int n; |
331 | 351 | ||
332 | /* must read whole records */ | 352 | /* must read whole records */ |
@@ -363,7 +383,7 @@ static struct bin_attribute bridge_forward = { | |||
363 | */ | 383 | */ |
364 | int br_sysfs_addbr(struct net_device *dev) | 384 | int br_sysfs_addbr(struct net_device *dev) |
365 | { | 385 | { |
366 | struct kobject *brobj = &dev->class_dev.kobj; | 386 | struct kobject *brobj = &dev->dev.kobj; |
367 | struct net_bridge *br = netdev_priv(dev); | 387 | struct net_bridge *br = netdev_priv(dev); |
368 | int err; | 388 | int err; |
369 | 389 | ||
@@ -395,9 +415,9 @@ int br_sysfs_addbr(struct net_device *dev) | |||
395 | } | 415 | } |
396 | return 0; | 416 | return 0; |
397 | out3: | 417 | out3: |
398 | sysfs_remove_bin_file(&dev->class_dev.kobj, &bridge_forward); | 418 | sysfs_remove_bin_file(&dev->dev.kobj, &bridge_forward); |
399 | out2: | 419 | out2: |
400 | sysfs_remove_group(&dev->class_dev.kobj, &bridge_group); | 420 | sysfs_remove_group(&dev->dev.kobj, &bridge_group); |
401 | out1: | 421 | out1: |
402 | return err; | 422 | return err; |
403 | 423 | ||
@@ -405,7 +425,7 @@ int br_sysfs_addbr(struct net_device *dev) | |||
405 | 425 | ||
406 | void br_sysfs_delbr(struct net_device *dev) | 426 | void br_sysfs_delbr(struct net_device *dev) |
407 | { | 427 | { |
408 | struct kobject *kobj = &dev->class_dev.kobj; | 428 | struct kobject *kobj = &dev->dev.kobj; |
409 | struct net_bridge *br = netdev_priv(dev); | 429 | struct net_bridge *br = netdev_priv(dev); |
410 | 430 | ||
411 | kobject_unregister(&br->ifobj); | 431 | kobject_unregister(&br->ifobj); |
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index c51c9e42aeb3..0bc2aef8f9f3 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c | |||
@@ -211,7 +211,7 @@ int br_sysfs_addif(struct net_bridge_port *p) | |||
211 | struct brport_attribute **a; | 211 | struct brport_attribute **a; |
212 | int err; | 212 | int err; |
213 | 213 | ||
214 | err = sysfs_create_link(&p->kobj, &br->dev->class_dev.kobj, | 214 | err = sysfs_create_link(&p->kobj, &br->dev->dev.kobj, |
215 | SYSFS_BRIDGE_PORT_LINK); | 215 | SYSFS_BRIDGE_PORT_LINK); |
216 | if (err) | 216 | if (err) |
217 | goto out2; | 217 | goto out2; |