Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "A set of fixes for this series. This contains:

   - Set of fixes for the nvme target code

   - A revert of patch from this merge window, causing a regression with
     WRITE_SAME on iSCSI targets at least.

   - A fix for a use-after-free in the new O_DIRECT bdev code.

   - Two fixes for the xen-blkfront driver"

* 'for-linus' of git://git.kernel.dk/linux-block:
  Revert "sd: remove __data_len hack for WRITE SAME"
  nvme-fc: use blk_rq_nr_phys_segments
  nvmet-rdma: Fix missing dma sync to nvme data structures
  nvmet: Call fatal_error from keep-alive timout expiration
  nvmet: cancel fatal error and flush async work before free controller
  nvmet: delete controllers deletion upon subsystem release
  nvmet_fc: correct logic in disconnect queue LS handling
  block: fix use after free in __blkdev_direct_IO
  xen-blkfront: correct maximum segment accounting
  xen-blkfront: feature flags handling adjustments

1 files changed, 2 insertions, 1 deletions

diff --git a/netsniff-ng.c b/netsniff-ng.c
index f447864..6cd0cf4 100644
--- a/netsniff-ng.c
+++ b/netsniff-ng.c
@@ -1278,7 +1278,8 @@ int main(int argc, char **argv)
 		case 'K':
 			if (!strncmp(optarg, "hash", strlen("hash")))
 				ctx.fanout_type = PACKET_FANOUT_HASH;
-			else if (!strncmp(optarg, "lb", strlen("lb")))
+			else if (!strncmp(optarg, "lb", strlen("lb")) ||
+				 !strncmp(optarg, "rr", strlen("rr")))
 				ctx.fanout_type = PACKET_FANOUT_LB;
 			else if (!strncmp(optarg, "cpu", strlen("cpu")))
 				ctx.fanout_type = PACKET_FANOUT_CPU;