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
90c9ddf6
Commit
90c9ddf6
authored
Feb 08, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/gregkh/linux/usb-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
parents
1f039e3f
1b8da39b
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
32 additions
and
61 deletions
+32
-61
include/net/sctp/structs.h
include/net/sctp/structs.h
+0
-6
net/ipv4/igmp.c
net/ipv4/igmp.c
+2
-2
net/ipv4/ipvs/ip_vs_xmit.c
net/ipv4/ipvs/ip_vs_xmit.c
+1
-1
net/ipv4/netfilter/ipt_REJECT.c
net/ipv4/netfilter/ipt_REJECT.c
+3
-3
net/ipv6/ip6_output.c
net/ipv6/ip6_output.c
+4
-4
net/ipv6/mcast.c
net/ipv6/mcast.c
+5
-4
net/ipv6/ndisc.c
net/ipv6/ndisc.c
+8
-8
net/packet/af_packet.c
net/packet/af_packet.c
+4
-4
net/sctp/associola.c
net/sctp/associola.c
+2
-2
net/sctp/endpointola.c
net/sctp/endpointola.c
+0
-4
net/sctp/protocol.c
net/sctp/protocol.c
+0
-4
net/sctp/sysctl.c
net/sctp/sysctl.c
+0
-16
net/sctp/ulpqueue.c
net/sctp/ulpqueue.c
+1
-1
net/wanrouter/af_wanpipe.c
net/wanrouter/af_wanpipe.c
+2
-2
No files found.
include/net/sctp/structs.h
View file @
90c9ddf6
...
...
@@ -193,10 +193,6 @@ extern struct sctp_globals {
/* Flag to indicate if addip is enabled. */
int
addip_enable
;
/* socket receive and send buffer sizes. */
int
rmem
;
int
wmem
;
}
sctp_globals
;
#define sctp_rto_initial (sctp_globals.rto_initial)
...
...
@@ -225,8 +221,6 @@ extern struct sctp_globals {
#define sctp_local_addr_list (sctp_globals.local_addr_list)
#define sctp_local_addr_lock (sctp_globals.local_addr_lock)
#define sctp_addip_enable (sctp_globals.addip_enable)
#define sctp_rmem (sctp_globals.rmem)
#define sctp_wmem (sctp_globals.wmem)
/* SCTP Socket type: UDP or TCP style. */
typedef
enum
{
...
...
net/ipv4/igmp.c
View file @
90c9ddf6
...
...
@@ -276,7 +276,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
struct
iphdr
*
pip
;
struct
igmpv3_report
*
pig
;
skb
=
alloc_skb
(
size
+
dev
->
hard_header_len
+
15
,
GFP_ATOMIC
);
skb
=
alloc_skb
(
size
+
LL_RESERVED_SPACE
(
dev
)
,
GFP_ATOMIC
);
if
(
skb
==
NULL
)
return
0
;
...
...
@@ -298,7 +298,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
skb
->
dst
=
&
rt
->
u
.
dst
;
skb
->
dev
=
dev
;
skb_reserve
(
skb
,
(
dev
->
hard_header_len
+
15
)
&~
15
);
skb_reserve
(
skb
,
LL_RESERVED_SPACE
(
dev
)
);
skb
->
nh
.
iph
=
pip
=
(
struct
iphdr
*
)
skb_put
(
skb
,
sizeof
(
struct
iphdr
)
+
4
);
...
...
net/ipv4/ipvs/ip_vs_xmit.c
View file @
90c9ddf6
...
...
@@ -370,7 +370,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
/*
* Okay, now see if we can stuff it in the buffer as-is.
*/
max_headroom
=
(((
tdev
->
hard_header_len
+
15
)
&~
15
)
+
sizeof
(
struct
iphdr
)
);
max_headroom
=
LL_RESERVED_SPACE
(
tdev
)
+
sizeof
(
struct
iphdr
);
if
(
skb_headroom
(
skb
)
<
max_headroom
||
skb_cloned
(
skb
)
||
skb_shared
(
skb
))
{
...
...
net/ipv4/netfilter/ipt_REJECT.c
View file @
90c9ddf6
...
...
@@ -117,7 +117,7 @@ static void send_reset(struct sk_buff *oldskb, int hook)
if
((
rt
=
route_reverse
(
oldskb
,
hook
))
==
NULL
)
return
;
hh_len
=
(
rt
->
u
.
dst
.
dev
->
hard_header_len
+
15
)
&~
15
;
hh_len
=
LL_RESERVED_SPACE
(
rt
->
u
.
dst
.
dev
)
;
/* We need a linear, writeable skb. We also need to expand
headroom in case hh_len of incoming interface < hh_len of
...
...
@@ -305,9 +305,9 @@ static void send_unreach(struct sk_buff *skb_in, int code)
if
(
length
>
576
)
length
=
576
;
hh_len
=
(
rt
->
u
.
dst
.
dev
->
hard_header_len
+
15
)
&~
15
;
hh_len
=
LL_RESERVED_SPACE
(
rt
->
u
.
dst
.
dev
)
;
nskb
=
alloc_skb
(
hh_len
+
15
+
length
,
GFP_ATOMIC
);
nskb
=
alloc_skb
(
hh_len
+
length
,
GFP_ATOMIC
);
if
(
!
nskb
)
{
ip_rt_put
(
rt
);
return
;
...
...
net/ipv6/ip6_output.c
View file @
90c9ddf6
...
...
@@ -218,7 +218,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
*/
head_room
=
opt
->
opt_nflen
+
opt
->
opt_flen
;
seg_len
+=
head_room
;
head_room
+=
sizeof
(
struct
ipv6hdr
)
+
((
dst
->
dev
->
hard_header_len
+
15
)
&~
15
);
head_room
+=
sizeof
(
struct
ipv6hdr
)
+
LL_RESERVED_SPACE
(
dst
->
dev
);
if
(
skb_headroom
(
skb
)
<
head_room
)
{
struct
sk_buff
*
skb2
=
skb_realloc_headroom
(
skb
,
head_room
);
...
...
@@ -844,7 +844,7 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, int offse
mtu
=
inet
->
cork
.
fragsize
;
}
hh_len
=
(
rt
->
u
.
dst
.
dev
->
hard_header_len
&~
15
)
+
16
;
hh_len
=
LL_RESERVED_SPACE
(
rt
->
u
.
dst
.
dev
)
;
fragheaderlen
=
sizeof
(
struct
ipv6hdr
)
+
(
opt
?
opt
->
opt_nflen
:
0
);
maxfraglen
=
((
mtu
-
fragheaderlen
)
&
~
7
)
+
fragheaderlen
-
sizeof
(
struct
frag_hdr
);
...
...
@@ -881,14 +881,14 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, int offse
alloclen
+=
sizeof
(
struct
frag_hdr
);
if
(
transhdrlen
)
{
skb
=
sock_alloc_send_skb
(
sk
,
alloclen
+
hh_len
+
15
,
alloclen
+
hh_len
,
(
flags
&
MSG_DONTWAIT
),
&
err
);
}
else
{
skb
=
NULL
;
if
(
atomic_read
(
&
sk
->
sk_wmem_alloc
)
<=
2
*
sk
->
sk_sndbuf
)
skb
=
sock_wmalloc
(
sk
,
alloclen
+
hh_len
+
15
,
1
,
alloclen
+
hh_len
,
1
,
sk
->
sk_allocation
);
if
(
unlikely
(
skb
==
NULL
))
err
=
-
ENOBUFS
;
...
...
net/ipv6/mcast.c
View file @
90c9ddf6
...
...
@@ -1233,12 +1233,13 @@ static struct sk_buff *mld_newpack(struct net_device *dev, int size)
IPV6_TLV_ROUTERALERT
,
2
,
0
,
0
,
IPV6_TLV_PADN
,
0
};
skb
=
sock_alloc_send_skb
(
sk
,
size
+
dev
->
hard_header_len
+
15
,
1
,
&
err
);
/* we assume size > sizeof(ra) here */
skb
=
sock_alloc_send_skb
(
sk
,
size
+
LL_RESERVED_SPACE
(
dev
),
1
,
&
err
);
if
(
skb
==
0
)
return
0
;
skb_reserve
(
skb
,
(
dev
->
hard_header_len
+
15
)
&
~
15
);
skb_reserve
(
skb
,
LL_RESERVED_SPACE
(
dev
)
);
if
(
dev
->
hard_header
)
{
unsigned
char
ha
[
MAX_ADDR_LEN
];
...
...
@@ -1580,12 +1581,12 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
payload_len
=
len
+
sizeof
(
ra
);
full_len
=
sizeof
(
struct
ipv6hdr
)
+
payload_len
;
skb
=
sock_alloc_send_skb
(
sk
,
dev
->
hard_header_len
+
full_len
+
15
,
1
,
&
err
);
skb
=
sock_alloc_send_skb
(
sk
,
LL_RESERVED_SPACE
(
dev
)
+
full_len
,
1
,
&
err
);
if
(
skb
==
NULL
)
return
;
skb_reserve
(
skb
,
(
dev
->
hard_header_len
+
15
)
&
~
15
);
skb_reserve
(
skb
,
LL_RESERVED_SPACE
(
dev
)
);
if
(
dev
->
hard_header
)
{
unsigned
char
ha
[
MAX_ADDR_LEN
];
ndisc_mc_map
(
snd_addr
,
ha
,
dev
,
1
);
...
...
net/ipv6/ndisc.c
View file @
90c9ddf6
...
...
@@ -459,7 +459,7 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
inc_opt
=
0
;
}
skb
=
sock_alloc_send_skb
(
sk
,
MAX_HEADER
+
len
+
dev
->
hard_header_len
+
15
,
skb
=
sock_alloc_send_skb
(
sk
,
MAX_HEADER
+
len
+
LL_RESERVED_SPACE
(
dev
)
,
1
,
&
err
);
if
(
skb
==
NULL
)
{
...
...
@@ -468,7 +468,7 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
return
;
}
skb_reserve
(
skb
,
(
dev
->
hard_header_len
+
15
)
&
~
15
);
skb_reserve
(
skb
,
LL_RESERVED_SPACE
(
dev
)
);
ip6_nd_hdr
(
sk
,
skb
,
dev
,
src_addr
,
daddr
,
IPPROTO_ICMPV6
,
len
);
msg
=
(
struct
nd_msg
*
)
skb_put
(
skb
,
len
);
...
...
@@ -545,7 +545,7 @@ void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh,
if
(
send_llinfo
)
len
+=
NDISC_OPT_SPACE
(
dev
->
addr_len
);
skb
=
sock_alloc_send_skb
(
sk
,
MAX_HEADER
+
len
+
dev
->
hard_header_len
+
15
,
skb
=
sock_alloc_send_skb
(
sk
,
MAX_HEADER
+
len
+
LL_RESERVED_SPACE
(
dev
)
,
1
,
&
err
);
if
(
skb
==
NULL
)
{
ND_PRINTK1
(
"send_ns: alloc skb failed
\n
"
);
...
...
@@ -553,7 +553,7 @@ void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh,
return
;
}
skb_reserve
(
skb
,
(
dev
->
hard_header_len
+
15
)
&
~
15
);
skb_reserve
(
skb
,
LL_RESERVED_SPACE
(
dev
)
);
ip6_nd_hdr
(
sk
,
skb
,
dev
,
saddr
,
daddr
,
IPPROTO_ICMPV6
,
len
);
msg
=
(
struct
nd_msg
*
)
skb_put
(
skb
,
len
);
...
...
@@ -617,7 +617,7 @@ void ndisc_send_rs(struct net_device *dev, struct in6_addr *saddr,
if
(
dev
->
addr_len
)
len
+=
NDISC_OPT_SPACE
(
dev
->
addr_len
);
skb
=
sock_alloc_send_skb
(
sk
,
MAX_HEADER
+
len
+
dev
->
hard_header_len
+
15
,
skb
=
sock_alloc_send_skb
(
sk
,
MAX_HEADER
+
len
+
LL_RESERVED_SPACE
(
dev
)
,
1
,
&
err
);
if
(
skb
==
NULL
)
{
ND_PRINTK1
(
"send_ns: alloc skb failed
\n
"
);
...
...
@@ -625,7 +625,7 @@ void ndisc_send_rs(struct net_device *dev, struct in6_addr *saddr,
return
;
}
skb_reserve
(
skb
,
(
dev
->
hard_header_len
+
15
)
&
~
15
);
skb_reserve
(
skb
,
LL_RESERVED_SPACE
(
dev
)
);
ip6_nd_hdr
(
sk
,
skb
,
dev
,
saddr
,
daddr
,
IPPROTO_ICMPV6
,
len
);
hdr
=
(
struct
icmp6hdr
*
)
skb_put
(
skb
,
len
);
...
...
@@ -1305,7 +1305,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
rd_len
&=
~
0x7
;
len
+=
rd_len
;
buff
=
sock_alloc_send_skb
(
sk
,
MAX_HEADER
+
len
+
dev
->
hard_header_len
+
15
,
buff
=
sock_alloc_send_skb
(
sk
,
MAX_HEADER
+
len
+
LL_RESERVED_SPACE
(
dev
)
,
1
,
&
err
);
if
(
buff
==
NULL
)
{
ND_PRINTK1
(
"ndisc_send_redirect: alloc_skb failed
\n
"
);
...
...
@@ -1315,7 +1315,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
hlen
=
0
;
skb_reserve
(
buff
,
(
dev
->
hard_header_len
+
15
)
&
~
15
);
skb_reserve
(
buff
,
LL_RESERVED_SPACE
(
dev
)
);
ip6_nd_hdr
(
sk
,
buff
,
dev
,
&
saddr_buf
,
&
skb
->
nh
.
ipv6h
->
saddr
,
IPPROTO_ICMPV6
,
len
);
...
...
net/packet/af_packet.c
View file @
90c9ddf6
...
...
@@ -327,7 +327,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
goto
out_unlock
;
err
=
-
ENOBUFS
;
skb
=
sock_wmalloc
(
sk
,
len
+
dev
->
hard_header_len
+
15
,
0
,
GFP_KERNEL
);
skb
=
sock_wmalloc
(
sk
,
len
+
LL_RESERVED_SPACE
(
dev
)
,
0
,
GFP_KERNEL
);
/*
* If the write buffer is full, then tough. At this level the user gets to
...
...
@@ -346,7 +346,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
* hard header at transmission time by themselves. PPP is the
* notable one here. This should really be fixed at the driver level.
*/
skb_reserve
(
skb
,
(
dev
->
hard_header_len
+
15
)
&~
15
);
skb_reserve
(
skb
,
LL_RESERVED_SPACE
(
dev
)
);
skb
->
nh
.
raw
=
skb
->
data
;
/* Try to align data part correctly */
...
...
@@ -700,12 +700,12 @@ static int packet_sendmsg(struct kiocb *iocb, struct socket *sock,
if
(
len
>
dev
->
mtu
+
reserve
)
goto
out_unlock
;
skb
=
sock_alloc_send_skb
(
sk
,
len
+
dev
->
hard_header_len
+
15
,
skb
=
sock_alloc_send_skb
(
sk
,
len
+
LL_RESERVED_SPACE
(
dev
),
msg
->
msg_flags
&
MSG_DONTWAIT
,
&
err
);
if
(
skb
==
NULL
)
goto
out_unlock
;
skb_reserve
(
skb
,
(
dev
->
hard_header_len
+
15
)
&~
15
);
skb_reserve
(
skb
,
LL_RESERVED_SPACE
(
dev
)
);
skb
->
nh
.
raw
=
skb
->
data
;
if
(
dev
->
hard_header
)
{
...
...
net/sctp/associola.c
View file @
90c9ddf6
...
...
@@ -192,7 +192,7 @@ struct sctp_association *sctp_association_init(struct sctp_association *asoc,
asoc
->
rwnd_over
=
0
;
/* Use my own max window until I learn something better. */
asoc
->
peer
.
rwnd
=
sctp_rmem
;
asoc
->
peer
.
rwnd
=
SCTP_DEFAULT_MAXWINDOW
;
/* Set the sndbuf size for transmit. */
asoc
->
sndbuf_used
=
0
;
...
...
@@ -498,7 +498,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
* so initialize ssthresh to the default value and it will be set
* later when we process the INIT.
*/
peer
->
ssthresh
=
sctp_rmem
;
peer
->
ssthresh
=
SCTP_DEFAULT_MAXWINDOW
;
peer
->
partial_bytes_acked
=
0
;
peer
->
flight_size
=
0
;
...
...
net/sctp/endpointola.c
View file @
90c9ddf6
...
...
@@ -147,10 +147,6 @@ struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
ep
->
timeouts
[
SCTP_EVENT_TIMEOUT_AUTOCLOSE
]
=
sp
->
autoclose
*
HZ
;
/* Set up the default send/receive buffer space. */
sk
->
sk_rcvbuf
=
sctp_rmem
;
sk
->
sk_sndbuf
=
sctp_wmem
;
/* Use SCTP specific send buffer space queues. */
sk
->
sk_write_space
=
sctp_write_space
;
sk
->
sk_use_write_queue
=
1
;
...
...
net/sctp/protocol.c
View file @
90c9ddf6
...
...
@@ -1049,10 +1049,6 @@ __init int sctp_init(void)
sctp_max_instreams
=
SCTP_DEFAULT_INSTREAMS
;
sctp_max_outstreams
=
SCTP_DEFAULT_OUTSTREAMS
;
/* Initialize default send & receive buffer sizes. */
sctp_rmem
=
SCTP_DEFAULT_MAXWINDOW
;
sctp_wmem
=
SCTP_DEFAULT_MAXWINDOW
;
/* Size and allocate the association hash table.
* The methodology is similar to that of the tcp hash tables.
*/
...
...
net/sctp/sysctl.c
View file @
90c9ddf6
...
...
@@ -170,22 +170,6 @@ static ctl_table sctp_table[] = {
.
mode
=
0644
,
.
proc_handler
=
&
proc_dointvec
},
{
.
ctl_name
=
NET_SCTP_RMEM
,
.
procname
=
"rmem"
,
.
data
=
&
sctp_rmem
,
.
maxlen
=
sizeof
(
int
),
.
mode
=
0644
,
.
proc_handler
=
&
proc_dointvec
},
{
.
ctl_name
=
NET_SCTP_WMEM
,
.
procname
=
"wmem"
,
.
data
=
&
sctp_wmem
,
.
maxlen
=
sizeof
(
int
),
.
mode
=
0644
,
.
proc_handler
=
&
proc_dointvec
},
{
.
ctl_name
=
0
}
};
...
...
net/sctp/ulpqueue.c
View file @
90c9ddf6
...
...
@@ -768,7 +768,7 @@ void sctp_ulpq_renege(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
needed
=
ntohs
(
chunk
->
chunk_hdr
->
length
);
needed
-=
sizeof
(
sctp_data_chunk_t
);
}
else
needed
=
sctp_rmem
;
needed
=
SCTP_DEFAULT_MAXWINDOW
;
freed
=
0
;
...
...
net/wanrouter/af_wanpipe.c
View file @
90c9ddf6
...
...
@@ -591,14 +591,14 @@ static int wanpipe_sendmsg(struct kiocb *iocb, struct socket *sock,
return
-
EMSGSIZE
;
}
skb
=
sock_alloc_send_skb
(
sk
,
len
+
dev
->
hard_header_len
+
15
,
skb
=
sock_alloc_send_skb
(
sk
,
len
+
LL_RESERVED_SPACE
(
dev
),
msg
->
msg_flags
&
MSG_DONTWAIT
,
&
err
);
if
(
skb
==
NULL
){
goto
out_unlock
;
}
skb_reserve
(
skb
,
(
dev
->
hard_header_len
+
15
)
&~
15
);
skb_reserve
(
skb
,
LL_RESERVED_SPACE
(
dev
)
);
skb
->
nh
.
raw
=
skb
->
data
;
/* Returns -EFAULT on error */
...
...
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