]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40e: Make it clear a parameter is never used
authorCarolyn Wyborny <carolyn.wyborny@intel.com>
Mon, 31 Aug 2015 23:54:42 +0000 (19:54 -0400)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Mar 2016 16:32:32 +0000 (08:32 -0800)
Orabug: 22342532

Flag the filter_mask parameter as __always_unused in the
ndo_bridge_getlink function.

Change-ID: Ifc1e99c7fb84bcbf81cf7b0ac891ad8ca956ffb2
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 9f4ffc4426c4a4b6d4a84413e13efba6a72bf81d)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
drivers/net/ethernet/intel/i40e/i40e_main.c

drivers/net/ethernet/intel/i40e/i40e_main.c

index 3127f9593038815cba5fd087f7e6c9ba75ae6f70..12b90375120f9e6cecb43ee2b4c6e4d09a6792fb 100644 (file)
@@ -8305,7 +8305,8 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev,
  **/
 static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
                                   struct net_device *dev,
-                                  u32 __always_unused filter_mask, int nlflags)
+                                  u32 __always_unused filter_mask,
+                                  int nlflags)
 {
        struct i40e_netdev_priv *np = netdev_priv(dev);
        struct i40e_vsi *vsi = np->vsi;