35b9b535e7
This reverts commit6e2688ca84, reversing changes made to4b7c9de4de. Conflicts: drivers/gpio/wm831x-gpio.c drivers/i2c/busses/Kconfig drivers/net/dm9000.c drivers/net/wireless/airo.c drivers/net/wireless/ath/ar9170/hw.h drivers/net/wireless/ath/ar9170/main.c drivers/net/wireless/ath/ar9170/usb.c drivers/net/wireless/ath/ath5k/ath5k.h drivers/net/wireless/ath/ath5k/attach.c drivers/net/wireless/ath/ath5k/base.c drivers/net/wireless/ath/ath5k/qcu.c drivers/net/wireless/ath/ath5k/reset.c drivers/net/wireless/ath/ath9k/ath9k.h drivers/net/wireless/ath/ath9k/beacon.c drivers/net/wireless/ath/ath9k/eeprom.h drivers/net/wireless/ath/ath9k/eeprom_def.c drivers/net/wireless/ath/ath9k/hw.c drivers/net/wireless/ath/ath9k/hw.h drivers/net/wireless/ath/ath9k/initvals.h drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/pci.c drivers/net/wireless/ath/ath9k/phy.h drivers/net/wireless/ath/ath9k/rc.c drivers/net/wireless/ath/ath9k/xmit.c drivers/net/wireless/ath/regd.h drivers/net/wireless/b43/Kconfig drivers/net/wireless/b43/Makefile drivers/net/wireless/b43/b43.h drivers/net/wireless/b43/dma.c drivers/net/wireless/b43/main.c drivers/net/wireless/b43/pio.c drivers/net/wireless/b43/pio.h drivers/net/wireless/b43/xmit.c drivers/net/wireless/b43legacy/main.c drivers/net/wireless/hostap/hostap_cs.c drivers/net/wireless/hostap/hostap_hw.c drivers/net/wireless/hostap/hostap_pci.c drivers/net/wireless/hostap/hostap_wlan.h drivers/net/wireless/iwlwifi/iwl-3945.c drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl-5000.c drivers/net/wireless/iwlwifi/iwl-agn-rs.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/iwlwifi/iwl-dev.h drivers/net/wireless/iwlwifi/iwl-helpers.h drivers/net/wireless/iwlwifi/iwl-rx.c drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwlwifi/iwl3945-base.c drivers/net/wireless/libertas/if_sdio1.c drivers/net/wireless/p54/eeprom.c drivers/net/wireless/p54/p54pci.c drivers/net/wireless/p54/p54usb.c drivers/net/wireless/p54/txrx.c drivers/net/wireless/rndis_wlan.c drivers/net/wireless/rtl818x/rtl8180_dev.c drivers/net/wireless/wl12xx/wl1251_debugfs.c drivers/net/wireless/wl12xx/wl1251_sdio.c drivers/usb/serial/option.c net/bluetooth/rfcomm/core.c
83 lines
1.8 KiB
C
83 lines
1.8 KiB
C
#ifndef _IF_TUNNEL_H_
|
|
#define _IF_TUNNEL_H_
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
#ifdef __KERNEL__
|
|
#include <linux/ip.h>
|
|
#include <linux/in6.h>
|
|
#endif
|
|
|
|
#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)
|
|
#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1)
|
|
#define SIOCDELTUNNEL (SIOCDEVPRIVATE + 2)
|
|
#define SIOCCHGTUNNEL (SIOCDEVPRIVATE + 3)
|
|
#define SIOCGETPRL (SIOCDEVPRIVATE + 4)
|
|
#define SIOCADDPRL (SIOCDEVPRIVATE + 5)
|
|
#define SIOCDELPRL (SIOCDEVPRIVATE + 6)
|
|
#define SIOCCHGPRL (SIOCDEVPRIVATE + 7)
|
|
#define SIOCGET6RD (SIOCDEVPRIVATE + 8)
|
|
#define SIOCADD6RD (SIOCDEVPRIVATE + 9)
|
|
#define SIOCDEL6RD (SIOCDEVPRIVATE + 10)
|
|
#define SIOCCHG6RD (SIOCDEVPRIVATE + 11)
|
|
|
|
#define GRE_CSUM __cpu_to_be16(0x8000)
|
|
#define GRE_ROUTING __cpu_to_be16(0x4000)
|
|
#define GRE_KEY __cpu_to_be16(0x2000)
|
|
#define GRE_SEQ __cpu_to_be16(0x1000)
|
|
#define GRE_STRICT __cpu_to_be16(0x0800)
|
|
#define GRE_REC __cpu_to_be16(0x0700)
|
|
#define GRE_FLAGS __cpu_to_be16(0x00F8)
|
|
#define GRE_VERSION __cpu_to_be16(0x0007)
|
|
|
|
struct ip_tunnel_parm {
|
|
char name[IFNAMSIZ];
|
|
int link;
|
|
__be16 i_flags;
|
|
__be16 o_flags;
|
|
__be32 i_key;
|
|
__be32 o_key;
|
|
struct iphdr iph;
|
|
};
|
|
|
|
/* SIT-mode i_flags */
|
|
#define SIT_ISATAP 0x0001
|
|
|
|
struct ip_tunnel_prl {
|
|
__be32 addr;
|
|
__u16 flags;
|
|
__u16 __reserved;
|
|
__u32 datalen;
|
|
__u32 __reserved2;
|
|
/* data follows */
|
|
};
|
|
|
|
/* PRL flags */
|
|
#define PRL_DEFAULT 0x0001
|
|
|
|
struct ip_tunnel_6rd {
|
|
struct in6_addr prefix;
|
|
__be32 relay_prefix;
|
|
__u16 prefixlen;
|
|
__u16 relay_prefixlen;
|
|
};
|
|
|
|
enum {
|
|
IFLA_GRE_UNSPEC,
|
|
IFLA_GRE_LINK,
|
|
IFLA_GRE_IFLAGS,
|
|
IFLA_GRE_OFLAGS,
|
|
IFLA_GRE_IKEY,
|
|
IFLA_GRE_OKEY,
|
|
IFLA_GRE_LOCAL,
|
|
IFLA_GRE_REMOTE,
|
|
IFLA_GRE_TTL,
|
|
IFLA_GRE_TOS,
|
|
IFLA_GRE_PMTUDISC,
|
|
__IFLA_GRE_MAX,
|
|
};
|
|
|
|
#define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1)
|
|
|
|
#endif /* _IF_TUNNEL_H_ */
|