Skip to content

Commit 61c4cb6

Browse files
committed
only modify packet filter when oid is called
1 parent 27cf82e commit 61c4cb6

File tree

1 file changed

+6
-4
lines changed
  • vm/devices/net/netvsp/src

1 file changed

+6
-4
lines changed

vm/devices/net/netvsp/src/lib.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2828,7 +2828,9 @@ impl<T: RingMem> NetChannel<T> {
28282828
if restart_endpoint {
28292829
self.restart = Some(CoordinatorMessage::Restart);
28302830
}
2831-
self.packet_filter = packet_filter;
2831+
if let Some(pf) = packet_filter {
2832+
self.packet_filter = pf;
2833+
}
28322834
rndisprot::STATUS_SUCCESS
28332835
}
28342836
Err(err) => {
@@ -3329,14 +3331,14 @@ impl Adapter {
33293331
primary: &mut PrimaryChannelState,
33303332
oid: rndisprot::Oid,
33313333
reader: impl MemoryRead + Clone,
3332-
) -> Result<(bool, u32), OidError> {
3334+
) -> Result<(bool, Option<u32>), OidError> {
33333335
tracing::debug!(?oid, "oid set");
33343336

33353337
let mut restart_endpoint = false;
3336-
let mut packet_filter = 0u32;
3338+
let mut packet_filter = None;
33373339
match oid {
33383340
rndisprot::Oid::OID_GEN_CURRENT_PACKET_FILTER => {
3339-
packet_filter = self.oid_set_packet_filter(reader, primary)?;
3341+
packet_filter = Some(self.oid_set_packet_filter(reader, primary)?);
33403342
}
33413343
rndisprot::Oid::OID_TCP_OFFLOAD_PARAMETERS => {
33423344
self.oid_set_offload_parameters(reader, primary)?;

0 commit comments

Comments
 (0)