Skip to content

Commit e6685fe

Browse files
Angela246carlgsmith
authored andcommitted
Prevent tc configs from applying for generic netmap adapter
1 parent e9b512f commit e6685fe

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

sys/dev/netmap/netmap_generic.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,10 @@ generic_netmap_unregister(struct netmap_adapter *na)
232232

233233
/* Stop intercepting packets on the RX path. */
234234
nm_os_catch_rx(gna, 0);
235-
235+
#ifndef ATL_CHANGE
236236
/* Release packet steering control. */
237237
nm_os_catch_tx(gna, 0);
238+
#endif
238239
}
239240

240241
netmap_krings_mode_commit(na, /*onoff=*/0);
@@ -379,12 +380,14 @@ generic_netmap_register(struct netmap_adapter *na, int enable)
379380
goto free_tx_pools;
380381
}
381382

383+
#ifndef ATL_CHANGE
382384
/* Let netmap control the packet steering. */
383385
error = nm_os_catch_tx(gna, 1);
384386
if (error) {
385387
nm_prerr("nm_os_catch_tx(1) failed (%d)", error);
386388
goto catch_rx;
387389
}
390+
#endif
388391

389392
na->na_flags |= NAF_NETMAP_ON;
390393

0 commit comments

Comments
 (0)