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
d21c8bd3
Commit
d21c8bd3
authored
Mar 19, 2003
by
Chas Williams
Committed by
David S. Miller
Mar 19, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ATM]: Fix idt77252/sch_atm/pppoatm compilation.
parent
e8ced837
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
drivers/atm/idt77252.c
drivers/atm/idt77252.c
+2
-2
net/atm/pppoatm.c
net/atm/pppoatm.c
+1
-1
net/sched/sch_atm.c
net/sched/sch_atm.c
+1
-1
No files found.
drivers/atm/idt77252.c
View file @
d21c8bd3
...
@@ -730,7 +730,7 @@ push_on_scq(struct idt77252_dev *card, struct vc_map *vc, struct sk_buff *skb)
...
@@ -730,7 +730,7 @@ push_on_scq(struct idt77252_dev *card, struct vc_map *vc, struct sk_buff *skb)
struct
atm_vcc
*
vcc
=
vc
->
tx_vcc
;
struct
atm_vcc
*
vcc
=
vc
->
tx_vcc
;
vc
->
estimator
->
cells
+=
(
skb
->
len
+
47
)
/
48
;
vc
->
estimator
->
cells
+=
(
skb
->
len
+
47
)
/
48
;
if
(
atomic_read
(
&
vcc
->
tx_inuse
)
>
(
vcc
->
sk
->
sndbuf
>>
1
))
{
if
(
atomic_read
(
&
vcc
->
sk
->
wmem_alloc
)
>
(
vcc
->
sk
->
sndbuf
>>
1
))
{
u32
cps
=
vc
->
estimator
->
maxcps
;
u32
cps
=
vc
->
estimator
->
maxcps
;
vc
->
estimator
->
cps
=
cps
;
vc
->
estimator
->
cps
=
cps
;
...
@@ -2025,7 +2025,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
...
@@ -2025,7 +2025,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
atomic_inc
(
&
vcc
->
stats
->
tx_err
);
atomic_inc
(
&
vcc
->
stats
->
tx_err
);
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
atomic_add
(
skb
->
truesize
+
ATM_PDU_OVHD
,
&
vcc
->
tx_inuse
);
atomic_add
(
skb
->
truesize
+
ATM_PDU_OVHD
,
&
vcc
->
sk
->
wmem_alloc
);
ATM_SKB
(
skb
)
->
iovcnt
=
0
;
ATM_SKB
(
skb
)
->
iovcnt
=
0
;
memcpy
(
skb_put
(
skb
,
52
),
cell
,
52
);
memcpy
(
skb_put
(
skb
,
52
),
cell
,
52
);
...
...
net/atm/pppoatm.c
View file @
d21c8bd3
...
@@ -231,7 +231,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
...
@@ -231,7 +231,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
kfree_skb
(
skb
);
kfree_skb
(
skb
);
return
1
;
return
1
;
}
}
atomic_add
(
skb
->
truesize
,
&
ATM_SKB
(
skb
)
->
vcc
->
tx_inuse
);
atomic_add
(
skb
->
truesize
,
&
ATM_SKB
(
skb
)
->
vcc
->
sk
->
wmem_alloc
);
ATM_SKB
(
skb
)
->
iovcnt
=
0
;
ATM_SKB
(
skb
)
->
iovcnt
=
0
;
ATM_SKB
(
skb
)
->
atm_options
=
ATM_SKB
(
skb
)
->
vcc
->
atm_options
;
ATM_SKB
(
skb
)
->
atm_options
=
ATM_SKB
(
skb
)
->
vcc
->
atm_options
;
DPRINTK
(
"(unit %d): atm_skb(%p)->vcc(%p)->dev(%p)
\n
"
,
DPRINTK
(
"(unit %d): atm_skb(%p)->vcc(%p)->dev(%p)
\n
"
,
...
...
net/sched/sch_atm.c
View file @
d21c8bd3
...
@@ -508,7 +508,7 @@ static void sch_atm_dequeue(unsigned long data)
...
@@ -508,7 +508,7 @@ static void sch_atm_dequeue(unsigned long data)
ATM_SKB
(
skb
)
->
vcc
=
flow
->
vcc
;
ATM_SKB
(
skb
)
->
vcc
=
flow
->
vcc
;
memcpy
(
skb_push
(
skb
,
flow
->
hdr_len
),
flow
->
hdr
,
memcpy
(
skb_push
(
skb
,
flow
->
hdr_len
),
flow
->
hdr
,
flow
->
hdr_len
);
flow
->
hdr_len
);
atomic_add
(
skb
->
truesize
,
&
flow
->
vcc
->
tx_inuse
);
atomic_add
(
skb
->
truesize
,
&
flow
->
vcc
->
sk
->
wmem_alloc
);
ATM_SKB
(
skb
)
->
iovcnt
=
0
;
ATM_SKB
(
skb
)
->
iovcnt
=
0
;
/* atm.atm_options are already set by atm_tc_enqueue */
/* atm.atm_options are already set by atm_tc_enqueue */
(
void
)
flow
->
vcc
->
send
(
flow
->
vcc
,
skb
);
(
void
)
flow
->
vcc
->
send
(
flow
->
vcc
,
skb
);
...
...
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