diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-28 23:37:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-28 23:37:27 -0700 |
| commit | a8e0e8ab1e464e87a8ca8dcfae9e1953698bfc92 (patch) | |
| tree | 6c55b105b27babfee0039fc193a36a4957fe2268 /include/linux | |
| parent | 4f449b971af367c8f5f19302a7464fbe734d7926 (diff) | |
| parent | 74ba310df114b364e626162bde91604da7f98251 (diff) | |
Merge bk://ppc.bkbits.net/for-linus-ppc
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/icmpv6.h | 28 | ||||
| -rw-r--r-- | include/linux/pkt_cls.h | 25 | ||||
| -rw-r--r-- | include/linux/rtnetlink.h | 4 |
3 files changed, 21 insertions, 36 deletions
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index 6b2bf70d2417..0cf6c8b12caf 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h @@ -86,17 +86,15 @@ struct icmp6hdr { #define ICMPV6_MGM_REPORT 131 #define ICMPV6_MGM_REDUCTION 132 -/* definitions for MLDv2 */ - -#define MLD2_MODE_IS_INCLUDE 1 -#define MLD2_MODE_IS_EXCLUDE 2 -#define MLD2_CHANGE_TO_INCLUDE 3 -#define MLD2_CHANGE_TO_EXCLUDE 4 -#define MLD2_ALLOW_NEW_SOURCES 5 -#define MLD2_BLOCK_OLD_SOURCES 6 +#define ICMPV6_NI_QUERY 139 +#define ICMPV6_NI_REPLY 140 #define ICMPV6_MLD2_REPORT 143 -#define MLD2_ALL_MCR_INIT { { { 0xff,0x02,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } } } + +#define ICMPV6_DHAAD_REQUEST 144 +#define ICMPV6_DHAAD_REPLY 145 +#define ICMPV6_MOBILE_PREFIX_SOL 146 +#define ICMPV6_MOBILE_PREFIX_ADV 147 /* * Codes for Destination Unreachable @@ -139,6 +137,18 @@ struct icmp6_filter { __u32 data[8]; }; +/* + * Definitions for MLDv2 + */ +#define MLD2_MODE_IS_INCLUDE 1 +#define MLD2_MODE_IS_EXCLUDE 2 +#define MLD2_CHANGE_TO_INCLUDE 3 +#define MLD2_CHANGE_TO_EXCLUDE 4 +#define MLD2_ALLOW_NEW_SOURCES 5 +#define MLD2_BLOCK_OLD_SOURCES 6 + +#define MLD2_ALL_MCR_INIT { { { 0xff,0x02,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } } } + #ifdef __KERNEL__ #include <linux/netdevice.h> diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index 59339cef9c9f..60dd7903284e 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -117,17 +117,8 @@ enum struct tc_police { __u32 index; -#ifdef CONFIG_NET_CLS_ACT int refcnt; int bindcnt; -#endif -/* Turned off because it requires new tc - * to work (for now maintain ABI) - * -#ifdef CONFIG_NET_CLS_ACT - __u32 capab; -#endif -*/ int action; #define TC_POLICE_UNSPEC TC_ACT_UNSPEC #define TC_POLICE_OK TC_ACT_OK @@ -195,12 +186,8 @@ enum TCA_U32_DIVISOR, TCA_U32_SEL, TCA_U32_POLICE, -#ifdef CONFIG_NET_CLS_ACT TCA_U32_ACT, -#endif -#ifdef CONFIG_NET_CLS_IND TCA_U32_INDEV, -#endif __TCA_U32_MAX }; @@ -212,9 +199,7 @@ struct tc_u32_key __u32 val; int off; int offmask; -#ifdef CONFIG_CLS_U32_PERF - unsigned long kcnt; -#endif + __u32 kcnt; }; struct tc_u32_sel @@ -229,11 +214,9 @@ struct tc_u32_sel short hoff; __u32 hmask; -#ifdef CONFIG_CLS_U32_PERF + struct tc_u32_key keys[0]; unsigned long rcnt; unsigned long rhit; -#endif - struct tc_u32_key keys[0]; }; /* Flags */ @@ -300,12 +283,8 @@ enum TCA_FW_UNSPEC, TCA_FW_CLASSID, TCA_FW_POLICE, -#ifdef CONFIG_NET_CLS_IND TCA_FW_INDEV, -#endif -#ifdef CONFIG_NET_CLS_ACT TCA_FW_ACT, -#endif __TCA_FW_MAX }; diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 4f949964bb9b..58c6429ccdf7 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -746,10 +746,6 @@ extern void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change); extern struct semaphore rtnl_sem; -#define rtnl_exlock() do { } while(0) -#define rtnl_exunlock() do { } while(0) -#define rtnl_exlock_nowait() (0) - #define rtnl_shlock() down(&rtnl_sem) #define rtnl_shlock_nowait() down_trylock(&rtnl_sem) |