Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
4d9092bb
Commit
4d9092bb
authored
Jun 09, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ipv6: Use frag list abstraction interfaces.
Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
d7fcf1a5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
net/ipv6/ip6_output.c
net/ipv6/ip6_output.c
+3
-3
net/ipv6/reassembly.c
net/ipv6/reassembly.c
+2
-2
No files found.
net/ipv6/ip6_output.c
View file @
4d9092bb
...
@@ -658,7 +658,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
...
@@ -658,7 +658,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
}
}
mtu
-=
hlen
+
sizeof
(
struct
frag_hdr
);
mtu
-=
hlen
+
sizeof
(
struct
frag_hdr
);
if
(
skb_
shinfo
(
skb
)
->
frag_list
)
{
if
(
skb_
has_frags
(
skb
)
)
{
int
first_len
=
skb_pagelen
(
skb
);
int
first_len
=
skb_pagelen
(
skb
);
int
truesizes
=
0
;
int
truesizes
=
0
;
...
@@ -667,7 +667,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
...
@@ -667,7 +667,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
skb_cloned
(
skb
))
skb_cloned
(
skb
))
goto
slow_path
;
goto
slow_path
;
for
(
frag
=
skb_shinfo
(
skb
)
->
frag_list
;
frag
;
frag
=
frag
->
next
)
{
skb_walk_frags
(
skb
,
frag
)
{
/* Correct geometry. */
/* Correct geometry. */
if
(
frag
->
len
>
mtu
||
if
(
frag
->
len
>
mtu
||
((
frag
->
len
&
7
)
&&
frag
->
next
)
||
((
frag
->
len
&
7
)
&&
frag
->
next
)
||
...
@@ -690,7 +690,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
...
@@ -690,7 +690,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
err
=
0
;
err
=
0
;
offset
=
0
;
offset
=
0
;
frag
=
skb_shinfo
(
skb
)
->
frag_list
;
frag
=
skb_shinfo
(
skb
)
->
frag_list
;
skb_
shinfo
(
skb
)
->
frag_list
=
NULL
;
skb_
frag_list_init
(
skb
)
;
/* BUILD HEADER */
/* BUILD HEADER */
*
prevhdr
=
NEXTHDR_FRAGMENT
;
*
prevhdr
=
NEXTHDR_FRAGMENT
;
...
...
net/ipv6/reassembly.c
View file @
4d9092bb
...
@@ -494,7 +494,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
...
@@ -494,7 +494,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
/* If the first fragment is fragmented itself, we split
/* If the first fragment is fragmented itself, we split
* it to two chunks: the first with data and paged part
* it to two chunks: the first with data and paged part
* and the second, holding only fragments. */
* and the second, holding only fragments. */
if
(
skb_
shinfo
(
head
)
->
frag_list
)
{
if
(
skb_
has_frags
(
head
)
)
{
struct
sk_buff
*
clone
;
struct
sk_buff
*
clone
;
int
i
,
plen
=
0
;
int
i
,
plen
=
0
;
...
@@ -503,7 +503,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
...
@@ -503,7 +503,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
clone
->
next
=
head
->
next
;
clone
->
next
=
head
->
next
;
head
->
next
=
clone
;
head
->
next
=
clone
;
skb_shinfo
(
clone
)
->
frag_list
=
skb_shinfo
(
head
)
->
frag_list
;
skb_shinfo
(
clone
)
->
frag_list
=
skb_shinfo
(
head
)
->
frag_list
;
skb_
shinfo
(
head
)
->
frag_list
=
NULL
;
skb_
frag_list_init
(
head
)
;
for
(
i
=
0
;
i
<
skb_shinfo
(
head
)
->
nr_frags
;
i
++
)
for
(
i
=
0
;
i
<
skb_shinfo
(
head
)
->
nr_frags
;
i
++
)
plen
+=
skb_shinfo
(
head
)
->
frags
[
i
].
size
;
plen
+=
skb_shinfo
(
head
)
->
frags
[
i
].
size
;
clone
->
len
=
clone
->
data_len
=
head
->
data_len
-
plen
;
clone
->
len
=
clone
->
data_len
=
head
->
data_len
-
plen
;
...
...
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