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
nexedi
linux
Commits
d5366d9e
Commit
d5366d9e
authored
Dec 01, 2005
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-jeff' of
git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
parents
5666c094
981d9c17
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
drivers/net/b44.c
drivers/net/b44.c
+9
-4
No files found.
drivers/net/b44.c
View file @
d5366d9e
...
@@ -28,8 +28,8 @@
...
@@ -28,8 +28,8 @@
#define DRV_MODULE_NAME "b44"
#define DRV_MODULE_NAME "b44"
#define PFX DRV_MODULE_NAME ": "
#define PFX DRV_MODULE_NAME ": "
#define DRV_MODULE_VERSION "0.9
6
"
#define DRV_MODULE_VERSION "0.9
7
"
#define DRV_MODULE_RELDATE "Nov
8
, 2005"
#define DRV_MODULE_RELDATE "Nov
30
, 2005"
#define B44_DEF_MSG_ENABLE \
#define B44_DEF_MSG_ENABLE \
(NETIF_MSG_DRV | \
(NETIF_MSG_DRV | \
...
@@ -1417,6 +1417,7 @@ static int b44_open(struct net_device *dev)
...
@@ -1417,6 +1417,7 @@ static int b44_open(struct net_device *dev)
add_timer
(
&
bp
->
timer
);
add_timer
(
&
bp
->
timer
);
b44_enable_ints
(
bp
);
b44_enable_ints
(
bp
);
netif_start_queue
(
dev
);
out:
out:
return
err
;
return
err
;
}
}
...
@@ -1837,12 +1838,15 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
...
@@ -1837,12 +1838,15 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
{
struct
mii_ioctl_data
*
data
=
if_mii
(
ifr
);
struct
mii_ioctl_data
*
data
=
if_mii
(
ifr
);
struct
b44
*
bp
=
netdev_priv
(
dev
);
struct
b44
*
bp
=
netdev_priv
(
dev
);
int
err
;
int
err
=
-
EINVAL
;
if
(
!
netif_running
(
dev
))
goto
out
;
spin_lock_irq
(
&
bp
->
lock
);
spin_lock_irq
(
&
bp
->
lock
);
err
=
generic_mii_ioctl
(
&
bp
->
mii_if
,
data
,
cmd
,
NULL
);
err
=
generic_mii_ioctl
(
&
bp
->
mii_if
,
data
,
cmd
,
NULL
);
spin_unlock_irq
(
&
bp
->
lock
);
spin_unlock_irq
(
&
bp
->
lock
);
out:
return
err
;
return
err
;
}
}
...
@@ -2113,6 +2117,7 @@ static int b44_resume(struct pci_dev *pdev)
...
@@ -2113,6 +2117,7 @@ static int b44_resume(struct pci_dev *pdev)
add_timer
(
&
bp
->
timer
);
add_timer
(
&
bp
->
timer
);
b44_enable_ints
(
bp
);
b44_enable_ints
(
bp
);
netif_wake_queue
(
dev
);
return
0
;
return
0
;
}
}
...
...
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