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