diff options
Diffstat (limited to 'include/linux/rtnetlink.h')
-rw-r--r-- | include/linux/rtnetlink.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index b358c704d102..ca643b13b026 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
@@ -482,6 +482,7 @@ enum | |||
482 | TCA_RATE, | 482 | TCA_RATE, |
483 | TCA_FCNT, | 483 | TCA_FCNT, |
484 | TCA_STATS2, | 484 | TCA_STATS2, |
485 | TCA_STAB, | ||
485 | __TCA_MAX | 486 | __TCA_MAX |
486 | }; | 487 | }; |
487 | 488 | ||
@@ -754,13 +755,6 @@ extern void __rtnl_unlock(void); | |||
754 | } \ | 755 | } \ |
755 | } while(0) | 756 | } while(0) |
756 | 757 | ||
757 | #define BUG_TRAP(x) do { \ | ||
758 | if (unlikely(!(x))) { \ | ||
759 | printk(KERN_ERR "KERNEL: assertion (%s) failed at %s (%d)\n", \ | ||
760 | #x, __FILE__ , __LINE__); \ | ||
761 | } \ | ||
762 | } while(0) | ||
763 | |||
764 | static inline u32 rtm_get_table(struct rtattr **rta, u8 table) | 758 | static inline u32 rtm_get_table(struct rtattr **rta, u8 table) |
765 | { | 759 | { |
766 | return RTA_GET_U32(rta[RTA_TABLE-1]); | 760 | return RTA_GET_U32(rta[RTA_TABLE-1]); |