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