diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-01 09:52:20 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-01 09:52:20 +0300 |
| commit | 5510b3c2a173921374ec847848fb20b98e1c698a (patch) | |
| tree | c9e185281ef17280ce0dc30be7923124874736b0 /net/bridge/br_mdb.c | |
| parent | 17f901e8915cb922c2ca710835ef34f166f53ee9 (diff) | |
| parent | 7c764cec3703583247c4ab837c652975a3d41f4b (diff) | |
| download | linux-5510b3c2a173921374ec847848fb20b98e1c698a.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/s390/net/bpf_jit_comp.c
drivers/net/ethernet/ti/netcp_ethss.c
net/bridge/br_multicast.c
net/ipv4/ip_fragment.c
All four conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_mdb.c')
| -rw-r--r-- | net/bridge/br_mdb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 5e9d1c5e1194..6a592856da1c 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -519,6 +519,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry) if (p->port->state == BR_STATE_DISABLED) goto unlock; + entry->state = p->state; rcu_assign_pointer(*pp, p->next); hlist_del_init(&p->mglist); del_timer(&p->timer); |