git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net/mlx4_en: Fix mixed PFC and Global pause user control requests
[pandora-kernel.git]
/
net
/
bridge
/
br_stp.c
diff --git
a/net/bridge/br_stp.c
b/net/bridge/br_stp.c
index
dd147d7
..
8ac946f
100644
(file)
--- a/
net/bridge/br_stp.c
+++ b/
net/bridge/br_stp.c
@@
-189,7
+189,7
@@
static void br_record_config_information(struct net_bridge_port *p,
p->designated_age = jiffies + bpdu->message_age;
mod_timer(&p->message_age_timer, jiffies
- + (
p->br
->max_age - bpdu->message_age));
+ + (
bpdu
->max_age - bpdu->message_age));
}
/* called under bridge lock */