]> www.infradead.org Git - users/jedix/linux-maple.git/commit
i40e: Remove incorrect #ifdef's
authorCarolyn Wyborny <carolyn.wyborny@intel.com>
Mon, 27 Apr 2015 18:57:11 +0000 (14:57 -0400)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 28 Aug 2015 15:11:50 +0000 (08:11 -0700)
commit18f4c23f358c9da73f9c469216c5d3a12e6f28ff
treebfdd15aa58e34627872f3e94d88f824eeb11ea2d
parentbaf1e3885da222fbe8cbabc3ce1a429ce7bb3ba2
i40e: Remove incorrect #ifdef's

Orabug: 21570582

This patch removes some #ifdef's that should not be there. They
were stopping code that is needed from being compiled in.

With these #ifdef's removed, changes are needed in the driver
to fix some compile errors: adding missing parameters to
the definition of ndo_bridge_setlink and a ndo_dflt_brige_getlink call.

Change-ID: I5516614e1bc50b6bca0647cef971bc96161ba2de
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 9df70b66418e284dc1e7f272ac445c1d1e990b97)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
drivers/net/ethernet/intel/i40e/i40e_main.c
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
drivers/net/ethernet/intel/i40e/i40e_main.c