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
bcef46b8
Commit
bcef46b8
authored
Jan 10, 2003
by
Alan Cox
Committed by
Linus Torvalds
Jan 10, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] padto - fix hp100.c using skb_padto, fix warning
parent
98fafaea
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
drivers/net/hp100.c
drivers/net/hp100.c
+12
-0
No files found.
drivers/net/hp100.c
View file @
bcef46b8
...
@@ -1555,6 +1555,12 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)
...
@@ -1555,6 +1555,12 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)
if
(
skb
->
len
<=
0
)
if
(
skb
->
len
<=
0
)
return
0
;
return
0
;
if
(
skb
->
len
<
ETH_ZLEN
&&
lp
->
chip
==
HP100_CHIPID_SHASTA
)
{
skb
=
skb_padto
(
skb
,
ETH_ZLEN
);
if
(
skb
==
NULL
)
return
0
;
}
/* Get Tx ring tail pointer */
/* Get Tx ring tail pointer */
if
(
lp
->
txrtail
->
next
==
lp
->
txrhead
)
{
if
(
lp
->
txrtail
->
next
==
lp
->
txrhead
)
{
...
@@ -2097,6 +2103,7 @@ static void hp100_misc_interrupt(struct net_device *dev)
...
@@ -2097,6 +2103,7 @@ static void hp100_misc_interrupt(struct net_device *dev)
struct
hp100_private
*
lp
=
(
struct
hp100_private
*
)
dev
->
priv
;
struct
hp100_private
*
lp
=
(
struct
hp100_private
*
)
dev
->
priv
;
#ifdef HP100_DEBUG_B
#ifdef HP100_DEBUG_B
int
ioaddr
=
dev
->
base_addr
;
hp100_outw
(
0x4216
,
TRACE
);
hp100_outw
(
0x4216
,
TRACE
);
printk
(
"hp100: %s: misc_interrupt
\n
"
,
dev
->
name
);
printk
(
"hp100: %s: misc_interrupt
\n
"
,
dev
->
name
);
#endif
#endif
...
@@ -2536,6 +2543,11 @@ static int hp100_sense_lan(struct net_device *dev)
...
@@ -2536,6 +2543,11 @@ static int hp100_sense_lan(struct net_device *dev)
return
HP100_LAN_10
;
return
HP100_LAN_10
;
if
(
val_10
&
HP100_AUI_ST
)
{
/* have we BNC or AUI onboard? */
if
(
val_10
&
HP100_AUI_ST
)
{
/* have we BNC or AUI onboard? */
/*
* This can be overriden by dos utility, so if this has no effect,
* perhaps you need to download that utility from HP and set card
* back to "auto detect".
*/
val_10
|=
HP100_AUI_SEL
|
HP100_LOW_TH
;
val_10
|=
HP100_AUI_SEL
|
HP100_LOW_TH
;
hp100_page
(
MAC_CTRL
);
hp100_page
(
MAC_CTRL
);
hp100_outb
(
val_10
,
10
_LAN_CFG_1
);
hp100_outb
(
val_10
,
10
_LAN_CFG_1
);
...
...
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