Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
4c264484
Commit
4c264484
authored
Oct 07, 2003
by
Stephen Hemminger
Committed by
David S. Miller
Oct 07, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NET]: Convert dvb-net to use alloc_netdev().
parent
d6381d50
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
23 deletions
+18
-23
drivers/media/dvb/dvb-core/dvb_net.c
drivers/media/dvb/dvb-core/dvb_net.c
+17
-22
drivers/media/dvb/dvb-core/dvb_net.h
drivers/media/dvb/dvb-core/dvb_net.h
+1
-1
No files found.
drivers/media/dvb/dvb-core/dvb_net.c
View file @
4c264484
...
...
@@ -456,7 +456,7 @@ static struct net_device_stats * dvb_net_get_stats(struct net_device *dev)
}
static
int
dvb_net_init_dev
(
struct
net_device
*
dev
)
static
void
dvb_net_setup
(
struct
net_device
*
dev
)
{
ether_setup
(
dev
);
...
...
@@ -472,8 +472,6 @@ static int dvb_net_init_dev(struct net_device *dev)
dev
->
hard_header_cache
=
NULL
;
dev
->
flags
|=
IFF_NOARP
;
return
0
;
}
static
int
get_if
(
struct
dvb_net
*
dvbnet
)
...
...
@@ -495,7 +493,6 @@ static int get_if(struct dvb_net *dvbnet)
static
int
dvb_net_add_if
(
struct
dvb_net
*
dvbnet
,
u16
pid
)
{
struct
net_device
*
net
;
struct
dmx_demux
*
demux
;
struct
dvb_net_priv
*
priv
;
int
result
;
int
if_num
;
...
...
@@ -503,25 +500,20 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid)
if
((
if_num
=
get_if
(
dvbnet
))
<
0
)
return
-
EINVAL
;
net
=&
dvbnet
->
device
[
if_num
];
demux
=
dvbnet
->
demux
;
net
=
alloc_netdev
(
sizeof
(
struct
dvb_net_priv
),
"dvb"
,
dvb_net_setup
);
if
(
!
net
)
return
-
ENOMEM
;
memset
(
net
,
0
,
sizeof
(
struct
net_device
)
);
sprintf
(
net
->
name
,
"dvb%d_%d"
,
dvbnet
->
dvbdev
->
adapter
->
num
,
if_num
);
memcpy
(
net
->
name
,
"dvb0_0"
,
7
);
net
->
name
[
3
]
=
dvbnet
->
dvbdev
->
adapter
->
num
+
'0'
;
net
->
name
[
5
]
=
if_num
+
'0'
;
net
->
addr_len
=
6
;
net
->
addr_len
=
6
;
memcpy
(
net
->
dev_addr
,
dvbnet
->
dvbdev
->
adapter
->
proposed_mac
,
6
);
net
->
next
=
NULL
;
net
->
init
=
dvb_net_init_dev
;
if
(
!
(
net
->
priv
=
kmalloc
(
sizeof
(
struct
dvb_net_priv
),
GFP_KERNEL
)))
return
-
ENOMEM
;
dvbnet
->
device
[
if_num
]
=
net
;
priv
=
net
->
priv
;
memset
(
priv
,
0
,
sizeof
(
struct
dvb_net_priv
));
priv
->
demux
=
demux
;
priv
->
demux
=
dvbnet
->
demux
;
priv
->
pid
=
pid
;
priv
->
rx_mode
=
RX_MODE_UNI
;
...
...
@@ -531,6 +523,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid)
net
->
base_addr
=
pid
;
if
((
result
=
register_netdev
(
net
))
<
0
)
{
kfree
(
net
);
return
result
;
}
...
...
@@ -540,18 +533,20 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid)
static
int
dvb_net_remove_if
(
struct
dvb_net
*
dvbnet
,
int
num
)
{
struct
dvb_net_priv
*
priv
=
dvbnet
->
device
[
num
].
priv
;
struct
net_device
*
net
=
dvbnet
->
device
[
num
];
struct
dvb_net_priv
*
priv
=
net
->
priv
;
if
(
!
dvbnet
->
state
[
num
])
return
-
EINVAL
;
if
(
priv
->
in_use
)
return
-
EBUSY
;
dvb_net_stop
(
&
dvbnet
->
device
[
num
]
);
dvb_net_stop
(
net
);
flush_scheduled_work
();
kfree
(
priv
);
unregister_netdev
(
&
dvbnet
->
device
[
num
]);
unregister_netdev
(
net
);
dvbnet
->
state
[
num
]
=
0
;
free_netdev
(
net
);
return
0
;
}
...
...
drivers/media/dvb/dvb-core/dvb_net.h
View file @
4c264484
...
...
@@ -35,7 +35,7 @@
struct
dvb_net
{
struct
dvb_device
*
dvbdev
;
struct
net_device
device
[
DVB_NET_DEVICES_MAX
];
struct
net_device
*
device
[
DVB_NET_DEVICES_MAX
];
int
state
[
DVB_NET_DEVICES_MAX
];
struct
dmx_demux
*
demux
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment