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
587f241d
Commit
587f241d
authored
Nov 23, 2007
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import 2.3.35pre3
parent
412da72d
Changes
38
Show whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
157 additions
and
141 deletions
+157
-141
arch/sparc/config.in
arch/sparc/config.in
+2
-2
arch/sparc/mm/srmmu.c
arch/sparc/mm/srmmu.c
+3
-2
arch/sparc64/config.in
arch/sparc64/config.in
+2
-2
drivers/pcmcia/pci_socket.c
drivers/pcmcia/pci_socket.c
+1
-0
drivers/pcmcia/yenta.c
drivers/pcmcia/yenta.c
+27
-9
drivers/scsi/esp.c
drivers/scsi/esp.c
+11
-1
include/linux/qnx4_fs_i.h
include/linux/qnx4_fs_i.h
+7
-7
include/linux/qnx4_fs_sb.h
include/linux/qnx4_fs_sb.h
+1
-1
include/linux/qnxtypes.h
include/linux/qnxtypes.h
+7
-7
include/linux/skbuff.h
include/linux/skbuff.h
+12
-6
net/core/dev.c
net/core/dev.c
+1
-1
net/core/skbuff.c
net/core/skbuff.c
+49
-72
net/core/sock.c
net/core/sock.c
+1
-1
net/ipv4/af_inet.c
net/ipv4/af_inet.c
+1
-1
net/ipv4/arp.c
net/ipv4/arp.c
+1
-1
net/ipv4/fib_frontend.c
net/ipv4/fib_frontend.c
+1
-1
net/ipv4/icmp.c
net/ipv4/icmp.c
+4
-4
net/ipv4/igmp.c
net/ipv4/igmp.c
+1
-1
net/ipv4/ip_output.c
net/ipv4/ip_output.c
+1
-1
net/ipv4/ipmr.c
net/ipv4/ipmr.c
+1
-1
net/ipv4/proc.c
net/ipv4/proc.c
+1
-1
net/ipv4/raw.c
net/ipv4/raw.c
+1
-1
net/ipv4/route.c
net/ipv4/route.c
+2
-2
net/ipv4/tcp.c
net/ipv4/tcp.c
+1
-1
net/ipv4/tcp_input.c
net/ipv4/tcp_input.c
+1
-1
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_ipv4.c
+5
-2
net/ipv4/udp.c
net/ipv4/udp.c
+1
-1
net/ipv6/addrconf.c
net/ipv6/addrconf.c
+1
-1
net/ipv6/af_inet6.c
net/ipv6/af_inet6.c
+1
-1
net/ipv6/mcast.c
net/ipv6/mcast.c
+1
-1
net/ipv6/proc.c
net/ipv6/proc.c
+1
-1
net/ipv6/raw.c
net/ipv6/raw.c
+1
-1
net/ipv6/route.c
net/ipv6/route.c
+1
-1
net/ipv6/tcp_ipv6.c
net/ipv6/tcp_ipv6.c
+1
-1
net/ipv6/udp.c
net/ipv6/udp.c
+1
-1
net/netsyms.c
net/netsyms.c
+1
-1
net/packet/af_packet.c
net/packet/af_packet.c
+1
-1
net/unix/af_unix.c
net/unix/af_unix.c
+1
-1
No files found.
arch/sparc/config.in
View file @
587f241d
# $Id: config.in,v 1.7
8 1999/12/20 05:01:36
davem Exp $
# $Id: config.in,v 1.7
9 1999/12/23 01:46:00
davem Exp $
# For a description of the syntax of this configuration file,
# see the Configure script.
#
...
...
@@ -143,7 +143,7 @@ if [ "$CONFIG_SCSI" != "n" ]; then
mainmenu_option next_comment
comment 'SCSI low-level drivers'
bool
'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI
tristate
'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI
tristate 'PTI Qlogic,ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI
endmenu
fi
...
...
arch/sparc/mm/srmmu.c
View file @
587f241d
/* $Id: srmmu.c,v 1.19
8 1999/11/14 06:15:14 zaitcev
Exp $
/* $Id: srmmu.c,v 1.19
9 1999/12/23 02:00:51 davem
Exp $
* srmmu.c: SRMMU specific routines for memory management.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
...
...
@@ -1560,6 +1560,7 @@ static unsigned long __init map_spbank(unsigned long vbase, int sp_entry)
srmmu_map
[
srmmu_bank
].
vbase
=
vbase
;
srmmu_map
[
srmmu_bank
].
pbase
=
sp_banks
[
sp_entry
].
base_addr
;
srmmu_map
[
srmmu_bank
].
size
=
sp_banks
[
sp_entry
].
num_bytes
;
if
(
srmmu_map
[
srmmu_bank
].
size
)
srmmu_bank
++
;
map_spbank_last_pa
=
pstart
-
SRMMU_PGDIR_SIZE
;
return
vstart
;
...
...
arch/sparc64/config.in
View file @
587f241d
# $Id: config.in,v 1.8
5 1999/12/20 05:01:56
davem Exp $
# $Id: config.in,v 1.8
6 1999/12/23 01:46:09
davem Exp $
# For a description of the syntax of this configuration file,
# see the Configure script.
#
...
...
@@ -145,7 +145,7 @@ if [ "$CONFIG_SCSI" != "n" ]; then
mainmenu_option next_comment
comment 'SCSI low-level drivers'
bool
'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI
tristate
'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI
tristate 'PTI Qlogic, ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI
if [ "$CONFIG_PCI" != "n" ]; then
...
...
drivers/pcmcia/pci_socket.c
View file @
587f241d
...
...
@@ -30,6 +30,7 @@
static
struct
pci_simple_probe_entry
controller_list
[]
=
{
{
PCI_VENDOR_ID_TI
,
PCI_DEVICE_ID_TI_1225
,
0
,
0
,
&
yenta_operations
},
{
0x1180
,
0x0475
,
0
,
0
,
&
yenta_operations
},
{
0
,
0
,
0
,
0
,
NULL
}
};
...
...
drivers/pcmcia/yenta.c
View file @
587f241d
...
...
@@ -23,10 +23,10 @@
static
int
yenta_inquire
(
pci_socket_t
*
socket
,
socket_cap_t
*
cap
)
{
cap
->
features
=
SS_CAP_PAGE_REGS
|
SS_CAP_PCCARD
|
SS_CAP_CARDBUS
;
cap
->
irq_mask
=
0
;
cap
->
map_size
=
0
;
cap
->
irq_mask
=
0
xdeb8
;
/* irq 15,14,12,11,10,9,7,5,4,3 */
cap
->
map_size
=
0
x1000
;
cap
->
pci_irq
=
socket
->
irq
;
cap
->
cardbus
=
1
;
cap
->
cardbus
=
0
;
cap
->
cb_bus
=
NULL
;
cap
->
bus
=
NULL
;
...
...
@@ -36,7 +36,7 @@ printk("yenta_inquire()\n");
}
/*
* Silly interface. We convert the cardbus status to a internal status,
* Silly interface. We convert the cardbus status to a internal status,
* and we probably really should keep it in cardbus status form and
* only convert for old-style 16-bit PCMCIA cards..
*/
...
...
@@ -265,7 +265,7 @@ static int yenta_get_mem_map(pci_socket_t *socket, struct pccard_mem_map *mem)
mem
->
speed
=
(
stop
&
I365_MEM_WS0
)
?
1
:
0
;
mem
->
speed
+=
(
stop
&
I365_MEM_WS1
)
?
2
:
0
;
mem
->
speed
=
to_ns
(
mem
->
speed
);
stop
=
((
u_long
)(
stop
&
0x0fff
)
<<
12
)
+
0x0fff
;
stop
=
((
stop
&
0x0fff
)
<<
12
)
+
0x0fff
;
offset
=
exca_readw
(
socket
,
I365_MEM
(
map
)
+
I365_W_OFF
);
mem
->
flags
|=
(
offset
&
I365_MEM_WRPROT
)
?
MAP_WRPROT
:
0
;
...
...
@@ -353,13 +353,31 @@ static void yenta_proc_setup(pci_socket_t *socket, struct proc_dir_entry *base)
static
void
yenta_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
{
pci_socket_t
*
sock
=
(
pci_socket_t
*
)
dev_id
;
u32
event
=
readl
(
sock
->
base
+
CB_SOCKET_EVENT
);
u8
csc
;
u32
cb_event
;
unsigned
int
events
;
pci_socket_t
*
socket
=
(
pci_socket_t
*
)
dev_id
;
/* Clear interrupt status for the event */
writel
(
event
,
sock
->
base
+
CB_SOCKET_EVENT
);
cb_event
=
cb_readl
(
socket
,
CB_SOCKET_EVENT
);
cb_writel
(
socket
,
CB_SOCKET_EVENT
,
cb_event
);
printk
(
"Socket interrupt event %08x
\n
"
,
event
);
csc
=
exca_readb
(
socket
,
I365_CSC
);
events
=
(
cb_event
&
(
CB_CD1EVENT
|
CB_CD2EVENT
))
?
SS_DETECT
:
0
;
events
|=
(
csc
&
I365_CSC_DETECT
)
?
SS_DETECT
:
0
;
if
(
exca_readb
(
socket
,
I365_INTCTL
)
&
I365_PC_IOCARD
)
{
events
|=
(
csc
&
I365_CSC_STSCHG
)
?
SS_STSCHG
:
0
;
}
else
{
events
|=
(
csc
&
I365_CSC_BVD1
)
?
SS_BATDEAD
:
0
;
events
|=
(
csc
&
I365_CSC_BVD2
)
?
SS_BATWARN
:
0
;
events
|=
(
csc
&
I365_CSC_READY
)
?
SS_READY
:
0
;
}
printk
(
"Socket interrupt event %08x (%08x %02x)
\n
"
,
events
,
cb_event
,
csc
);
if
(
events
&&
socket
->
handler
)
socket
->
handler
(
socket
->
info
,
events
);
}
/*
...
...
drivers/scsi/esp.c
View file @
587f241d
/* $Id: esp.c,v 1.8
8 1999/12/21 02:38:07
davem Exp $
/* $Id: esp.c,v 1.8
9 1999/12/23 01:46:14
davem Exp $
* esp.c: EnhancedScsiProcessor Sun SCSI driver code.
*
* Copyright (C) 1995, 1998 David S. Miller (davem@caip.rutgers.edu)
...
...
@@ -40,6 +40,8 @@
#include <asm/irq.h>
#include <asm/idprom.h>
#include <linux/module.h>
#define DEBUG_ESP
/* #define DEBUG_ESP_HME */
/* #define DEBUG_ESP_DATA */
...
...
@@ -4337,3 +4339,11 @@ static void esp_intr(int irq, void *dev_id, struct pt_regs *pregs)
}
spin_unlock_irqrestore
(
&
esp
->
lock
,
flags
);
}
#ifdef MODULE
Scsi_Host_Template
driver_template
=
SCSI_SPARC_ESP
;
#include "scsi_module.c"
EXPORT_NO_SYMBOLS
;
#endif
/* MODULE */
include/linux/qnx4_fs_i.h
View file @
587f241d
...
...
@@ -18,20 +18,20 @@
*/
struct
qnx4_inode_info
{
char
i_reserved
[
16
];
/* 16 */
off_t
i_size
;
/* 4 */
_xtnt_t
i_first_xtnt
;
/* 8 */
qnx4_
off_t
i_size
;
/* 4 */
qnx4
_xtnt_t
i_first_xtnt
;
/* 8 */
long
i_xblk
;
/* 4 */
time_t
i_ftime
;
/* 4 */
time_t
i_mtime
;
/* 4 */
time_t
i_atime
;
/* 4 */
time_t
i_ctime
;
/* 4 */
_nxtnt_t
i_num_xtnts
;
/* 2 */
qnx4
_nxtnt_t
i_num_xtnts
;
/* 2 */
mode_t
i_mode
;
/* 2 */
muid_t
i_uid
;
/* 2 */
mgid_t
i_gid
;
/* 2 */
nlink_t
i_nlink
;
/* 2 */
qnx4_
muid_t
i_uid
;
/* 2 */
qnx4_
mgid_t
i_gid
;
/* 2 */
qnx4_
nlink_t
i_nlink
;
/* 2 */
char
i_zero
[
4
];
/* 4 */
_ftype_t
i_type
;
/* 1 */
qnx4
_ftype_t
i_type
;
/* 1 */
unsigned
char
i_status
;
/* 1 */
};
...
...
include/linux/qnx4_fs_sb.h
View file @
587f241d
...
...
@@ -11,7 +11,7 @@
#ifndef _QNX4_FS_SB
#define _QNX4_FS_SB
#include <linux/qnx
type
s.h>
#include <linux/qnx
4_f
s.h>
/*
* qnx4 super-block data in memory
...
...
include/linux/qnxtypes.h
View file @
587f241d
...
...
@@ -12,17 +12,17 @@
#ifndef _QNX4TYPES_H
#define _QNX4TYPES_H
typedef
unsigned
short
_nxtnt_t
;
typedef
unsigned
char
_ftype_t
;
typedef
unsigned
short
qnx4
_nxtnt_t
;
typedef
unsigned
char
qnx4
_ftype_t
;
typedef
struct
{
long
xtnt_blk
;
long
xtnt_size
;
}
_xtnt_t
;
}
qnx4
_xtnt_t
;
typedef
unsigned
short
muid_t
;
typedef
unsigned
short
mgid_t
;
typedef
unsigned
long
qnx_off_t
;
typedef
unsigned
short
qnx_nlink_t
;
typedef
unsigned
short
qnx4_
muid_t
;
typedef
unsigned
short
qnx4_
mgid_t
;
typedef
unsigned
long
qnx
4
_off_t
;
typedef
unsigned
short
qnx
4
_nlink_t
;
#endif
include/linux/skbuff.h
View file @
587f241d
...
...
@@ -168,19 +168,25 @@ extern struct sk_buff * alloc_skb(unsigned int size, int priority);
extern
struct
sk_buff
*
dev_alloc_skb
(
unsigned
int
size
);
extern
void
kfree_skbmem
(
struct
sk_buff
*
skb
);
extern
struct
sk_buff
*
skb_clone
(
struct
sk_buff
*
skb
,
int
priority
);
extern
struct
sk_buff
*
skb_copy
(
struct
sk_buff
*
skb
,
int
priority
);
extern
struct
sk_buff
*
skb_realloc_headroom
(
struct
sk_buff
*
skb
,
int
newheadroom
);
extern
struct
sk_buff
*
skb_copy
(
const
struct
sk_buff
*
skb
,
int
priority
);
extern
struct
sk_buff
*
skb_copy_expand
(
const
struct
sk_buff
*
skb
,
int
newheadroom
,
int
newtailroom
,
int
priority
);
#define dev_kfree_skb(a) kfree_skb(a)
extern
unsigned
char
*
skb_put
(
struct
sk_buff
*
skb
,
unsigned
int
len
);
extern
unsigned
char
*
skb_push
(
struct
sk_buff
*
skb
,
unsigned
int
len
);
extern
unsigned
char
*
skb_pull
(
struct
sk_buff
*
skb
,
unsigned
int
len
);
extern
int
skb_headroom
(
struct
sk_buff
*
skb
);
extern
int
skb_tailroom
(
struct
sk_buff
*
skb
);
extern
int
skb_headroom
(
const
struct
sk_buff
*
skb
);
extern
int
skb_tailroom
(
const
struct
sk_buff
*
skb
);
extern
void
skb_reserve
(
struct
sk_buff
*
skb
,
unsigned
int
len
);
extern
void
skb_trim
(
struct
sk_buff
*
skb
,
unsigned
int
len
);
extern
void
skb_over_panic
(
struct
sk_buff
*
skb
,
int
len
,
void
*
here
);
extern
void
skb_under_panic
(
struct
sk_buff
*
skb
,
int
len
,
void
*
here
);
/* Backwards compatibility */
#define skb_realloc_headroom(skb, nhr) skb_copy_expand(skb, nhr, skb_tailroom(skb), GFP_ATOMIC)
/* Internal */
extern
__inline__
atomic_t
*
skb_datarefp
(
struct
sk_buff
*
skb
)
{
...
...
@@ -534,12 +540,12 @@ extern __inline__ unsigned char * skb_pull(struct sk_buff *skb, unsigned int len
return
__skb_pull
(
skb
,
len
);
}
extern
__inline__
int
skb_headroom
(
struct
sk_buff
*
skb
)
extern
__inline__
int
skb_headroom
(
const
struct
sk_buff
*
skb
)
{
return
skb
->
data
-
skb
->
head
;
}
extern
__inline__
int
skb_tailroom
(
struct
sk_buff
*
skb
)
extern
__inline__
int
skb_tailroom
(
const
struct
sk_buff
*
skb
)
{
return
skb
->
end
-
skb
->
tail
;
}
...
...
net/core/dev.c
View file @
587f241d
...
...
@@ -55,7 +55,7 @@
* Adam Sulmicki : Bug Fix : Network Device Unload
* A network device unload needs to purge
* the backlog queue.
* Paul Rusty Russel : SIOCSIFNAME
* Paul Rusty Russel
l
: SIOCSIFNAME
*/
#include <asm/uaccess.h>
...
...
net/core/skbuff.c
View file @
587f241d
...
...
@@ -4,7 +4,7 @@
* Authors: Alan Cox <iiitac@pyr.swan.ac.uk>
* Florian La Roche <rzsfl@rz.uni-sb.de>
*
* Version: $Id: skbuff.c,v 1.6
0 1999/08/23 07:02:01
davem Exp $
* Version: $Id: skbuff.c,v 1.6
2 1999/12/23 02:13:42
davem Exp $
*
* Fixes:
* Alan Cox : Fixed the worst of the load balancer bugs.
...
...
@@ -275,14 +275,48 @@ struct sk_buff *skb_clone(struct sk_buff *skb, int gfp_mask)
return
n
;
}
static
void
copy_skb_header
(
struct
sk_buff
*
new
,
const
struct
sk_buff
*
old
)
{
/*
* Shift between the two data areas in bytes
*/
unsigned
long
offset
=
new
->
data
-
old
->
data
;
new
->
list
=
NULL
;
new
->
sk
=
NULL
;
new
->
dev
=
old
->
dev
;
new
->
rx_dev
=
NULL
;
new
->
priority
=
old
->
priority
;
new
->
protocol
=
old
->
protocol
;
new
->
dst
=
dst_clone
(
old
->
dst
);
new
->
h
.
raw
=
old
->
h
.
raw
+
offset
;
new
->
nh
.
raw
=
old
->
nh
.
raw
+
offset
;
new
->
mac
.
raw
=
old
->
mac
.
raw
+
offset
;
memcpy
(
new
->
cb
,
old
->
cb
,
sizeof
(
old
->
cb
));
new
->
used
=
old
->
used
;
new
->
is_clone
=
0
;
atomic_set
(
&
new
->
users
,
1
);
new
->
pkt_type
=
old
->
pkt_type
;
new
->
stamp
=
old
->
stamp
;
new
->
destructor
=
NULL
;
new
->
security
=
old
->
security
;
#ifdef CONFIG_NETFILTER
new
->
nfmark
=
old
->
nfmark
;
new
->
nfreason
=
old
->
nfreason
;
new
->
nfcache
=
old
->
nfcache
;
#ifdef CONFIG_NETFILTER_DEBUG
new
->
nf_debug
=
old
->
nf_debug
;
#endif
#endif
}
/*
* This is slower, and copies the whole data area
*/
struct
sk_buff
*
skb_copy
(
struct
sk_buff
*
skb
,
int
gfp_mask
)
struct
sk_buff
*
skb_copy
(
const
struct
sk_buff
*
skb
,
int
gfp_mask
)
{
struct
sk_buff
*
n
;
unsigned
long
offset
;
/*
* Allocate the copy buffer
...
...
@@ -292,12 +326,6 @@ struct sk_buff *skb_copy(struct sk_buff *skb, int gfp_mask)
if
(
n
==
NULL
)
return
NULL
;
/*
* Shift between the two data areas in bytes
*/
offset
=
n
->
head
-
skb
->
head
;
/* Set the data pointer */
skb_reserve
(
n
,
skb
->
data
-
skb
->
head
);
/* Set the tail pointer and length */
...
...
@@ -305,86 +333,35 @@ struct sk_buff *skb_copy(struct sk_buff *skb, int gfp_mask)
/* Copy the bytes */
memcpy
(
n
->
head
,
skb
->
head
,
skb
->
end
-
skb
->
head
);
n
->
csum
=
skb
->
csum
;
n
->
list
=
NULL
;
n
->
sk
=
NULL
;
n
->
dev
=
skb
->
dev
;
n
->
rx_dev
=
NULL
;
n
->
priority
=
skb
->
priority
;
n
->
protocol
=
skb
->
protocol
;
n
->
dst
=
dst_clone
(
skb
->
dst
);
n
->
h
.
raw
=
skb
->
h
.
raw
+
offset
;
n
->
nh
.
raw
=
skb
->
nh
.
raw
+
offset
;
n
->
mac
.
raw
=
skb
->
mac
.
raw
+
offset
;
memcpy
(
n
->
cb
,
skb
->
cb
,
sizeof
(
skb
->
cb
));
n
->
used
=
skb
->
used
;
n
->
is_clone
=
0
;
atomic_set
(
&
n
->
users
,
1
);
n
->
pkt_type
=
skb
->
pkt_type
;
n
->
stamp
=
skb
->
stamp
;
n
->
destructor
=
NULL
;
n
->
security
=
skb
->
security
;
#ifdef CONFIG_NETFILTER
n
->
nfmark
=
skb
->
nfmark
;
n
->
nfreason
=
skb
->
nfreason
;
n
->
nfcache
=
skb
->
nfcache
;
#ifdef CONFIG_NETFILTER_DEBUG
n
->
nf_debug
=
skb
->
nf_debug
;
#endif
#endif
copy_skb_header
(
n
,
skb
);
return
n
;
}
struct
sk_buff
*
skb_realloc_headroom
(
struct
sk_buff
*
skb
,
int
newheadroom
)
struct
sk_buff
*
skb_copy_expand
(
const
struct
sk_buff
*
skb
,
int
newheadroom
,
int
newtailroom
,
int
gfp_mask
)
{
struct
sk_buff
*
n
;
unsigned
long
offset
;
/*
* Allocate the copy buffer
*/
n
=
alloc_skb
((
skb
->
end
-
skb
->
data
)
+
newheadroom
,
GFP_ATOMIC
);
n
=
alloc_skb
(
newheadroom
+
(
skb
->
tail
-
skb
->
data
)
+
newtailroom
,
gfp_mask
);
if
(
n
==
NULL
)
return
NULL
;
skb_reserve
(
n
,
newheadroom
);
/*
* Shift between the two data areas in bytes
*/
offset
=
n
->
data
-
skb
->
data
;
/* Set the tail pointer and length */
skb_put
(
n
,
skb
->
len
);
/* Copy the bytes */
memcpy
(
n
->
data
,
skb
->
data
,
skb
->
len
);
n
->
list
=
NULL
;
n
->
sk
=
NULL
;
n
->
priority
=
skb
->
priority
;
n
->
protocol
=
skb
->
protocol
;
n
->
dev
=
skb
->
dev
;
n
->
rx_dev
=
NULL
;
n
->
dst
=
dst_clone
(
skb
->
dst
);
n
->
h
.
raw
=
skb
->
h
.
raw
+
offset
;
n
->
nh
.
raw
=
skb
->
nh
.
raw
+
offset
;
n
->
mac
.
raw
=
skb
->
mac
.
raw
+
offset
;
memcpy
(
n
->
cb
,
skb
->
cb
,
sizeof
(
skb
->
cb
));
n
->
used
=
skb
->
used
;
n
->
is_clone
=
0
;
atomic_set
(
&
n
->
users
,
1
);
n
->
pkt_type
=
skb
->
pkt_type
;
n
->
stamp
=
skb
->
stamp
;
n
->
destructor
=
NULL
;
n
->
security
=
skb
->
security
;
#ifdef CONFIG_NETFILTER
n
->
nfmark
=
skb
->
nfmark
;
n
->
nfreason
=
skb
->
nfreason
;
n
->
nfcache
=
skb
->
nfcache
;
#ifdef CONFIG_NETFILTER_DEBUG
n
->
nf_debug
=
skb
->
nf_debug
;
#endif
#endif
/* Copy the bytes: data pointers must point to same data. */
memcpy
(
n
->
data
-
skb_headroom
(
skb
),
skb
->
head
,
skb
->
end
-
skb
->
head
);
copy_skb_header
(
n
,
skb
);
return
n
;
}
...
...
net/core/sock.c
View file @
587f241d
...
...
@@ -7,7 +7,7 @@
* handler for protocols to use and generic option handler.
*
*
* Version: $Id: sock.c,v 1.8
6 1999/09/01 08:11:4
9 davem Exp $
* Version: $Id: sock.c,v 1.8
7 1999/11/23 08:56:5
9 davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
...
...
net/ipv4/af_inet.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* PF_INET protocol family socket handler.
*
* Version: $Id: af_inet.c,v 1.
97 1999/09/08 03:46:46
davem Exp $
* Version: $Id: af_inet.c,v 1.
100 1999/12/21 04:05:02
davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
...
...
net/ipv4/arp.c
View file @
587f241d
/* linux/net/inet/arp.c
*
* Version: $Id: arp.c,v 1.8
1 1999/08/30 10:17:05
davem Exp $
* Version: $Id: arp.c,v 1.8
3 1999/12/15 22:39:03
davem Exp $
*
* Copyright (C) 1994 by Florian La Roche
*
...
...
net/ipv4/fib_frontend.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* IPv4 Forwarding Information Base: FIB frontend.
*
* Version: $Id: fib_frontend.c,v 1.
19 1999/08/31 07:03:23
davem Exp $
* Version: $Id: fib_frontend.c,v 1.
21 1999/12/15 22:39:07
davem Exp $
*
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
*
...
...
net/ipv4/icmp.c
View file @
587f241d
...
...
@@ -3,7 +3,7 @@
*
* Alan Cox, <alan@redhat.com>
*
* Version: $Id: icmp.c,v 1.6
1 1999/08/31 07:03:33
davem Exp $
* Version: $Id: icmp.c,v 1.6
2 1999/12/23 01:43:37
davem Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
@@ -483,7 +483,7 @@ static int icmp_glue_bits(const void *p, char *to, unsigned int offset, unsigned
unsigned
long
csum
;
if
(
offset
)
{
icmp_param
->
csum
=
csum_partial_copy
(
icmp_param
->
data_ptr
+
offset
-
sizeof
(
struct
icmphdr
),
icmp_param
->
csum
=
csum_partial_copy
_nocheck
(
icmp_param
->
data_ptr
+
offset
-
sizeof
(
struct
icmphdr
),
to
,
fraglen
,
icmp_param
->
csum
);
return
0
;
}
...
...
@@ -493,10 +493,10 @@ static int icmp_glue_bits(const void *p, char *to, unsigned int offset, unsigned
* the other fragments first, so that we get the checksum
* for the whole packet here.
*/
csum
=
csum_partial_copy
((
void
*
)
&
icmp_param
->
icmph
,
csum
=
csum_partial_copy
_nocheck
((
void
*
)
&
icmp_param
->
icmph
,
to
,
sizeof
(
struct
icmphdr
),
icmp_param
->
csum
);
csum
=
csum_partial_copy
(
icmp_param
->
data_ptr
,
csum
=
csum_partial_copy
_nocheck
(
icmp_param
->
data_ptr
,
to
+
sizeof
(
struct
icmphdr
),
fraglen
-
sizeof
(
struct
icmphdr
),
csum
);
icmph
=
(
struct
icmphdr
*
)
to
;
...
...
net/ipv4/igmp.c
View file @
587f241d
...
...
@@ -8,7 +8,7 @@
* the older version didn't come out right using gcc 2.5.8, the newer one
* seems to fall out with gcc 2.6.2.
*
* Version: $Id: igmp.c,v 1.3
4 1999/08/20 11:05:12
davem Exp $
* Version: $Id: igmp.c,v 1.3
5 1999/12/15 22:39:10
davem Exp $
*
* Authors:
* Alan Cox <Alan.Cox@linux.org>
...
...
net/ipv4/ip_output.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* The Internet Protocol (IP) output module.
*
* Version: $Id: ip_output.c,v 1.7
2 1999/09/07 02:31:15
davem Exp $
* Version: $Id: ip_output.c,v 1.7
5 1999/12/21 04:05:04
davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
...
...
net/ipv4/ipmr.c
View file @
587f241d
...
...
@@ -9,7 +9,7 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
* Version: $Id: ipmr.c,v 1.4
6 1999/08/31 07:03:44
davem Exp $
* Version: $Id: ipmr.c,v 1.4
8 1999/12/15 22:39:16
davem Exp $
*
* Fixes:
* Michael Chastain : Incorrect size of copying.
...
...
net/ipv4/proc.c
View file @
587f241d
...
...
@@ -7,7 +7,7 @@
* PROC file system. It is mainly used for debugging and
* statistics.
*
* Version: $Id: proc.c,v 1.3
6 1999/07/02 11:26:34
davem Exp $
* Version: $Id: proc.c,v 1.3
7 1999/12/15 22:39:19
davem Exp $
*
* Authors: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
* Gerald J. Heim, <heim@peanuts.informatik.uni-tuebingen.de>
...
...
net/ipv4/raw.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* RAW - implementation of IP "raw" sockets.
*
* Version: $Id: raw.c,v 1.4
3 1999/08/20 11:05:57
davem Exp $
* Version: $Id: raw.c,v 1.4
4 1999/12/15 22:39:21
davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
...
...
net/ipv4/route.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* ROUTE - implementation of the IP router.
*
* Version: $Id: route.c,v 1.7
2 1999/08/30 10:17:12
davem Exp $
* Version: $Id: route.c,v 1.7
5 1999/12/23 01:41:44
davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
...
...
@@ -736,7 +736,7 @@ void ip_rt_redirect(u32 old_gw, u32 daddr, u32 new_gw,
goto
do_next
;
}
rt_del
(
hash
,
rt
);
rt_del
(
hash
,
rt
h
);
if
(
!
rt_intern_hash
(
hash
,
rt
,
&
rt
))
ip_rt_put
(
rt
);
goto
do_next
;
...
...
net/ipv4/tcp.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* Implementation of the Transmission Control Protocol(TCP).
*
* Version: $Id: tcp.c,v 1.15
1 1999/09/07 02:31:21
davem Exp $
* Version: $Id: tcp.c,v 1.15
2 1999/11/23 08:57:03
davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
...
...
net/ipv4/tcp_input.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* Implementation of the Transmission Control Protocol(TCP).
*
* Version: $Id: tcp_input.c,v 1.17
3 1999/09/07 02:31:27
davem Exp $
* Version: $Id: tcp_input.c,v 1.17
6 1999/12/20 05:19:46
davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
...
...
net/ipv4/tcp_ipv4.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* Implementation of the Transmission Control Protocol(TCP).
*
* Version: $Id: tcp_ipv4.c,v 1.1
89 1999/09/07 02:31:33
davem Exp $
* Version: $Id: tcp_ipv4.c,v 1.1
92 1999/12/23 02:04:50
davem Exp $
*
* IPv4 specific functions
*
...
...
@@ -528,7 +528,10 @@ __inline__ struct sock *tcp_v4_lookup_listener(u32 daddr, unsigned short hnum, i
read_lock
(
&
tcp_lhash_lock
);
sk
=
tcp_listening_hash
[
tcp_lhashfn
(
hnum
)];
if
(
sk
)
{
if
(
sk
->
num
==
hnum
&&
sk
->
next
==
NULL
)
if
(
sk
->
num
==
hnum
&&
sk
->
next
==
NULL
&&
(
!
sk
->
rcv_saddr
||
sk
->
rcv_saddr
==
daddr
)
&&
!
sk
->
bound_dev_if
)
goto
sherry_cache
;
sk
=
__tcp_v4_lookup_listener
(
sk
,
daddr
,
hnum
,
dif
);
}
...
...
net/ipv4/udp.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* The User Datagram Protocol (UDP).
*
* Version: $Id: udp.c,v 1.7
4 1999/08/20 11:06:12
davem Exp $
* Version: $Id: udp.c,v 1.7
5 1999/12/15 22:39:34
davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
...
...
net/ipv6/addrconf.c
View file @
587f241d
...
...
@@ -6,7 +6,7 @@
* Pedro Roque <roque@di.fc.ul.pt>
* Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
*
* $Id: addrconf.c,v 1.5
3 1999/08/31 07:03:54
davem Exp $
* $Id: addrconf.c,v 1.5
5 1999/12/15 22:39:40
davem Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
net/ipv6/af_inet6.c
View file @
587f241d
...
...
@@ -7,7 +7,7 @@
*
* Adapted from linux/net/ipv4/af_inet.c
*
* $Id: af_inet6.c,v 1.4
7 1999/08/31 07:03:58
davem Exp $
* $Id: af_inet6.c,v 1.4
9 1999/12/15 22:39:43
davem Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
net/ipv6/mcast.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
* Authors:
* Pedro Roque <roque@di.fc.ul.pt>
*
* $Id: mcast.c,v 1.2
6 1999/08/31 07:04:08
davem Exp $
* $Id: mcast.c,v 1.2
7 1999/12/09 00:52:49
davem Exp $
*
* Based on linux/ipv4/igmp.c and linux/ipv4/ip_sockglue.c
*
...
...
net/ipv6/proc.c
View file @
587f241d
...
...
@@ -7,7 +7,7 @@
* PROC file system. This is very similar to the IPv4 version,
* except it reports the sockets in the INET6 address family.
*
* Version: $Id: proc.c,v 1.1
1 1999/07/02 11:26:45
davem Exp $
* Version: $Id: proc.c,v 1.1
2 1999/12/15 22:39:48
davem Exp $
*
* Authors: David S. Miller (davem@caip.rutgers.edu)
*
...
...
net/ipv6/raw.c
View file @
587f241d
...
...
@@ -7,7 +7,7 @@
*
* Adapted from linux/net/ipv4/raw.c
*
* $Id: raw.c,v 1.
29 1999/08/20 11:06:26
davem Exp $
* $Id: raw.c,v 1.
30 1999/12/15 22:39:51
davem Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
net/ipv6/route.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
* Authors:
* Pedro Roque <roque@di.fc.ul.pt>
*
* $Id: route.c,v 1.4
0 1999/08/31 07:04:1
3 davem Exp $
* $Id: route.c,v 1.4
2 1999/12/15 22:39:5
3 davem Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
net/ipv6/tcp_ipv6.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
* Authors:
* Pedro Roque <roque@di.fc.ul.pt>
*
* $Id: tcp_ipv6.c,v 1.11
2 1999/08/31 07:04:19
davem Exp $
* $Id: tcp_ipv6.c,v 1.11
3 1999/12/15 22:39:58
davem Exp $
*
* Based on:
* linux/net/ipv4/tcp.c
...
...
net/ipv6/udp.c
View file @
587f241d
...
...
@@ -7,7 +7,7 @@
*
* Based on linux/ipv4/udp.c
*
* $Id: udp.c,v 1.4
5 1999/08/20 11:06:32
davem Exp $
* $Id: udp.c,v 1.4
6 1999/12/15 22:40:03
davem Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
net/netsyms.c
View file @
587f241d
...
...
@@ -150,7 +150,7 @@ EXPORT_SYMBOL(skb_recv_datagram);
EXPORT_SYMBOL
(
skb_free_datagram
);
EXPORT_SYMBOL
(
skb_copy_datagram
);
EXPORT_SYMBOL
(
skb_copy_datagram_iovec
);
EXPORT_SYMBOL
(
skb_
realloc_headroom
);
EXPORT_SYMBOL
(
skb_
copy_expand
);
EXPORT_SYMBOL
(
datagram_poll
);
EXPORT_SYMBOL
(
put_cmsg
);
EXPORT_SYMBOL
(
sock_kmalloc
);
...
...
net/packet/af_packet.c
View file @
587f241d
...
...
@@ -5,7 +5,7 @@
*
* PACKET - implements raw packet sockets.
*
* Version: $Id: af_packet.c,v 1.2
4 1999/08/30 12:14:5
2 davem Exp $
* Version: $Id: af_packet.c,v 1.2
6 1999/12/20 05:20:0
2 davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
...
...
net/unix/af_unix.c
View file @
587f241d
...
...
@@ -8,7 +8,7 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
* Version: $Id: af_unix.c,v 1.8
4 1999/09/08 03:47:18
davem Exp $
* Version: $Id: af_unix.c,v 1.8
7 1999/12/09 00:54:25
davem Exp $
*
* Fixes:
* Linus Torvalds : Assorted bug cures.
...
...
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