1 // SPDX-License-Identifier: GPL-2.0-or-later 1 // SPDX-License-Identifier: GPL-2.0-or-later
2 /* 2 /*
3 * Sysfs attributes of bridge ports 3 * Sysfs attributes of bridge ports
4 * Linux ethernet bridge 4 * Linux ethernet bridge
5 * 5 *
6 * Authors: 6 * Authors:
7 * Stephen Hemminger <shemm 7 * Stephen Hemminger <shemminger@osdl.org>
8 */ 8 */
9 9
10 #include <linux/capability.h> 10 #include <linux/capability.h>
11 #include <linux/kernel.h> 11 #include <linux/kernel.h>
12 #include <linux/netdevice.h> 12 #include <linux/netdevice.h>
13 #include <linux/if_bridge.h> 13 #include <linux/if_bridge.h>
14 #include <linux/rtnetlink.h> 14 #include <linux/rtnetlink.h>
15 #include <linux/spinlock.h> 15 #include <linux/spinlock.h>
16 #include <linux/sched/signal.h> 16 #include <linux/sched/signal.h>
17 17
18 #include "br_private.h" 18 #include "br_private.h"
19 19
20 /* IMPORTANT: new bridge port options must be 20 /* IMPORTANT: new bridge port options must be added with netlink support only
21 * please do not add new sysfs entr 21 * please do not add new sysfs entries
22 */ 22 */
23 23
24 struct brport_attribute { 24 struct brport_attribute {
25 struct attribute attr; 25 struct attribute attr;
26 ssize_t (*show)(struct net_bridge_port 26 ssize_t (*show)(struct net_bridge_port *, char *);
27 int (*store)(struct net_bridge_port *, 27 int (*store)(struct net_bridge_port *, unsigned long);
28 int (*store_raw)(struct net_bridge_por 28 int (*store_raw)(struct net_bridge_port *, char *);
29 }; 29 };
30 30
31 #define BRPORT_ATTR_RAW(_name, _mode, _show, _ 31 #define BRPORT_ATTR_RAW(_name, _mode, _show, _store) \
32 const struct brport_attribute brport_attr_##_n 32 const struct brport_attribute brport_attr_##_name = { \
33 .attr = {.name = __stringify 33 .attr = {.name = __stringify(_name), \
34 .mode = _mode }, 34 .mode = _mode }, \
35 .show = _show, 35 .show = _show, \
36 .store_raw = _store, 36 .store_raw = _store, \
37 }; 37 };
38 38
39 #define BRPORT_ATTR(_name, _mode, _show, _stor 39 #define BRPORT_ATTR(_name, _mode, _show, _store) \
40 const struct brport_attribute brport_attr_##_n 40 const struct brport_attribute brport_attr_##_name = { \
41 .attr = {.name = __stringify(_name), 41 .attr = {.name = __stringify(_name), \
42 .mode = _mode }, 42 .mode = _mode }, \
43 .show = _show, 43 .show = _show, \
44 .store = _store, 44 .store = _store, \
45 }; 45 };
46 46
47 #define BRPORT_ATTR_FLAG(_name, _mask) 47 #define BRPORT_ATTR_FLAG(_name, _mask) \
48 static ssize_t show_##_name(struct net_bridge_ 48 static ssize_t show_##_name(struct net_bridge_port *p, char *buf) \
49 { 49 { \
50 return sprintf(buf, "%d\n", !!(p->flag 50 return sprintf(buf, "%d\n", !!(p->flags & _mask)); \
51 } 51 } \
52 static int store_##_name(struct net_bridge_por 52 static int store_##_name(struct net_bridge_port *p, unsigned long v) \
53 { 53 { \
54 return store_flag(p, v, _mask); 54 return store_flag(p, v, _mask); \
55 } 55 } \
56 static BRPORT_ATTR(_name, 0644, 56 static BRPORT_ATTR(_name, 0644, \
57 show_##_name, store_##_name 57 show_##_name, store_##_name)
58 58
59 static int store_flag(struct net_bridge_port * 59 static int store_flag(struct net_bridge_port *p, unsigned long v,
60 unsigned long mask) 60 unsigned long mask)
61 { 61 {
62 struct netlink_ext_ack extack = {0}; 62 struct netlink_ext_ack extack = {0};
63 unsigned long flags = p->flags; 63 unsigned long flags = p->flags;
64 int err; 64 int err;
65 65
66 if (v) 66 if (v)
67 flags |= mask; 67 flags |= mask;
68 else 68 else
69 flags &= ~mask; 69 flags &= ~mask;
70 70
71 if (flags != p->flags) { 71 if (flags != p->flags) {
72 err = br_switchdev_set_port_fl 72 err = br_switchdev_set_port_flag(p, flags, mask, &extack);
73 if (err) { 73 if (err) {
74 netdev_err(p->dev, "%s 74 netdev_err(p->dev, "%s\n", extack._msg);
75 return err; 75 return err;
76 } 76 }
77 77
78 p->flags = flags; 78 p->flags = flags;
79 br_port_flags_change(p, mask); 79 br_port_flags_change(p, mask);
80 } 80 }
81 return 0; 81 return 0;
82 } 82 }
83 83
84 static ssize_t show_path_cost(struct net_bridg 84 static ssize_t show_path_cost(struct net_bridge_port *p, char *buf)
85 { 85 {
86 return sprintf(buf, "%d\n", p->path_co 86 return sprintf(buf, "%d\n", p->path_cost);
87 } 87 }
88 88
89 static BRPORT_ATTR(path_cost, 0644, 89 static BRPORT_ATTR(path_cost, 0644,
90 show_path_cost, br_stp_set_ 90 show_path_cost, br_stp_set_path_cost);
91 91
92 static ssize_t show_priority(struct net_bridge 92 static ssize_t show_priority(struct net_bridge_port *p, char *buf)
93 { 93 {
94 return sprintf(buf, "%d\n", p->priorit 94 return sprintf(buf, "%d\n", p->priority);
95 } 95 }
96 96
97 static BRPORT_ATTR(priority, 0644, 97 static BRPORT_ATTR(priority, 0644,
98 show_priority, br_stp 98 show_priority, br_stp_set_port_priority);
99 99
100 static ssize_t show_designated_root(struct net 100 static ssize_t show_designated_root(struct net_bridge_port *p, char *buf)
101 { 101 {
102 return br_show_bridge_id(buf, &p->desi 102 return br_show_bridge_id(buf, &p->designated_root);
103 } 103 }
104 static BRPORT_ATTR(designated_root, 0444, show 104 static BRPORT_ATTR(designated_root, 0444, show_designated_root, NULL);
105 105
106 static ssize_t show_designated_bridge(struct n 106 static ssize_t show_designated_bridge(struct net_bridge_port *p, char *buf)
107 { 107 {
108 return br_show_bridge_id(buf, &p->desi 108 return br_show_bridge_id(buf, &p->designated_bridge);
109 } 109 }
110 static BRPORT_ATTR(designated_bridge, 0444, sh 110 static BRPORT_ATTR(designated_bridge, 0444, show_designated_bridge, NULL);
111 111
112 static ssize_t show_designated_port(struct net 112 static ssize_t show_designated_port(struct net_bridge_port *p, char *buf)
113 { 113 {
114 return sprintf(buf, "%d\n", p->designa 114 return sprintf(buf, "%d\n", p->designated_port);
115 } 115 }
116 static BRPORT_ATTR(designated_port, 0444, show 116 static BRPORT_ATTR(designated_port, 0444, show_designated_port, NULL);
117 117
118 static ssize_t show_designated_cost(struct net 118 static ssize_t show_designated_cost(struct net_bridge_port *p, char *buf)
119 { 119 {
120 return sprintf(buf, "%d\n", p->designa 120 return sprintf(buf, "%d\n", p->designated_cost);
121 } 121 }
122 static BRPORT_ATTR(designated_cost, 0444, show 122 static BRPORT_ATTR(designated_cost, 0444, show_designated_cost, NULL);
123 123
124 static ssize_t show_port_id(struct net_bridge_ 124 static ssize_t show_port_id(struct net_bridge_port *p, char *buf)
125 { 125 {
126 return sprintf(buf, "0x%x\n", p->port_ 126 return sprintf(buf, "0x%x\n", p->port_id);
127 } 127 }
128 static BRPORT_ATTR(port_id, 0444, show_port_id 128 static BRPORT_ATTR(port_id, 0444, show_port_id, NULL);
129 129
130 static ssize_t show_port_no(struct net_bridge_ 130 static ssize_t show_port_no(struct net_bridge_port *p, char *buf)
131 { 131 {
132 return sprintf(buf, "0x%x\n", p->port_ 132 return sprintf(buf, "0x%x\n", p->port_no);
133 } 133 }
134 134
135 static BRPORT_ATTR(port_no, 0444, show_port_no 135 static BRPORT_ATTR(port_no, 0444, show_port_no, NULL);
136 136
137 static ssize_t show_change_ack(struct net_brid 137 static ssize_t show_change_ack(struct net_bridge_port *p, char *buf)
138 { 138 {
139 return sprintf(buf, "%d\n", p->topolog 139 return sprintf(buf, "%d\n", p->topology_change_ack);
140 } 140 }
141 static BRPORT_ATTR(change_ack, 0444, show_chan 141 static BRPORT_ATTR(change_ack, 0444, show_change_ack, NULL);
142 142
143 static ssize_t show_config_pending(struct net_ 143 static ssize_t show_config_pending(struct net_bridge_port *p, char *buf)
144 { 144 {
145 return sprintf(buf, "%d\n", p->config_ 145 return sprintf(buf, "%d\n", p->config_pending);
146 } 146 }
147 static BRPORT_ATTR(config_pending, 0444, show_ 147 static BRPORT_ATTR(config_pending, 0444, show_config_pending, NULL);
148 148
149 static ssize_t show_port_state(struct net_brid 149 static ssize_t show_port_state(struct net_bridge_port *p, char *buf)
150 { 150 {
151 return sprintf(buf, "%d\n", p->state); 151 return sprintf(buf, "%d\n", p->state);
152 } 152 }
153 static BRPORT_ATTR(state, 0444, show_port_stat 153 static BRPORT_ATTR(state, 0444, show_port_state, NULL);
154 154
155 static ssize_t show_message_age_timer(struct n 155 static ssize_t show_message_age_timer(struct net_bridge_port *p,
156 ch 156 char *buf)
157 { 157 {
158 return sprintf(buf, "%ld\n", br_timer_ 158 return sprintf(buf, "%ld\n", br_timer_value(&p->message_age_timer));
159 } 159 }
160 static BRPORT_ATTR(message_age_timer, 0444, sh 160 static BRPORT_ATTR(message_age_timer, 0444, show_message_age_timer, NULL);
161 161
162 static ssize_t show_forward_delay_timer(struct 162 static ssize_t show_forward_delay_timer(struct net_bridge_port *p,
163 ch 163 char *buf)
164 { 164 {
165 return sprintf(buf, "%ld\n", br_timer_ 165 return sprintf(buf, "%ld\n", br_timer_value(&p->forward_delay_timer));
166 } 166 }
167 static BRPORT_ATTR(forward_delay_timer, 0444, 167 static BRPORT_ATTR(forward_delay_timer, 0444, show_forward_delay_timer, NULL);
168 168
169 static ssize_t show_hold_timer(struct net_brid 169 static ssize_t show_hold_timer(struct net_bridge_port *p,
170 ch 170 char *buf)
171 { 171 {
172 return sprintf(buf, "%ld\n", br_timer_ 172 return sprintf(buf, "%ld\n", br_timer_value(&p->hold_timer));
173 } 173 }
174 static BRPORT_ATTR(hold_timer, 0444, show_hold 174 static BRPORT_ATTR(hold_timer, 0444, show_hold_timer, NULL);
175 175
176 static int store_flush(struct net_bridge_port 176 static int store_flush(struct net_bridge_port *p, unsigned long v)
177 { 177 {
178 br_fdb_delete_by_port(p->br, p, 0, 0); 178 br_fdb_delete_by_port(p->br, p, 0, 0); // Don't delete local entry
179 return 0; 179 return 0;
180 } 180 }
181 static BRPORT_ATTR(flush, 0200, NULL, store_fl 181 static BRPORT_ATTR(flush, 0200, NULL, store_flush);
182 182
183 static ssize_t show_group_fwd_mask(struct net_ 183 static ssize_t show_group_fwd_mask(struct net_bridge_port *p, char *buf)
184 { 184 {
185 return sprintf(buf, "%#x\n", p->group_ 185 return sprintf(buf, "%#x\n", p->group_fwd_mask);
186 } 186 }
187 187
188 static int store_group_fwd_mask(struct net_bri 188 static int store_group_fwd_mask(struct net_bridge_port *p,
189 unsigned long 189 unsigned long v)
190 { 190 {
191 if (v & BR_GROUPFWD_MACPAUSE) 191 if (v & BR_GROUPFWD_MACPAUSE)
192 return -EINVAL; 192 return -EINVAL;
193 p->group_fwd_mask = v; 193 p->group_fwd_mask = v;
194 194
195 return 0; 195 return 0;
196 } 196 }
197 static BRPORT_ATTR(group_fwd_mask, 0644, show_ 197 static BRPORT_ATTR(group_fwd_mask, 0644, show_group_fwd_mask,
198 store_group_fwd_mask); 198 store_group_fwd_mask);
199 199
200 static ssize_t show_backup_port(struct net_bri 200 static ssize_t show_backup_port(struct net_bridge_port *p, char *buf)
201 { 201 {
202 struct net_bridge_port *backup_p; 202 struct net_bridge_port *backup_p;
203 int ret = 0; 203 int ret = 0;
204 204
205 rcu_read_lock(); 205 rcu_read_lock();
206 backup_p = rcu_dereference(p->backup_p 206 backup_p = rcu_dereference(p->backup_port);
207 if (backup_p) 207 if (backup_p)
208 ret = sprintf(buf, "%s\n", bac 208 ret = sprintf(buf, "%s\n", backup_p->dev->name);
209 rcu_read_unlock(); 209 rcu_read_unlock();
210 210
211 return ret; 211 return ret;
212 } 212 }
213 213
214 static int store_backup_port(struct net_bridge 214 static int store_backup_port(struct net_bridge_port *p, char *buf)
215 { 215 {
216 struct net_device *backup_dev = NULL; 216 struct net_device *backup_dev = NULL;
217 char *nl = strchr(buf, '\n'); 217 char *nl = strchr(buf, '\n');
218 218
219 if (nl) 219 if (nl)
220 *nl = '\0'; 220 *nl = '\0';
221 221
222 if (strlen(buf) > 0) { 222 if (strlen(buf) > 0) {
223 backup_dev = __dev_get_by_name 223 backup_dev = __dev_get_by_name(dev_net(p->dev), buf);
224 if (!backup_dev) 224 if (!backup_dev)
225 return -ENOENT; 225 return -ENOENT;
226 } 226 }
227 227
228 return nbp_backup_change(p, backup_dev 228 return nbp_backup_change(p, backup_dev);
229 } 229 }
230 static BRPORT_ATTR_RAW(backup_port, 0644, show 230 static BRPORT_ATTR_RAW(backup_port, 0644, show_backup_port, store_backup_port);
231 231
232 BRPORT_ATTR_FLAG(hairpin_mode, BR_HAIRPIN_MODE 232 BRPORT_ATTR_FLAG(hairpin_mode, BR_HAIRPIN_MODE);
233 BRPORT_ATTR_FLAG(bpdu_guard, BR_BPDU_GUARD); 233 BRPORT_ATTR_FLAG(bpdu_guard, BR_BPDU_GUARD);
234 BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLOCK); 234 BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLOCK);
235 BRPORT_ATTR_FLAG(learning, BR_LEARNING); 235 BRPORT_ATTR_FLAG(learning, BR_LEARNING);
236 BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD); 236 BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD);
237 BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP); 237 BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
238 BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WI 238 BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
239 BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLO 239 BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD);
240 BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLO 240 BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
241 BRPORT_ATTR_FLAG(neigh_suppress, BR_NEIGH_SUPP 241 BRPORT_ATTR_FLAG(neigh_suppress, BR_NEIGH_SUPPRESS);
242 BRPORT_ATTR_FLAG(isolated, BR_ISOLATED); 242 BRPORT_ATTR_FLAG(isolated, BR_ISOLATED);
243 243
244 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING 244 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
245 static ssize_t show_multicast_router(struct ne 245 static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
246 { 246 {
247 return sprintf(buf, "%d\n", p->multica 247 return sprintf(buf, "%d\n", p->multicast_ctx.multicast_router);
248 } 248 }
249 249
250 static int store_multicast_router(struct net_b 250 static int store_multicast_router(struct net_bridge_port *p,
251 unsigned 251 unsigned long v)
252 { 252 {
253 return br_multicast_set_port_router(&p 253 return br_multicast_set_port_router(&p->multicast_ctx, v);
254 } 254 }
255 static BRPORT_ATTR(multicast_router, 0644, sho 255 static BRPORT_ATTR(multicast_router, 0644, show_multicast_router,
256 store_multicast_router); 256 store_multicast_router);
257 257
258 BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULT 258 BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
259 BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULT 259 BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UNICAST);
260 #endif 260 #endif
261 261
262 static const struct brport_attribute *brport_a 262 static const struct brport_attribute *brport_attrs[] = {
263 &brport_attr_path_cost, 263 &brport_attr_path_cost,
264 &brport_attr_priority, 264 &brport_attr_priority,
265 &brport_attr_port_id, 265 &brport_attr_port_id,
266 &brport_attr_port_no, 266 &brport_attr_port_no,
267 &brport_attr_designated_root, 267 &brport_attr_designated_root,
268 &brport_attr_designated_bridge, 268 &brport_attr_designated_bridge,
269 &brport_attr_designated_port, 269 &brport_attr_designated_port,
270 &brport_attr_designated_cost, 270 &brport_attr_designated_cost,
271 &brport_attr_state, 271 &brport_attr_state,
272 &brport_attr_change_ack, 272 &brport_attr_change_ack,
273 &brport_attr_config_pending, 273 &brport_attr_config_pending,
274 &brport_attr_message_age_timer, 274 &brport_attr_message_age_timer,
275 &brport_attr_forward_delay_timer, 275 &brport_attr_forward_delay_timer,
276 &brport_attr_hold_timer, 276 &brport_attr_hold_timer,
277 &brport_attr_flush, 277 &brport_attr_flush,
278 &brport_attr_hairpin_mode, 278 &brport_attr_hairpin_mode,
279 &brport_attr_bpdu_guard, 279 &brport_attr_bpdu_guard,
280 &brport_attr_root_block, 280 &brport_attr_root_block,
281 &brport_attr_learning, 281 &brport_attr_learning,
282 &brport_attr_unicast_flood, 282 &brport_attr_unicast_flood,
283 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING 283 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
284 &brport_attr_multicast_router, 284 &brport_attr_multicast_router,
285 &brport_attr_multicast_fast_leave, 285 &brport_attr_multicast_fast_leave,
286 &brport_attr_multicast_to_unicast, 286 &brport_attr_multicast_to_unicast,
287 #endif 287 #endif
288 &brport_attr_proxyarp, 288 &brport_attr_proxyarp,
289 &brport_attr_proxyarp_wifi, 289 &brport_attr_proxyarp_wifi,
290 &brport_attr_multicast_flood, 290 &brport_attr_multicast_flood,
291 &brport_attr_broadcast_flood, 291 &brport_attr_broadcast_flood,
292 &brport_attr_group_fwd_mask, 292 &brport_attr_group_fwd_mask,
293 &brport_attr_neigh_suppress, 293 &brport_attr_neigh_suppress,
294 &brport_attr_isolated, 294 &brport_attr_isolated,
295 &brport_attr_backup_port, 295 &brport_attr_backup_port,
296 NULL 296 NULL
297 }; 297 };
298 298
299 #define to_brport_attr(_at) container_of(_at, 299 #define to_brport_attr(_at) container_of(_at, struct brport_attribute, attr)
300 300
301 static ssize_t brport_show(struct kobject *kob 301 static ssize_t brport_show(struct kobject *kobj,
302 struct attribute *a 302 struct attribute *attr, char *buf)
303 { 303 {
304 struct brport_attribute *brport_attr = 304 struct brport_attribute *brport_attr = to_brport_attr(attr);
305 struct net_bridge_port *p = kobj_to_br 305 struct net_bridge_port *p = kobj_to_brport(kobj);
306 306
307 if (!brport_attr->show) 307 if (!brport_attr->show)
308 return -EINVAL; 308 return -EINVAL;
309 309
310 return brport_attr->show(p, buf); 310 return brport_attr->show(p, buf);
311 } 311 }
312 312
313 static ssize_t brport_store(struct kobject *ko 313 static ssize_t brport_store(struct kobject *kobj,
314 struct attribute * 314 struct attribute *attr,
315 const char *buf, s 315 const char *buf, size_t count)
316 { 316 {
317 struct brport_attribute *brport_attr = 317 struct brport_attribute *brport_attr = to_brport_attr(attr);
318 struct net_bridge_port *p = kobj_to_br 318 struct net_bridge_port *p = kobj_to_brport(kobj);
319 ssize_t ret = -EINVAL; 319 ssize_t ret = -EINVAL;
320 unsigned long val; 320 unsigned long val;
321 char *endp; 321 char *endp;
322 322
323 if (!ns_capable(dev_net(p->dev)->user_ 323 if (!ns_capable(dev_net(p->dev)->user_ns, CAP_NET_ADMIN))
324 return -EPERM; 324 return -EPERM;
325 325
326 if (!rtnl_trylock()) 326 if (!rtnl_trylock())
327 return restart_syscall(); 327 return restart_syscall();
328 328
329 if (brport_attr->store_raw) { 329 if (brport_attr->store_raw) {
330 char *buf_copy; 330 char *buf_copy;
331 331
332 buf_copy = kstrndup(buf, count 332 buf_copy = kstrndup(buf, count, GFP_KERNEL);
333 if (!buf_copy) { 333 if (!buf_copy) {
334 ret = -ENOMEM; 334 ret = -ENOMEM;
335 goto out_unlock; 335 goto out_unlock;
336 } 336 }
337 spin_lock_bh(&p->br->lock); 337 spin_lock_bh(&p->br->lock);
338 ret = brport_attr->store_raw(p 338 ret = brport_attr->store_raw(p, buf_copy);
339 spin_unlock_bh(&p->br->lock); 339 spin_unlock_bh(&p->br->lock);
340 kfree(buf_copy); 340 kfree(buf_copy);
341 } else if (brport_attr->store) { 341 } else if (brport_attr->store) {
342 val = simple_strtoul(buf, &end 342 val = simple_strtoul(buf, &endp, 0);
343 if (endp == buf) 343 if (endp == buf)
344 goto out_unlock; 344 goto out_unlock;
345 spin_lock_bh(&p->br->lock); 345 spin_lock_bh(&p->br->lock);
346 ret = brport_attr->store(p, va 346 ret = brport_attr->store(p, val);
347 spin_unlock_bh(&p->br->lock); 347 spin_unlock_bh(&p->br->lock);
348 } 348 }
349 349
350 if (!ret) { 350 if (!ret) {
351 br_ifinfo_notify(RTM_NEWLINK, 351 br_ifinfo_notify(RTM_NEWLINK, NULL, p);
352 ret = count; 352 ret = count;
353 } 353 }
354 out_unlock: 354 out_unlock:
355 rtnl_unlock(); 355 rtnl_unlock();
356 356
357 return ret; 357 return ret;
358 } 358 }
359 359
360 const struct sysfs_ops brport_sysfs_ops = { 360 const struct sysfs_ops brport_sysfs_ops = {
361 .show = brport_show, 361 .show = brport_show,
362 .store = brport_store, 362 .store = brport_store,
363 }; 363 };
364 364
365 /* 365 /*
366 * Add sysfs entries to ethernet device added 366 * Add sysfs entries to ethernet device added to a bridge.
367 * Creates a brport subdirectory with bridge a 367 * Creates a brport subdirectory with bridge attributes.
368 * Puts symlink in bridge's brif subdirectory 368 * Puts symlink in bridge's brif subdirectory
369 */ 369 */
370 int br_sysfs_addif(struct net_bridge_port *p) 370 int br_sysfs_addif(struct net_bridge_port *p)
371 { 371 {
372 struct net_bridge *br = p->br; 372 struct net_bridge *br = p->br;
373 const struct brport_attribute **a; 373 const struct brport_attribute **a;
374 int err; 374 int err;
375 375
376 err = sysfs_create_link(&p->kobj, &br- 376 err = sysfs_create_link(&p->kobj, &br->dev->dev.kobj,
377 SYSFS_BRIDGE_P 377 SYSFS_BRIDGE_PORT_LINK);
378 if (err) 378 if (err)
379 return err; 379 return err;
380 380
381 for (a = brport_attrs; *a; ++a) { 381 for (a = brport_attrs; *a; ++a) {
382 err = sysfs_create_file(&p->ko 382 err = sysfs_create_file(&p->kobj, &((*a)->attr));
383 if (err) 383 if (err)
384 return err; 384 return err;
385 } 385 }
386 386
387 strscpy(p->sysfs_name, p->dev->name, I 387 strscpy(p->sysfs_name, p->dev->name, IFNAMSIZ);
388 return sysfs_create_link(br->ifobj, &p 388 return sysfs_create_link(br->ifobj, &p->kobj, p->sysfs_name);
389 } 389 }
390 390
391 /* Rename bridge's brif symlink */ 391 /* Rename bridge's brif symlink */
392 int br_sysfs_renameif(struct net_bridge_port * 392 int br_sysfs_renameif(struct net_bridge_port *p)
393 { 393 {
394 struct net_bridge *br = p->br; 394 struct net_bridge *br = p->br;
395 int err; 395 int err;
396 396
397 /* If a rename fails, the rollback wil 397 /* If a rename fails, the rollback will cause another
398 * rename call with the existing name. 398 * rename call with the existing name.
399 */ 399 */
400 if (!strncmp(p->sysfs_name, p->dev->na 400 if (!strncmp(p->sysfs_name, p->dev->name, IFNAMSIZ))
401 return 0; 401 return 0;
402 402
403 err = sysfs_rename_link(br->ifobj, &p- 403 err = sysfs_rename_link(br->ifobj, &p->kobj,
404 p->sysfs_name, 404 p->sysfs_name, p->dev->name);
405 if (err) 405 if (err)
406 netdev_notice(br->dev, "unable 406 netdev_notice(br->dev, "unable to rename link %s to %s",
407 p->sysfs_name, p 407 p->sysfs_name, p->dev->name);
408 else 408 else
409 strscpy(p->sysfs_name, p->dev- 409 strscpy(p->sysfs_name, p->dev->name, IFNAMSIZ);
410 410
411 return err; 411 return err;
412 } 412 }
413 413
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.