diff options
| author | Ben Pfaff <blp@nicira.com> | 2014-02-21 12:40:00 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-02-21 13:06:02 -0800 |
| commit | 19133b5df5c91f7a61a318c83d4ed79755f367d6 (patch) | |
| tree | 5b38651aa55f5c85449242f2fae0ddcdd9f708b4 | |
| parent | 97eba824fca691f4c18a4e3eb08fb1b4b22e07ef (diff) | |
| download | openvswitch-19133b5df5c91f7a61a318c83d4ed79755f367d6.tar.gz | |
ofproto-dpif: Fix segfault removing port when STP is enabled.
Reported-by: Sridhar Samudrala <samudrala.sridhar@gmail.com>
Tested-by: Sridhar Samudrala <samudrala.sridhar@gmail.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ofproto/ofproto-dpif.c | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -213,6 +213,7 @@ Sean Brady sbrady@gtfservices.com Sebastian Andrzej Siewior sebastian@breakpoint.cc Sébastien RICCIO sr@swisscenter.com Spiro Kourtessis spiro@vmware.com +Sridhar Samudrala samudrala.sridhar@gmail.com Srini Seetharaman seethara@stanford.edu Stephen Hemminger shemminger@vyatta.com Takayuki HAMA t-hama@cb.jp.nec.com diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 2dbb8c6fa..3fce1ef7b 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1820,6 +1820,9 @@ port_destruct(struct ofport *port_) bundle_remove(port_); set_cfm(port_, NULL); set_bfd(port_, NULL); + if (port->stp_port) { + stp_port_disable(port->stp_port); + } if (ofproto->sflow) { dpif_sflow_del_port(ofproto->sflow, port->odp_port); } |