projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[deliverable/linux.git]
/
net
/
bridge
/
br_stp.c
diff --git
a/net/bridge/br_stp.c
b/net/bridge/br_stp.c
index 9cb7044d0801605c629cadb5bb775b8c3725bcbc..9258b8ef14ff5f0b65af145b2fb9e517efa4eddd 100644
(file)
--- a/
net/bridge/br_stp.c
+++ b/
net/bridge/br_stp.c
@@
-570,7
+570,7
@@
int br_set_max_age(struct net_bridge *br, unsigned long val)
*
* Offloaded switch entries maybe more restrictive
*/
-int br_set_ageing_time(struct net_bridge *br,
u32
ageing_time)
+int br_set_ageing_time(struct net_bridge *br,
clock_t
ageing_time)
{
struct switchdev_attr attr = {
.orig_dev = br->dev,
This page took
0.028832 seconds
and
5
git commands to generate.