Skip to content

Commit bfa4aae

Browse files
committed
media: vidtv: fix service_id at SDT table
The service_id there should be equal to the one used on other tables, otherwise, EIT entries won't be valid. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
1 parent 11f4933 commit bfa4aae

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

drivers/media/test-drivers/vidtv/vidtv_channel.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@ int vidtv_channel_si_init(struct vidtv_mux *m)
424424
if (!m->si.pat)
425425
return -ENOMEM;
426426

427-
m->si.sdt = vidtv_psi_sdt_table_init(m->transport_stream_id);
427+
m->si.sdt = vidtv_psi_sdt_table_init(m->network_id,
428+
m->transport_stream_id);
428429
if (!m->si.sdt)
429430
goto free_pat;
430431

drivers/media/test-drivers/vidtv/vidtv_psi.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,8 @@ void vidtv_psi_pmt_table_destroy(struct vidtv_psi_table_pmt *pmt)
12711271
kfree(pmt);
12721272
}
12731273

1274-
struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 transport_stream_id)
1274+
struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 network_id,
1275+
u16 transport_stream_id)
12751276
{
12761277
struct vidtv_psi_table_sdt *sdt;
12771278
const u16 RESERVED = 0xff;
@@ -1307,7 +1308,7 @@ struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 transport_stream_id)
13071308
* This can be changed to something more useful, when support for
13081309
* NIT gets added
13091310
*/
1310-
sdt->network_id = cpu_to_be16(0xff01);
1311+
sdt->network_id = cpu_to_be16(network_id);
13111312
sdt->reserved = RESERVED;
13121313

13131314
vidtv_psi_sdt_table_update_sec_len(sdt);

drivers/media/test-drivers/vidtv/vidtv_psi.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,8 @@ struct vidtv_psi_table_pat *vidtv_psi_pat_table_init(u16 transport_stream_id);
366366
struct vidtv_psi_table_pmt *vidtv_psi_pmt_table_init(u16 program_number,
367367
u16 pcr_pid);
368368

369-
struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 transport_stream_id);
369+
struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 network_id,
370+
u16 transport_stream_id);
370371

371372
struct vidtv_psi_table_sdt_service*
372373
vidtv_psi_sdt_service_init(struct vidtv_psi_table_sdt_service *head,

0 commit comments

Comments
 (0)