diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 20:22:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 20:22:09 -0500 |
| commit | 9753dfe19a85e7e45a34a56f4cb2048bb4f50e27 (patch) | |
| tree | c017a1b4a70b8447c71b01d8b320e071546b5c9d /arch/sparc | |
| parent | edf7c8148ec40c0fd27c0ef3f688defcc65e3913 (diff) | |
| parent | 9f42f126154786e6e76df513004800c8c633f020 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits)
net: pack skb_shared_info more efficiently
net_sched: red: split red_parms into parms and vars
net_sched: sfq: extend limits
cnic: Improve error recovery on bnx2x devices
cnic: Re-init dev->stats_addr after chip reset
net_sched: Bug in netem reordering
bna: fix sparse warnings/errors
bna: make ethtool_ops and strings const
xgmac: cleanups
net: make ethtool_ops const
vmxnet3" make ethtool ops const
xen-netback: make ops structs const
virtio_net: Pass gfp flags when allocating rx buffers.
ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call
netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call
igb: reset PHY after recovering from PHY power down
igb: add basic runtime PM support
igb: Add support for byte queue limits.
e1000: cleanup CE4100 MDIO registers access
e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove
...
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/socket.h b/arch/sparc/include/asm/socket.h index 9d3fefcff2f5..8af1b64168b3 100644 --- a/arch/sparc/include/asm/socket.h +++ b/arch/sparc/include/asm/socket.h | |||
| @@ -58,6 +58,9 @@ | |||
| 58 | 58 | ||
| 59 | #define SO_RXQ_OVFL 0x0024 | 59 | #define SO_RXQ_OVFL 0x0024 |
| 60 | 60 | ||
| 61 | #define SO_WIFI_STATUS 0x0025 | ||
| 62 | #define SCM_WIFI_STATUS SO_WIFI_STATUS | ||
| 63 | |||
| 61 | /* Security levels - as per NRL IPv6 - don't actually do anything */ | 64 | /* Security levels - as per NRL IPv6 - don't actually do anything */ |
| 62 | #define SO_SECURITY_AUTHENTICATION 0x5001 | 65 | #define SO_SECURITY_AUTHENTICATION 0x5001 |
| 63 | #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 | 66 | #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 |