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: (448 commits)
  [IPV4] nl_fib_lookup: Initialise res.r before fib_res_put(&res)
  [IPV6]: Fix thinko in ipv6_rthdr_rcv() changes.
  [IPV4]: Add multipath cached to feature-removal-schedule.txt
  [WIRELESS] cfg80211: Clarify locking comment.
  [WIRELESS] cfg80211: Fix locking in wiphy_new.
  [WEXT] net_device: Don't include wext bits if not required.
  [WEXT]: Misc code cleanups.
  [WEXT]: Reduce inline abuse.
  [WEXT]: Move EXPORT_SYMBOL statements where they belong.
  [WEXT]: Cleanup early ioctl call path.
  [WEXT]: Remove options.
  [WEXT]: Remove dead debug code.
  [WEXT]: Clean up how wext is called.
  [WEXT]: Move to net/wireless
  [AFS]: Eliminate cmpxchg() usage in vlocation code.
  [RXRPC]: Fix pointers passed to bitops.
  [RXRPC]: Remove bogus atomic_* overrides.
  [AFS]: Fix u64 printing in debug logging.
  [AFS]: Add "directory write" support.
  [AFS]: Implement the CB.InitCallBackState3 operation.
  ...

1 files changed, 10 insertions, 5 deletions

diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index 8270aac2aa5d..87b606b63f1e 100644
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -5,8 +5,13 @@
 #include <linux/rtnetlink.h>
 
 /* rule is permanent, and cannot be deleted */
-#define FIB_RULE_PERMANENT      1
-#define FIB_RULE_INVERT         2
+#define FIB_RULE_PERMANENT      0x00000001
+#define FIB_RULE_INVERT         0x00000002
+#define FIB_RULE_UNRESOLVED     0x00000004
+#define FIB_RULE_DEV_DETACHED   0x00000008
+
+/* try to find source address in routing lookups */
+#define FIB_RULE_FIND_SADDR     0x00010000
 
 struct fib_rule_hdr
 {
@@ -29,7 +34,7 @@ enum
         FRA_DST,        /* destination address */
         FRA_SRC,        /* source address */
         FRA_IFNAME,     /* interface name */
-        FRA_UNUSED1,
+        FRA_GOTO,       /* target to jump to (FR_ACT_GOTO) */
         FRA_UNUSED2,
         FRA_PRIORITY,   /* priority/preference */
         FRA_UNUSED3,
@@ -51,8 +56,8 @@ enum
 {
         FR_ACT_UNSPEC,
         FR_ACT_TO_TBL,          /* Pass to fixed table */
-        FR_ACT_RES1,
-        FR_ACT_RES2,
+        FR_ACT_GOTO,            /* Jump to another rule */
+        FR_ACT_NOP,             /* No operation */
         FR_ACT_RES3,
         FR_ACT_RES4,
         FR_ACT_BLACKHOLE,       /* Drop without notification */