2 files changed, 9 insertions, 3 deletions

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 90955455884e..fcfa9825a816 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1155,6 +1155,7 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
                         err = netdev_switch_fib_ipv4_add(key, plen, fi,
                                                          new_fa->fa_tos,
                                                          cfg->fc_type,
+                                                         cfg->fc_nlflags,
                                                          tb->tb_id);
                         if (err) {
                                 netdev_switch_fib_ipv4_abort(fi);
@@ -1201,7 +1202,9 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
 
         /* (Optionally) offload fib entry to switch hardware. */
         err = netdev_switch_fib_ipv4_add(key, plen, fi, tos,
-                                         cfg->fc_type, tb->tb_id);
+                                         cfg->fc_type,
+                                         cfg->fc_nlflags,
+                                         tb->tb_id);
         if (err) {
                 netdev_switch_fib_ipv4_abort(fi);
                 goto out_free_new_fa;
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index aba6aa2656d8..8cf42a69baf4 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -1,6 +1,7 @@
 /*
  * net/switchdev/switchdev.c - Switch device API
  * Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
+ * Copyright (c) 2014-2015 Scott Feldman <sfeldma@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -294,12 +295,13 @@ static struct net_device *netdev_switch_get_dev_by_nhs(struct fib_info *fi)
  *      @fi: route FIB info structure
  *      @tos: route TOS
  *      @type: route type
+ *      @nlflags: netlink flags passed in (NLM_F_*)
  *      @tb_id: route table ID
  *
  *      Add IPv4 route entry to switch device.
  */
 int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
-                               u8 tos, u8 type, u32 tb_id)
+                               u8 tos, u8 type, u32 nlflags, u32 tb_id)
 {
         struct net_device *dev;
         const struct net_device_ops *ops;
@@ -324,7 +326,8 @@ int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
 
         if (ops->ndo_switch_fib_ipv4_add) {
                 err = ops->ndo_switch_fib_ipv4_add(dev, htonl(dst), dst_len,
-                                                   fi, tos, type, tb_id);
+                                                   fi, tos, type, nlflags,
+                                                   tb_id);
                 if (!err)
                         fi->fib_flags |= RTNH_F_EXTERNAL;
         }