From nobody Sat May 10 05:25:50 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1606216112; cv=none; d=zohomail.com; s=zohoarc; b=I1i7o5PW4KFi9ckrNFLXZm3euaoRIE4XdxCvlDLz7ha0al9h6fuAwrFDRThCbs0cVGyU4k+ubfmnS733mcQn9pWXw8g2SMDeuvKaHff6arl3+BPjmlF3tOQMfYiapXuCE+hUM7PHIvbpbdE9xlciLK0m/KVMZf4xAsziM5oNjZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606216112; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Mz72ON6iAcVoILne1EEsaj+zJRzMbpxLV5Auo1ya5as=; b=WLWDqQWnc5jKlN4X029l6VDN+EM/hTPXPfeChPgM6IEH38wzLJUsJGJDmY1LZr3gUhq/fmBfmHgtzkNMiTs+uGRBn3lt/sMcxNnLUGxePIQGWUGj6RZzGdk6tkkpUf8nQun7EtD4/HS3EogGaMO1voYy1yae0LKBTZDAgxlR0X8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1606216112974797.2070163606983; Tue, 24 Nov 2020 03:08:32 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732777AbgKXLHr (ORCPT ); Tue, 24 Nov 2020 06:07:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:33792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732412AbgKXLGf (ORCPT ); Tue, 24 Nov 2020 06:06:35 -0500 Received: from mail.kernel.org (ip5f5ad5c3.dynamic.kabel-deutschland.de [95.90.213.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E4295208C3; Tue, 24 Nov 2020 11:06:30 +0000 (UTC) Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1khW9U-000FZz-W0; Tue, 24 Nov 2020 12:06:28 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606215991; bh=D2CIC5mHikcm2IfoTzSspH85X5GlEWYNzT/FcfUcSVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KnDs3jRUzvzSLQu4S7okgLoDiqN6fs6UJF2Xr67aQR5ZwbCF0z0uSN3chKIvfHGTw 6bTqXO9gkyN4JH0nABvH+e63fyofxgmuaRdaQW9/t/kVcidrK3mrwp9cVSfSxDHmAo HjQ6Ybqs/U5qBbeGgRkHNpkfdKB5xfJduFoDAs2M= From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Daniel W. S. Almeida" , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 15/31] media: vidtv: properly fill EIT service_id Date: Tue, 24 Nov 2020 12:06:11 +0100 Message-Id: <9c43dd04a208ee9a9aa19962d1da56b7c16bccf3.1606215584.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The EIT header ID field should not contain the network ID, but, instead, the service_id of the program described at EIT. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/test-drivers/vidtv/vidtv_channel.c | 3 ++- drivers/media/test-drivers/vidtv/vidtv_psi.c | 5 +++-- drivers/media/test-drivers/vidtv/vidtv_psi.h | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/media/test-drivers/vidtv/vidtv_channel.c b/drivers/med= ia/test-drivers/vidtv/vidtv_channel.c index 84c4f3f25f77..d1d312566bc0 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_channel.c +++ b/drivers/media/test-drivers/vidtv/vidtv_channel.c @@ -451,7 +451,8 @@ int vidtv_channel_si_init(struct vidtv_mux *m) goto free_service_list; =20 m->si.eit =3D vidtv_psi_eit_table_init(m->network_id, - m->transport_stream_id); + m->transport_stream_id, + programs->service_id); if (!m->si.eit) goto free_nit; =20 diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/t= est-drivers/vidtv/vidtv_psi.c index 341af312ad56..02dd217bdbf6 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.c +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c @@ -1809,7 +1809,8 @@ void vidtv_psi_eit_event_assign(struct vidtv_psi_tabl= e_eit *eit, =20 struct vidtv_psi_table_eit *vidtv_psi_eit_table_init(u16 network_id, - u16 transport_stream_id) + u16 transport_stream_id, + __be16 service_id) { struct vidtv_psi_table_eit *eit; const u16 SYNTAX =3D 0x1; @@ -1824,7 +1825,7 @@ struct vidtv_psi_table_eit =20 eit->header.bitfield =3D cpu_to_be16((SYNTAX << 15) | (ONE << 14) | (ONES= << 12)); =20 - eit->header.id =3D cpu_to_be16(network_id); + eit->header.id =3D service_id; eit->header.current_next =3D ONE; =20 eit->header.version =3D 0x1f; diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.h b/drivers/media/t= est-drivers/vidtv/vidtv_psi.h index 866fdf3d00e5..26b2c2f5774c 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.h +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.h @@ -739,7 +739,8 @@ struct vidtv_psi_table_eit { =20 struct vidtv_psi_table_eit *vidtv_psi_eit_table_init(u16 network_id, - u16 transport_stream_id); + u16 transport_stream_id, + u16 service_id); =20 =20 /** --=20 2.28.0