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