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
98b29a73
Commit
98b29a73
authored
Mar 09, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents
6689319e
dd6e1c3d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
22 deletions
+12
-22
net/ipv4/esp4.c
net/ipv4/esp4.c
+2
-0
net/ipv4/ip_output.c
net/ipv4/ip_output.c
+4
-1
net/ipv6/addrconf.c
net/ipv6/addrconf.c
+0
-20
net/ipv6/esp6.c
net/ipv6/esp6.c
+2
-0
net/ipv6/ip6_output.c
net/ipv6/ip6_output.c
+4
-1
No files found.
net/ipv4/esp4.c
View file @
98b29a73
...
...
@@ -518,6 +518,8 @@ int esp_init_state(struct xfrm_state *x, void *args)
esp
->
conf
.
padlen
=
0
;
if
(
esp
->
conf
.
ivlen
)
{
esp
->
conf
.
ivec
=
kmalloc
(
esp
->
conf
.
ivlen
,
GFP_KERNEL
);
if
(
unlikely
(
esp
->
conf
.
ivec
==
NULL
))
goto
error
;
get_random_bytes
(
esp
->
conf
.
ivec
,
esp
->
conf
.
ivlen
);
}
crypto_cipher_setkey
(
esp
->
conf
.
tfm
,
esp
->
conf
.
key
,
esp
->
conf
.
key_len
);
...
...
net/ipv4/ip_output.c
View file @
98b29a73
...
...
@@ -761,8 +761,11 @@ int ip_append_data(struct sock *sk,
*/
opt
=
ipc
->
opt
;
if
(
opt
)
{
if
(
inet
->
cork
.
opt
==
NULL
)
if
(
inet
->
cork
.
opt
==
NULL
)
{
inet
->
cork
.
opt
=
kmalloc
(
sizeof
(
struct
ip_options
)
+
40
,
sk
->
sk_allocation
);
if
(
unlikely
(
inet
->
cork
.
opt
==
NULL
))
return
-
ENOBUFS
;
}
memcpy
(
inet
->
cork
.
opt
,
opt
,
sizeof
(
struct
ip_options
)
+
opt
->
optlen
);
inet
->
cork
.
flags
|=
IPCORK_OPT
;
inet
->
cork
.
addr
=
ipc
->
addr
;
...
...
net/ipv6/addrconf.c
View file @
98b29a73
...
...
@@ -2673,26 +2673,6 @@ static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
goto
done
;
}
#endif
/* multicast address */
for
(
ifmca
=
idev
->
mc_list
;
ifmca
;
ifmca
=
ifmca
->
next
,
ip_idx
++
)
{
if
(
ip_idx
<
s_ip_idx
)
continue
;
if
((
err
=
inet6_fill_ifmcaddr
(
skb
,
ifmca
,
NETLINK_CB
(
cb
->
skb
).
pid
,
cb
->
nlh
->
nlmsg_seq
,
RTM_NEWADDR
))
<=
0
)
goto
done
;
}
/* anycast address */
for
(
ifaca
=
idev
->
ac_list
;
ifaca
;
ifaca
=
ifaca
->
aca_next
,
ip_idx
++
)
{
if
(
ip_idx
<
s_ip_idx
)
continue
;
if
((
err
=
inet6_fill_ifacaddr
(
skb
,
ifaca
,
NETLINK_CB
(
cb
->
skb
).
pid
,
cb
->
nlh
->
nlmsg_seq
,
RTM_NEWADDR
))
<=
0
)
goto
done
;
}
read_unlock_bh
(
&
idev
->
lock
);
in6_dev_put
(
idev
);
}
...
...
net/ipv6/esp6.c
View file @
98b29a73
...
...
@@ -422,6 +422,8 @@ int esp6_init_state(struct xfrm_state *x, void *args)
esp
->
conf
.
padlen
=
0
;
if
(
esp
->
conf
.
ivlen
)
{
esp
->
conf
.
ivec
=
kmalloc
(
esp
->
conf
.
ivlen
,
GFP_KERNEL
);
if
(
unlikely
(
esp
->
conf
.
ivec
==
NULL
))
goto
error
;
get_random_bytes
(
esp
->
conf
.
ivec
,
esp
->
conf
.
ivlen
);
}
crypto_cipher_setkey
(
esp
->
conf
.
tfm
,
esp
->
conf
.
key
,
esp
->
conf
.
key_len
);
...
...
net/ipv6/ip6_output.c
View file @
98b29a73
...
...
@@ -816,9 +816,12 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, int offse
* setup for corking
*/
if
(
opt
)
{
if
(
np
->
cork
.
opt
==
NULL
)
if
(
np
->
cork
.
opt
==
NULL
)
{
np
->
cork
.
opt
=
kmalloc
(
opt
->
tot_len
,
sk
->
sk_allocation
);
if
(
unlikely
(
np
->
cork
.
opt
==
NULL
))
return
-
ENOBUFS
;
}
memcpy
(
np
->
cork
.
opt
,
opt
,
opt
->
tot_len
);
inet
->
cork
.
flags
|=
IPCORK_OPT
;
/* need source address above miyazawa*/
...
...
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