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
b89b1c73
Commit
b89b1c73
authored
Sep 18, 2002
by
Alan Cox
Committed by
Jeff Garzik
Sep 18, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hp100 net driver update (probably from HP originally):
* add EISA 10/100 card id * properly align rx skbs
parent
2d4c76c0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
drivers/net/hp100.c
drivers/net/hp100.c
+7
-2
No files found.
drivers/net/hp100.c
View file @
b89b1c73
...
@@ -236,6 +236,9 @@ static struct hp100_eisa_id hp100_eisa_ids[] = {
...
@@ -236,6 +236,9 @@ static struct hp100_eisa_id hp100_eisa_ids[] = {
/* 10/100 ISA card with Cascade chip */
/* 10/100 ISA card with Cascade chip */
{
0x5019F022
,
"HP J2573"
,
HP100_BUS_ISA
},
{
0x5019F022
,
"HP J2573"
,
HP100_BUS_ISA
},
/* 10/100 EISA card with AT&T chip */
{
0x9019f022
,
"HP J2577"
,
HP100_BUS_EISA
},
/* 10/100 PCI card - old J2585A */
/* 10/100 PCI card - old J2585A */
{
0x1030103c
,
"HP J2585A"
,
HP100_BUS_PCI
},
{
0x1030103c
,
"HP J2585A"
,
HP100_BUS_PCI
},
...
@@ -1879,7 +1882,7 @@ static void hp100_rx(struct net_device *dev)
...
@@ -1879,7 +1882,7 @@ static void hp100_rx(struct net_device *dev)
#endif
#endif
/* Now we allocate the skb and transfer the data into it. */
/* Now we allocate the skb and transfer the data into it. */
skb
=
dev_alloc_skb
(
pkt_len
);
skb
=
dev_alloc_skb
(
pkt_len
+
2
);
if
(
skb
==
NULL
)
{
/* Not enough memory->drop packet */
if
(
skb
==
NULL
)
{
/* Not enough memory->drop packet */
#ifdef HP100_DEBUG
#ifdef HP100_DEBUG
printk
(
"hp100: %s: rx: couldn't allocate a sk_buff of size %d
\n
"
,
printk
(
"hp100: %s: rx: couldn't allocate a sk_buff of size %d
\n
"
,
...
@@ -1890,10 +1893,12 @@ static void hp100_rx(struct net_device *dev)
...
@@ -1890,10 +1893,12 @@ static void hp100_rx(struct net_device *dev)
u_char
*
ptr
;
u_char
*
ptr
;
skb_reserve
(
skb
,
2
);
skb
->
dev
=
dev
;
skb
->
dev
=
dev
;
/* ptr to start of the sk_buff data area */
/* ptr to start of the sk_buff data area */
ptr
=
(
u_char
*
)
skb_put
(
skb
,
pkt_len
);
skb_put
(
skb
,
pkt_len
);
ptr
=
skb
->
data
;
/* Now transfer the data from the card into that area */
/* Now transfer the data from the card into that area */
if
(
lp
->
mode
==
2
)
{
if
(
lp
->
mode
==
2
)
{
...
...
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