diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:43:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:43:43 -0700 |
| commit | 74e651f0aa100f3e5d3432a8dd8869c089e8d72f (patch) | |
| tree | 457e8d6ec4c28f3b1f3f4fcbf45df9b91f9ee9c7 /include/asm-s390/socket.h | |
| parent | 6002e45045a190a112bc3bc2134d0ff4fac7ced7 (diff) | |
| parent | 0702056f9f41274a06e21cb05f12b4265b4867a2 (diff) | |
| download | kernel-crypto-74e651f0aa100f3e5d3432a8dd8869c089e8d72f.tar.gz kernel-crypto-74e651f0aa100f3e5d3432a8dd8869c089e8d72f.tar.xz kernel-crypto-74e651f0aa100f3e5d3432a8dd8869c089e8d72f.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
[TIPC]: Initial activation message now includes TIPC version number
[TIPC]: Improve response to requests for node/link information
[TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf
[IrDA]: Fix the AU1000 FIR dependencies
[IrDA]: Fix RCU lock pairing on error path
[XFRM]: unexport xfrm_state_mtu
[NET]: make skb_release_data() static
[NETFILTE] ipv4: Fix typo (Bugzilla #6753)
[IrDA]: MCS7780 usb_driver struct should be static
[BNX2]: Turn off link during shutdown
[BNX2]: Use dev_kfree_skb() instead of the _irq version
[ATM]: basic sysfs support for ATM devices
[ATM]: [suni] change suni_init to __devinit
[ATM]: [iphase] should be __devinit not __init
[ATM]: [idt77105] should be __devinit not __init
[BNX2]: Add NETIF_F_TSO_ECN
[NET]: Add ECN support for TSO
[AF_UNIX]: Datagram getpeersec
[NET]: Fix logical error in skb_gso_ok
[PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000
...
Diffstat (limited to 'include/asm-s390/socket.h')
| -rw-r--r-- | include/asm-s390/socket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-s390/socket.h b/include/asm-s390/socket.h index 15a5298c874..1778a49a74c 100644 --- a/include/asm-s390/socket.h +++ b/include/asm-s390/socket.h @@ -56,5 +56,6 @@ #define SO_ACCEPTCONN 30 #define SO_PEERSEC 31 +#define SO_PASSSEC 34 #endif /* _ASM_SOCKET_H */ |