Since NETDEV_RSS_KEY_LEN was increased to 256 in net-next, use BUILD_BUG_ON to enforce the limit at compile time and remove the redundant runtime max check.
Signed-off-by: Srujana Challa <[email protected]> --- drivers/net/virtio_net.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index eeefe8abc122..3092d5d9d3e4 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -6639,13 +6639,7 @@ static int virtnet_validate(struct virtio_device *vdev) __virtio_clear_bit(vdev, VIRTIO_NET_F_RSS); __virtio_clear_bit(vdev, VIRTIO_NET_F_HASH_REPORT); } - if (key_sz > NETDEV_RSS_KEY_LEN) { - dev_warn(&vdev->dev, - "rss_max_key_size=%u exceeds driver limit %u, disabling RSS\n", - key_sz, NETDEV_RSS_KEY_LEN); - __virtio_clear_bit(vdev, VIRTIO_NET_F_RSS); - __virtio_clear_bit(vdev, VIRTIO_NET_F_HASH_REPORT); - } + BUILD_BUG_ON(type_max(vi->rss_key_size) >= NETDEV_RSS_KEY_LEN); } return 0; -- 2.25.1
